You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jira@kafka.apache.org by GitBox <gi...@apache.org> on 2020/11/18 20:50:17 UTC
[GitHub] [kafka] hachikuji opened a new pull request #9617: MINOR: Factor out common response parsing logic
hachikuji opened a new pull request #9617:
URL: https://github.com/apache/kafka/pull/9617
This patch factors out some common parsing logic from `NetworkClient.parseResponse` and `AbstractResponse.parseResponse`. As a result of this refactor, we are now verifying the correlationId in forwarded requests. This patch also adds a test case to verify handling in this case.
### Committer Checklist (excluded from commit message)
- [ ] Verify design and implementation
- [ ] Verify test coverage and CI build status
- [ ] Verify documentation (including upgrade notes)
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] hachikuji commented on a change in pull request #9617: MINOR: Factor out common response parsing logic
Posted by GitBox <gi...@apache.org>.
hachikuji commented on a change in pull request #9617:
URL: https://github.com/apache/kafka/pull/9617#discussion_r527095050
##########
File path: clients/src/main/java/org/apache/kafka/clients/NetworkClient.java
##########
@@ -974,21 +969,6 @@ private void handleInitiateApiVersionRequests(long now) {
}
}
- /**
- * Validate that the response corresponds to the request we expect or else explode
- */
- private static void correlate(RequestHeader requestHeader, ResponseHeader responseHeader) {
Review comment:
Why do you want to keep it if it is not used?
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] hachikuji commented on a change in pull request #9617: MINOR: Factor out common response parsing logic
Posted by GitBox <gi...@apache.org>.
hachikuji commented on a change in pull request #9617:
URL: https://github.com/apache/kafka/pull/9617#discussion_r527101086
##########
File path: clients/src/main/java/org/apache/kafka/common/requests/CorrelationIdMismatchException.java
##########
@@ -0,0 +1,45 @@
+/*
+ * 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 org.apache.kafka.common.requests;
+
+/**
+ * Raised if the correlationId in a response header does not match
+ * the expected value from the request header.
+ */
+public class CorrelationIdMismatchException extends IllegalStateException {
Review comment:
Yeah, I was debating the location. I decided to put it in `common/requests` since it is not a public package and the error is specific to the request protocol.
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] hachikuji commented on a change in pull request #9617: MINOR: Factor out common response parsing logic
Posted by GitBox <gi...@apache.org>.
hachikuji commented on a change in pull request #9617:
URL: https://github.com/apache/kafka/pull/9617#discussion_r527095539
##########
File path: clients/src/main/java/org/apache/kafka/common/requests/CorrelationIdMismatchException.java
##########
@@ -0,0 +1,45 @@
+/*
+ * 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 org.apache.kafka.common.requests;
+
+/**
+ * Raised if the correlationId in a response header does not match
+ * the expected value from the request header.
+ */
+public class CorrelationIdMismatchException extends IllegalStateException {
+ private final int requestCorrelationId;
+ private final int responseCorrelationId;
+
+ public CorrelationIdMismatchException(
+ String message,
+ int requestCorrelationId,
+ int responseCorrelationId
+ ) {
+ super(message);
+ this.requestCorrelationId = requestCorrelationId;
+ this.responseCorrelationId = responseCorrelationId;
+ }
+
+ public int requestCorrelationId() {
+ return requestCorrelationId;
Review comment:
Yeah, I added it for completeness. It is a little odd if the mismatch exception only tells you what the response correlationId was.
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] hachikuji commented on pull request #9617: MINOR: Factor out common response parsing logic
Posted by GitBox <gi...@apache.org>.
hachikuji commented on pull request #9617:
URL: https://github.com/apache/kafka/pull/9617#issuecomment-729947146
This is a follow-up from #9563. cc @chia7712 @abbccdda
While I was working on this patch, I noticed this: https://issues.apache.org/jira/browse/KAFKA-10743. In this patch, I have just removed the metric.
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] chia7712 commented on a change in pull request #9617: MINOR: Factor out common response parsing logic
Posted by GitBox <gi...@apache.org>.
chia7712 commented on a change in pull request #9617:
URL: https://github.com/apache/kafka/pull/9617#discussion_r526577116
##########
File path: core/src/main/scala/kafka/server/ForwardingManager.scala
##########
@@ -17,25 +17,17 @@
package kafka.server
-import kafka.metrics.KafkaMetricsGroup
+import java.nio.ByteBuffer
+
import kafka.network.RequestChannel
+import kafka.utils.Logging
import org.apache.kafka.clients.ClientResponse
-import org.apache.kafka.common.metrics.Metrics
import org.apache.kafka.common.protocol.Errors
-import org.apache.kafka.common.requests.{AbstractRequest, AbstractResponse, EnvelopeRequest, EnvelopeResponse}
-import org.apache.kafka.common.utils.Time
+import org.apache.kafka.common.requests.{AbstractRequest, AbstractResponse, EnvelopeRequest, EnvelopeResponse, RequestHeader}
import scala.compat.java8.OptionConverters._
-class ForwardingManager(metadataCache: kafka.server.MetadataCache,
- time: Time,
- metrics: Metrics,
- config: KafkaConfig,
- threadNamePrefix: Option[String] = None) extends
- BrokerToControllerChannelManagerImpl(metadataCache, time, metrics,
- config, "forwardingChannel", threadNamePrefix) with KafkaMetricsGroup {
-
- private val forwardingMetricName = "NumRequestsForwardingToControllerPerSec"
+class ForwardingManager(channelManager: BrokerToControllerChannelManager) extends Logging {
Review comment:
As ```ForwardingManager``` does not extend ```BrokerToControllerChannelManagerImpl```, the ```requestQueue``` can be declared as private now.
https://github.com/apache/kafka/blob/trunk/core/src/main/scala/kafka/server/BrokerToControllerChannelManagerImpl.scala#L58
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] hachikuji merged pull request #9617: MINOR: Factor out common response parsing logic
Posted by GitBox <gi...@apache.org>.
hachikuji merged pull request #9617:
URL: https://github.com/apache/kafka/pull/9617
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] abbccdda commented on a change in pull request #9617: MINOR: Factor out common response parsing logic
Posted by GitBox <gi...@apache.org>.
abbccdda commented on a change in pull request #9617:
URL: https://github.com/apache/kafka/pull/9617#discussion_r526499505
##########
File path: clients/src/main/java/org/apache/kafka/clients/NetworkClient.java
##########
@@ -974,21 +969,6 @@ private void handleInitiateApiVersionRequests(long now) {
}
}
- /**
- * Validate that the response corresponds to the request we expect or else explode
- */
- private static void correlate(RequestHeader requestHeader, ResponseHeader responseHeader) {
Review comment:
nit: I don't think we need to remove this helper
##########
File path: clients/src/main/java/org/apache/kafka/common/requests/CorrelationIdMismatchException.java
##########
@@ -0,0 +1,45 @@
+/*
+ * 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 org.apache.kafka.common.requests;
+
+/**
+ * Raised if the correlationId in a response header does not match
+ * the expected value from the request header.
+ */
+public class CorrelationIdMismatchException extends IllegalStateException {
Review comment:
nit: we could put this exception into `common/internals` to indicate that we don't plan to let external user catch it.
##########
File path: clients/src/main/java/org/apache/kafka/common/requests/CorrelationIdMismatchException.java
##########
@@ -0,0 +1,45 @@
+/*
+ * 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 org.apache.kafka.common.requests;
+
+/**
+ * Raised if the correlationId in a response header does not match
+ * the expected value from the request header.
+ */
+public class CorrelationIdMismatchException extends IllegalStateException {
+ private final int requestCorrelationId;
+ private final int responseCorrelationId;
+
+ public CorrelationIdMismatchException(
+ String message,
+ int requestCorrelationId,
+ int responseCorrelationId
+ ) {
+ super(message);
+ this.requestCorrelationId = requestCorrelationId;
+ this.responseCorrelationId = responseCorrelationId;
+ }
+
+ public int requestCorrelationId() {
+ return requestCorrelationId;
Review comment:
This field is not used.
----------------------------------------------------------------
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:
users@infra.apache.org