hachikuji commented on a change in pull request #9996:
URL: https://github.com/apache/kafka/pull/9996#discussion_r567106239
##########
File path: clients/src/main/java/org/apache/kafka/clients/admin/Admin.java
##########
@@ -1449,6 +1449,39 @@ default DescribeFeaturesResult describeFeatures() {
*/
UpdateFeaturesResult updateFeatures(Map<String, FeatureUpdate>
featureUpdates, UpdateFeaturesOptions options);
+ /**
+ * Unregisters a broker.
Review comment:
We should document the fact that this will only work for self-managed
kafka clusters.
##########
File path: clients/src/main/java/org/apache/kafka/common/protocol/ApiKeys.java
##########
@@ -98,7 +98,8 @@
UPDATE_FEATURES(ApiMessageType.UPDATE_FEATURES, false, true),
ENVELOPE(ApiMessageType.ENVELOPE, true, RecordBatch.MAGIC_VALUE_V0, false,
true),
FETCH_SNAPSHOT(ApiMessageType.FETCH_SNAPSHOT, false,
RecordBatch.MAGIC_VALUE_V0, false, true),
- DESCRIBE_CLUSTER(ApiMessageType.DESCRIBE_CLUSTER);
+ DESCRIBE_CLUSTER(ApiMessageType.DESCRIBE_CLUSTER),
+ DECOMMISSION_BROKER(ApiMessageType.DECOMMISSION_BROKER, false,
RecordBatch.MAGIC_VALUE_V0, true, true);
Review comment:
This is not a controller-only API.
##########
File path:
clients/src/main/resources/common/message/DecommissionBrokerResponse.json
##########
@@ -0,0 +1,28 @@
+// 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.
+
+{
+ "apiKey": 63,
+ "type": "response",
+ "name": "DecommissionBrokerResponse",
+ "validVersions": "0",
+ "flexibleVersions": "0+",
+ "fields": [
+ { "name": "ThrottleTimeMs", "type": "int32", "versions": "0+",
+ "about": "Duration in milliseconds for which the request was throttled
due to a quota violation, or zero if the request did not violate any quota." },
+ { "name": "ErrorCode", "type": "int16", "versions": "0+",
Review comment:
Considering if we may as well add an ErrorMessage field here.
##########
File path:
clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java
##########
@@ -4503,6 +4506,47 @@ void handleFailure(Throwable throwable) {
return new UpdateFeaturesResult(new HashMap<>(updateFutures));
}
+ @Override
+ public DecommissionBrokerResult decommissionBroker(int brokerId,
DecommissionBrokerOptions options) {
+ final KafkaFutureImpl<Void> future = new KafkaFutureImpl<>();
+ final long now = time.milliseconds();
+ final Call call = new Call("decommissionBroker", calcDeadlineMs(now,
options.timeoutMs()),
+ new ControllerNodeProvider()) {
Review comment:
Shouldn't we use `LeastLoadedNodeProvider`? The kip-500 controller will
not be reachable anyway.
##########
File path: core/src/main/scala/kafka/server/KafkaApis.scala
##########
@@ -3296,6 +3298,13 @@ class KafkaApis(val requestChannel: RequestChannel,
handle(forwardedRequest)
}
+ def handleDecommissionBrokerRequest(request: RequestChannel.Request): Unit =
{
+ val decommissionBrokerRequest = request.body[DecommissionBrokerRequest]
+ requestHelper.sendResponseMaybeThrottle(request, requestThrottleMs =>
+ decommissionBrokerRequest.getErrorResponse(requestThrottleMs,
+ Errors.UNSUPPORTED_VERSION.exception))
Review comment:
If we advertise this API in the ApiVersions response, then it would be
surprising to get an UNSUPPORTED_VERSION error. I think we might need augment
the ApiVersion handler here so that we are able to exclude KIP-500 APIs when it
is not enabled.
##########
File path:
clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java
##########
@@ -4503,6 +4506,47 @@ void handleFailure(Throwable throwable) {
return new UpdateFeaturesResult(new HashMap<>(updateFutures));
}
+ @Override
+ public DecommissionBrokerResult decommissionBroker(int brokerId,
DecommissionBrokerOptions options) {
Review comment:
Can you add some unit tests for this api? Nice to cover at least the
success/error cases.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
