-
Notifications
You must be signed in to change notification settings - Fork 15.4k
KAFKA-10599: Implement basic CLI tool for feature versioning system #9409
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
aa63928
KAFKA-10599: Implement basic CLI tool for feature versioning system
kowshik 06788eb
Minor changes
kowshik 4c57b7d
Address comments from Boyang
kowshik b307227
Address comment from Boyang
kowshik 0ef54f5
Address comments from Jun
kowshik 98f6888
Small changes
kowshik 0c4906b
Small change
kowshik 7a03f97
Address comments from Jun
kowshik ecdb083
Small improvement
kowshik 2e56828
Small improvement
kowshik File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| #!/bin/bash | ||
| # Licensed to the Apache Software Foundation (ASF) under one or more | ||
| # contributor license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright ownership. | ||
| # The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| # (the "License"); you may not use this file except in compliance with | ||
| # the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| exec $(dirname $0)/kafka-run-class.sh kafka.admin.FeatureCommand "$@" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,359 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package kafka.admin | ||
|
|
||
| import kafka.server.BrokerFeatures | ||
| import kafka.utils.{CommandDefaultOptions, CommandLineUtils, Exit} | ||
| import org.apache.kafka.clients.CommonClientConfigs | ||
| import org.apache.kafka.clients.admin.{Admin, DescribeFeaturesOptions, FeatureMetadata, FeatureUpdate, UpdateFeaturesOptions} | ||
| import org.apache.kafka.common.feature.{Features, SupportedVersionRange} | ||
| import org.apache.kafka.common.utils.Utils | ||
|
|
||
| import java.util.Properties | ||
| import scala.collection.Seq | ||
| import scala.collection.immutable.ListMap | ||
| import scala.jdk.CollectionConverters._ | ||
|
|
||
| import joptsimple.OptionSpec | ||
|
|
||
| object FeatureCommand { | ||
|
|
||
| def main(args: Array[String]): Unit = { | ||
| val opts = new FeatureCommandOptions(args) | ||
| val featureApis = new FeatureApis(opts) | ||
| var exitCode = 0 | ||
| try { | ||
| featureApis.execute() | ||
| } catch { | ||
| case e: IllegalArgumentException => | ||
| printException(e) | ||
| opts.parser.printHelpOn(System.err) | ||
| exitCode = 1 | ||
| case _: UpdateFeaturesException => | ||
| exitCode = 1 | ||
| case e: Throwable => | ||
| printException(e) | ||
| exitCode = 1 | ||
| } finally { | ||
| featureApis.close() | ||
| Exit.exit(exitCode) | ||
| } | ||
| } | ||
|
|
||
| private def printException(exception: Throwable): Unit = { | ||
| System.err.println("\nError encountered when executing command: " + Utils.stackTrace(exception)) | ||
|
kowshik marked this conversation as resolved.
|
||
| } | ||
| } | ||
|
|
||
| class UpdateFeaturesException(message: String) extends RuntimeException(message) | ||
|
|
||
| /** | ||
| * A class that provides necessary APIs to bridge the Admin client feature APIs with the CLI tool. | ||
| * | ||
| * @param opts the CLI options | ||
| */ | ||
| class FeatureApis(var opts: FeatureCommandOptions) { | ||
| private var supportedFeatures = BrokerFeatures.createDefault().supportedFeatures | ||
| private val adminClient = createAdminClient() | ||
|
|
||
| private def pad(op: String): String = { | ||
| f"$op%11s" | ||
| } | ||
|
|
||
| private val addOp = pad("[Add]") | ||
| private val upgradeOp = pad("[Upgrade]") | ||
| private val deleteOp = pad("[Delete]") | ||
| private val downgradeOp = pad("[Downgrade]") | ||
|
|
||
| // For testing only. | ||
| private[admin] def setSupportedFeatures(newFeatures: Features[SupportedVersionRange]): Unit = { | ||
| supportedFeatures = newFeatures | ||
| } | ||
|
|
||
| // For testing only. | ||
| private[admin] def setOptions(newOpts: FeatureCommandOptions): Unit = { | ||
| opts = newOpts | ||
| } | ||
|
|
||
| private def describeFeatures(sendRequestToController: Boolean): FeatureMetadata = { | ||
| val options = new DescribeFeaturesOptions().sendRequestToController(sendRequestToController) | ||
| adminClient.describeFeatures(options).featureMetadata().get() | ||
| } | ||
|
|
||
| /** | ||
| * Describes the supported and finalized features. If the --from-controller CLI option | ||
| * is provided, then the request is issued only to the controller, otherwise the request is issued | ||
| * to any of the provided bootstrap servers. | ||
| */ | ||
| def describeFeatures(): Unit = { | ||
| val result = describeFeatures(opts.hasFromControllerOption) | ||
| val features = result.supportedFeatures.asScala.keys.toSet ++ result.finalizedFeatures.asScala.keys.toSet | ||
|
|
||
| features.toList.sorted.foreach { | ||
|
kowshik marked this conversation as resolved.
|
||
| feature => | ||
| val output = new StringBuilder() | ||
| output.append(s"Feature: $feature") | ||
|
|
||
| val (supportedMinVersion, supportedMaxVersion) = { | ||
| val supportedVersionRange = result.supportedFeatures.get(feature) | ||
| if (supportedVersionRange == null) { | ||
| ("-", "-") | ||
| } else { | ||
| (supportedVersionRange.minVersion, supportedVersionRange.maxVersion) | ||
| } | ||
| } | ||
| output.append(s"\tSupportedMinVersion: $supportedMinVersion") | ||
| output.append(s"\tSupportedMaxVersion: $supportedMaxVersion") | ||
|
|
||
| val (finalizedMinVersionLevel, finalizedMaxVersionLevel) = { | ||
| val finalizedVersionRange = result.finalizedFeatures.get(feature) | ||
| if (finalizedVersionRange == null) { | ||
| ("-", "-") | ||
| } else { | ||
| (finalizedVersionRange.minVersionLevel, finalizedVersionRange.maxVersionLevel) | ||
| } | ||
| } | ||
| output.append(s"\tFinalizedMinVersionLevel: $finalizedMinVersionLevel") | ||
| output.append(s"\tFinalizedMaxVersionLevel: $finalizedMaxVersionLevel") | ||
|
|
||
| val epoch = { | ||
| if (result.finalizedFeaturesEpoch.isPresent) { | ||
| result.finalizedFeaturesEpoch.get.toString | ||
| } else { | ||
| "-" | ||
| } | ||
| } | ||
| output.append(s"\tEpoch: $epoch") | ||
|
|
||
| println(output) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Upgrades all features known to this tool to their highest max version levels. The method may | ||
| * add new finalized features if they were not finalized previously, but it does not delete | ||
| * any existing finalized feature. The results of the feature updates are written to STDOUT. | ||
| * | ||
| * NOTE: if the --dry-run CLI option is provided, this method only prints the expected feature | ||
| * updates to STDOUT, without applying them. | ||
| * | ||
| * @throws UpdateFeaturesException if at least one of the feature updates failed | ||
| */ | ||
| def upgradeAllFeatures(): Unit = { | ||
| val metadata = describeFeatures(true) | ||
| val existingFinalizedFeatures = metadata.finalizedFeatures | ||
| val updates = supportedFeatures.features.asScala.map { | ||
| case (feature, targetVersionRange) => | ||
| val existingVersionRange = existingFinalizedFeatures.get(feature) | ||
| if (existingVersionRange == null) { | ||
| val updateStr = | ||
| addOp + | ||
| s"\tFeature: $feature" + | ||
| s"\tExistingFinalizedMaxVersion: -" + | ||
| s"\tNewFinalizedMaxVersion: ${targetVersionRange.max}" | ||
| (feature, (updateStr, new FeatureUpdate(targetVersionRange.max, false))) | ||
| } else { | ||
| if (targetVersionRange.max > existingVersionRange.maxVersionLevel) { | ||
| val updateStr = | ||
| upgradeOp + | ||
| s"\tFeature: $feature" + | ||
| s"\tExistingFinalizedMaxVersion: ${existingVersionRange.maxVersionLevel}" + | ||
| s"\tNewFinalizedMaxVersion: ${targetVersionRange.max}" | ||
| (feature, (updateStr, new FeatureUpdate(targetVersionRange.max, false))) | ||
| } else { | ||
| (feature, null) | ||
|
kowshik marked this conversation as resolved.
Outdated
|
||
| } | ||
| } | ||
| }.filter{ case(_, updateInfo) => updateInfo != null}.toMap | ||
|
|
||
| if (updates.nonEmpty) { | ||
| maybeApplyFeatureUpdates(updates) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Downgrades existing finalized features to the highest max version levels known to this tool. | ||
| * The method may delete existing finalized features if they are no longer seen to be supported, | ||
| * but it does not add a feature that was not finalized previously. The results of the feature | ||
| * updates are written to STDOUT. | ||
| * | ||
| * NOTE: if the --dry-run CLI option is provided, this method only prints the expected feature | ||
| * updates to STDOUT, without applying them. | ||
| * | ||
| * @throws UpdateFeaturesException if at least one of the feature updates failed | ||
| */ | ||
| def downgradeAllFeatures(): Unit = { | ||
| val metadata = describeFeatures(true) | ||
| val existingFinalizedFeatures = metadata.finalizedFeatures | ||
| val supportedFeaturesMap = supportedFeatures.features | ||
| val updates = existingFinalizedFeatures.asScala.map { | ||
| case (feature, existingVersionRange) => | ||
| val targetVersionRange = supportedFeaturesMap.get(feature) | ||
| if (targetVersionRange == null) { | ||
| val updateStr = | ||
| deleteOp + | ||
| s"\tFeature: $feature" + | ||
| s"\tExistingFinalizedMaxVersion: ${existingVersionRange.maxVersionLevel}" + | ||
| s"\tNewFinalizedMaxVersion: -" | ||
| (feature, (updateStr, new FeatureUpdate(0, true))) | ||
| } else { | ||
| if (targetVersionRange.max < existingVersionRange.maxVersionLevel) { | ||
| val updateStr = | ||
| downgradeOp + | ||
| s"\tFeature: $feature" + | ||
| s"\tExistingFinalizedMaxVersion: ${existingVersionRange.maxVersionLevel}" + | ||
| s"\tNewFinalizedMaxVersion: ${targetVersionRange.max}" | ||
| (feature, (updateStr, new FeatureUpdate(targetVersionRange.max, true))) | ||
| } else { | ||
| (feature, null) | ||
| } | ||
| } | ||
| }.filter{ case(_, updateInfo) => updateInfo != null}.toMap | ||
|
|
||
| if (updates.nonEmpty) { | ||
| maybeApplyFeatureUpdates(updates) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Applies the provided feature updates. If the --dry-run CLI option is provided, the method | ||
| * only prints the expected feature updates to STDOUT without applying them. | ||
| * | ||
| * @param updates the feature updates to be applied via the admin client | ||
| * | ||
| * @throws UpdateFeaturesException if at least one of the feature updates failed | ||
| */ | ||
| private def maybeApplyFeatureUpdates(updates: Map[String, (String, FeatureUpdate)]): Unit = { | ||
| if (opts.hasDryRunOption) { | ||
| println("Expected feature updates:") | ||
| println(ListMap(updates.toSeq.sortBy(_._1):_*) | ||
|
kowshik marked this conversation as resolved.
Outdated
|
||
| .map { case(_, (updateStr, _)) => updateStr} | ||
| .mkString("\n")) | ||
| } else { | ||
| val result = adminClient.updateFeatures( | ||
| updates.map { case(feature, (_, update)) => (feature, update)}.asJava, | ||
| new UpdateFeaturesOptions()) | ||
| val failures = ListMap(result.values.asScala.toSeq.sortBy(_._1):_*).map { | ||
|
kowshik marked this conversation as resolved.
Outdated
|
||
| case (feature, updateFuture) => | ||
| val (updateStr, _) = updates(feature) | ||
| try { | ||
| updateFuture.get | ||
| println(updateStr + "\tResult: OK") | ||
| 0 | ||
| } catch { | ||
| case e: Exception => | ||
| println(updateStr + "\tResult: FAILED due to " + e.getMessage) | ||
|
kowshik marked this conversation as resolved.
Outdated
|
||
| 1 | ||
| } | ||
| }.sum | ||
| if (failures > 0) { | ||
|
kowshik marked this conversation as resolved.
|
||
| throw new UpdateFeaturesException(s"$failures feature updates failed!") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| def execute(): Unit = { | ||
| if (opts.hasDescribeOption) { | ||
| describeFeatures() | ||
| } else if (opts.hasUpgradeAllOption) { | ||
| upgradeAllFeatures() | ||
| } else if (opts.hasDowngradeAllOption) { | ||
| downgradeAllFeatures() | ||
| } else { | ||
| throw new IllegalStateException("Unexpected state: no CLI command could be executed.") | ||
| } | ||
| } | ||
|
|
||
| def close(): Unit = { | ||
| adminClient.close() | ||
| } | ||
|
|
||
| private def createAdminClient(): Admin = { | ||
| val props = new Properties() | ||
| props.put(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG, opts.bootstrapServers) | ||
| Admin.create(props) | ||
|
kowshik marked this conversation as resolved.
Outdated
|
||
| } | ||
| } | ||
|
|
||
| class FeatureCommandOptions(args: Array[String]) extends CommandDefaultOptions(args) { | ||
| private val bootstrapServerOpt = | ||
| parser.accepts("bootstrap-server", "REQUIRED: The Kafka server(s) to connect to.") | ||
|
kowshik marked this conversation as resolved.
Outdated
|
||
| .withRequiredArg | ||
| .describedAs("server to connect to") | ||
| .ofType(classOf[String]) | ||
| private val describeOpt = parser.accepts( | ||
| "describe", | ||
| "Describe supported and finalized features. By default, the features are described from a" + | ||
| " random broker. The request can be optionally directed only to the controller using the" + | ||
| " --from-controller option.") | ||
| private val fromControllerOpt = parser.accepts( | ||
| "from-controller", | ||
| "Describe supported and finalized features from the controller.") | ||
| private val upgradeAllOpt = parser.accepts( | ||
| "upgrade-all", | ||
| "Upgrades all finalized features to the maximum version levels known to the tool." + | ||
| " This command finalizes new features known to the tool that were never finalized" + | ||
| " previously in the cluster, but it is guaranteed to not delete any existing feature.") | ||
| private val downgradeAllOpt = parser.accepts( | ||
| "downgrade-all", | ||
| "Downgrades all finalized features to the maximum version levels known to the tool." + | ||
| " This command deletes unknown features from the list of finalized features in the" + | ||
| " cluster, but it is guaranteed to not add a new feature.") | ||
| private val dryRunOpt = parser.accepts( | ||
| "dry-run", | ||
| "Performs a dry-run of upgrade/downgrade mutations to finalized feature without applying them.") | ||
|
|
||
| options = parser.parse(args : _*) | ||
|
|
||
| checkArgs() | ||
|
|
||
| def has(builder: OptionSpec[_]): Boolean = options.has(builder) | ||
|
|
||
| def hasDescribeOption: Boolean = has(describeOpt) | ||
|
kowshik marked this conversation as resolved.
|
||
|
|
||
| def hasFromControllerOption: Boolean = has(fromControllerOpt) | ||
|
|
||
| def hasDryRunOption: Boolean = has(dryRunOpt) | ||
|
|
||
| def hasUpgradeAllOption: Boolean = has(upgradeAllOpt) | ||
|
kowshik marked this conversation as resolved.
|
||
|
|
||
| def hasDowngradeAllOption: Boolean = has(downgradeAllOpt) | ||
|
|
||
| def bootstrapServers: String = options.valueOf(bootstrapServerOpt) | ||
|
|
||
| def checkArgs(): Unit = { | ||
| CommandLineUtils.printHelpAndExitIfNeeded(this, "This tool describes and updates finalized features.") | ||
| val numActions = Seq(describeOpt, upgradeAllOpt, downgradeAllOpt).count(has) | ||
| if (numActions != 1) { | ||
| CommandLineUtils.printUsageAndDie( | ||
| parser, | ||
| "Command must include exactly one action: --describe, --upgrade-all, --downgrade-all.") | ||
| } | ||
| CommandLineUtils.checkRequiredArgs(parser, options, bootstrapServerOpt) | ||
| if (hasDryRunOption && !hasUpgradeAllOption && !hasDowngradeAllOption) { | ||
| CommandLineUtils.printUsageAndDie( | ||
| parser, | ||
| "Command can contain --dry-run option only when either --upgrade-all or --downgrade-all actions are provided.") | ||
| } | ||
| if (hasFromControllerOption && !hasDescribeOption) { | ||
|
kowshik marked this conversation as resolved.
|
||
| CommandLineUtils.printUsageAndDie( | ||
| parser, | ||
| "Command can contain --from-controller option only when --describe action is provided.") | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.