You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by GitBox <gi...@apache.org> on 2022/05/05 02:22:45 UTC
[GitHub] [incubator-inlong] luchunliang opened a new pull request, #4064: [INLONG-4056][DataProxy] DataProxy support to return SDK/Agent a response after event is saved in cache cluster.
luchunliang opened a new pull request, #4064:
URL: https://github.com/apache/incubator-inlong/pull/4064
### Title Name: [INLONG-4056][DataProxy] DataProxy support to return SDK/Agent a response after event is saved in cache cluster.
Fixes #4056
### Motivation
*Explain here the context, and why you're making that change. What is the problem you're trying to solve?*
### Modifications
*Describe the modifications you've done.*
### Verifying this change
*(Please pick either of the following options)*
- [ ] This change is a trivial rework/code cleanup without any test coverage.
- [ ] This change is already covered by existing tests, such as:
*(please describe tests)*
- [ ] This change added tests and can be verified as follows:
*(example:)*
- *Added integration tests for end-to-end deployment with large payloads (10MB)*
- *Extended integration test for recovery after broker failure*
### Documentation
- Does this pull request introduce a new feature? (yes / no)
- If yes, how is the feature documented? (not applicable / docs / JavaDocs / not documented)
- If a feature is not applicable for documentation, explain why?
- If a feature is not documented yet in this PR, please create a follow-up issue for adding the documentation
--
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.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] luchunliang commented on a diff in pull request #4064: [INLONG-4056][DataProxy] DataProxy support to return SDK/Agent a response after event is saved in cache cluster.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on code in PR #4064:
URL: https://github.com/apache/incubator-inlong/pull/4064#discussion_r865577670
##########
inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/dispatch/DispatchProfileCallback.java:
##########
@@ -0,0 +1,61 @@
+/**
+ * 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.inlong.dataproxy.dispatch;
+
+import org.apache.inlong.sdk.commons.protocol.ProxySdk.ResultCode;
+import org.apache.inlong.sdk.commons.protocol.SourceCallback;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * DispatchProfileCallback
+ *
+ */
+public class DispatchProfileCallback {
+
+ private AtomicInteger ackingCount;
+ private SourceCallback callback;
+
+ /**
+ * Constructor
+ * @param totalCount
+ * @param callback
+ */
+ public DispatchProfileCallback(int totalCount, SourceCallback callback) {
+ this.ackingCount = new AtomicInteger(totalCount);
+ this.callback = callback;
+ }
+
+ /**
+ * ack
+ * @param eventCount
+ */
+ public void ack(int eventCount) {
+ int currentCount = this.ackingCount.decrementAndGet();
+ if (currentCount <= 0) {
Review Comment:
A SDK request has many DispatchProfiles, when all DispatchProfile has sent, return response to SDK/agent
--
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.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] vernedeng commented on a diff in pull request #4064: [INLONG-4056][DataProxy] DataProxy support to return SDK/Agent a response after event is saved in cache cluster.
Posted by GitBox <gi...@apache.org>.
vernedeng commented on code in PR #4064:
URL: https://github.com/apache/incubator-inlong/pull/4064#discussion_r865524735
##########
inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/tcp/InlongTcpChannelHandler.java:
##########
@@ -137,7 +140,65 @@ private void decodeVersion1(ChannelHandlerContext ctx, ByteBuf cb, int bodyLengt
}
// uncompress
List<ProxyEvent> events = EventUtils.decodeSdkPack(packObject);
- // topic
+ // response success if event size is zero
+ if (events.size() == 0) {
+ this.responsePackage(ctx, ResultCode.SUCCUSS, packObject);
+ }
+ // process
+ if (!CommonPropertiesHolder.isResponseAfterSave()) {
+ this.processAndResponse(ctx, packObject, events);
+ } else {
+ this.processAndWaitingSave(ctx, packObject, events);
+ }
+ }
+
+ /**
+ * processAndResponse
Review Comment:
comment unmatch function name
--
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.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] luchunliang commented on a diff in pull request #4064: [INLONG-4056][DataProxy] DataProxy support to return SDK/Agent a response after event is saved in cache cluster.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on code in PR #4064:
URL: https://github.com/apache/incubator-inlong/pull/4064#discussion_r865577286
##########
inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/tcp/InlongTcpChannelHandler.java:
##########
@@ -137,7 +140,65 @@ private void decodeVersion1(ChannelHandlerContext ctx, ByteBuf cb, int bodyLengt
}
// uncompress
List<ProxyEvent> events = EventUtils.decodeSdkPack(packObject);
- // topic
+ // response success if event size is zero
+ if (events.size() == 0) {
+ this.responsePackage(ctx, ResultCode.SUCCUSS, packObject);
+ }
+ // process
+ if (!CommonPropertiesHolder.isResponseAfterSave()) {
+ this.processAndResponse(ctx, packObject, events);
+ } else {
+ this.processAndWaitingSave(ctx, packObject, events);
+ }
+ }
+
+ /**
+ * processAndResponse
Review Comment:
fix it
--
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.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] vernedeng commented on a diff in pull request #4064: [INLONG-4056][DataProxy] DataProxy support to return SDK/Agent a response after event is saved in cache cluster.
Posted by GitBox <gi...@apache.org>.
vernedeng commented on code in PR #4064:
URL: https://github.com/apache/incubator-inlong/pull/4064#discussion_r865523665
##########
inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/dispatch/DispatchProfileCallback.java:
##########
@@ -0,0 +1,61 @@
+/**
+ * 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.inlong.dataproxy.dispatch;
+
+import org.apache.inlong.sdk.commons.protocol.ProxySdk.ResultCode;
+import org.apache.inlong.sdk.commons.protocol.SourceCallback;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * DispatchProfileCallback
+ *
+ */
+public class DispatchProfileCallback {
+
+ private AtomicInteger ackingCount;
+ private SourceCallback callback;
+
+ /**
+ * Constructor
+ * @param totalCount
+ * @param callback
+ */
+ public DispatchProfileCallback(int totalCount, SourceCallback callback) {
+ this.ackingCount = new AtomicInteger(totalCount);
+ this.callback = callback;
+ }
+
+ /**
+ * ack
+ * @param eventCount
+ */
+ public void ack(int eventCount) {
+ int currentCount = this.ackingCount.decrementAndGet();
+ if (currentCount <= 0) {
Review Comment:
is the case that currentCount<0 reasonable?
--
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.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] dockerzhang merged pull request #4064: [INLONG-4056][DataProxy] Return the response to the SDK/Agent after saving the event to the cache cluster
Posted by GitBox <gi...@apache.org>.
dockerzhang merged PR #4064:
URL: https://github.com/apache/incubator-inlong/pull/4064
--
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.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org