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/02/10 08:34:51 UTC
[GitHub] [incubator-inlong] luchunliang opened a new pull request #2442: [INLONG-2380] DataProxy support Kafka sink of PB compression cache message protocol.
luchunliang opened a new pull request #2442:
URL: https://github.com/apache/incubator-inlong/pull/2442
### Title Name: [INLONG-2380][Inlong-DataProxy] DataProxy support Kafka sink of PB compression cache message protocol.
Fixes #2380
### 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
- [ ] Make sure that the change passes the CI checks.
*(Please pick either of the following options)*
This change is a trivial rework / code cleanup without any test coverage.
*(or)*
This change is already covered by existing tests, such as *(please describe tests)*.
*(or)*
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 followup 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 change in pull request #2442: [INLONG-2380] DataProxy support Kafka sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on a change in pull request #2442:
URL: https://github.com/apache/incubator-inlong/pull/2442#discussion_r805470028
##########
File path: inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/dispatch/DispatchManager.java
##########
@@ -0,0 +1,160 @@
+/**
+ * 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 java.util.ArrayList;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.flume.Context;
+import org.apache.inlong.sdk.commons.protocol.ProxyEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * DispatchManager
+ */
+public class DispatchManager {
+
+ public static final Logger LOG = LoggerFactory.getLogger(DispatchManager.class);
+ public static final String KEY_DISPATCH_TIMEOUT = "dispatchTimeout";
+ public static final String KEY_DISPATCH_MAX_PACKCOUNT = "dispatchMaxPackCount";
+ public static final String KEY_DISPATCH_MAX_PACKSIZE = "dispatchMaxPackSize";
+ public static final long DEFAULT_DISPATCH_TIMEOUT = 2000;
+ public static final long DEFAULT_DISPATCH_MAX_PACKCOUNT = 256;
+ public static final long DEFAULT_DISPATCH_MAX_PACKSIZE = 327680;
+ public static final long MINUTE_MS = 60L * 1000;
+
+ private LinkedBlockingQueue<DispatchProfile> dispatchQueue;
+ private final long dispatchTimeout;
+ private final long maxPackCount;
+ private final long maxPackSize;
+ private ConcurrentHashMap<String, DispatchProfile> profileCache = new ConcurrentHashMap<>();
Review comment:
fixed 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] imvan commented on a change in pull request #2442: [INLONG-2380] DataProxy support Kafka sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
imvan commented on a change in pull request #2442:
URL: https://github.com/apache/incubator-inlong/pull/2442#discussion_r805535914
##########
File path: inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/kafkazone/KafkaZoneSinkContext.java
##########
@@ -0,0 +1,261 @@
+/**
+ * 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.sink.kafkazone;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.flume.Channel;
+import org.apache.flume.Context;
+import org.apache.inlong.dataproxy.config.RemoteConfigManager;
+import org.apache.inlong.dataproxy.config.holder.CacheClusterConfigHolder;
+import org.apache.inlong.dataproxy.config.holder.CommonPropertiesHolder;
+import org.apache.inlong.dataproxy.config.holder.IdTopicConfigHolder;
+import org.apache.inlong.dataproxy.dispatch.DispatchProfile;
+import org.apache.inlong.dataproxy.metrics.DataProxyMetricItem;
+import org.apache.inlong.dataproxy.metrics.audit.AuditUtils;
+import org.apache.inlong.dataproxy.sink.SinkContext;
+import org.apache.inlong.sdk.commons.protocol.ProxySdk.INLONG_COMPRESSED_TYPE;
+
+/**
+ *
+ * KafkaZoneSinkContext
+ */
+public class KafkaZoneSinkContext extends SinkContext {
+
+ public static final String KEY_NODE_ID = "nodeId";
+ public static final String PREFIX_PRODUCER = "producer.";
+ public static final String KEY_COMPRESS_TYPE = "compressType";
+
+ private final LinkedBlockingQueue<DispatchProfile> dispatchQueue;
+
+ private final String proxyClusterId;
+ private final String nodeId;
+ private final Context producerContext;
+ //
+ private final IdTopicConfigHolder idTopicHolder;
+ private final CacheClusterConfigHolder cacheHolder;
+ private final INLONG_COMPRESSED_TYPE compressType;
+
+ /**
+ * Constructor
+ *
+ * @param context
+ */
+ public KafkaZoneSinkContext(String sinkName, Context context, Channel channel,
+ LinkedBlockingQueue<DispatchProfile> dispatchQueue) {
+ super(sinkName, context, channel);
+ this.dispatchQueue = dispatchQueue;
+ // proxyClusterId
+ this.proxyClusterId = CommonPropertiesHolder.getString(RemoteConfigManager.KEY_PROXY_CLUSTER_NAME);
+ // nodeId
+ this.nodeId = CommonPropertiesHolder.getString(KEY_NODE_ID, "127.0.0.1");
+ // compressionType
+ String strCompressionType = CommonPropertiesHolder.getString(KEY_COMPRESS_TYPE,
+ INLONG_COMPRESSED_TYPE.INLONG_SNAPPY.name());
+ this.compressType = INLONG_COMPRESSED_TYPE.valueOf(strCompressionType);
+ // producerContext
+ Map<String, String> producerParams = context.getSubProperties(PREFIX_PRODUCER);
+ this.producerContext = new Context(producerParams);
+ // idTopicHolder
+ this.idTopicHolder = new IdTopicConfigHolder();
+ this.idTopicHolder.configure(context);
+ // cacheHolder
+ this.cacheHolder = new CacheClusterConfigHolder();
+ this.cacheHolder.configure(context);
+ }
+
+ /**
+ * start
+ */
+ public void start() {
+ super.start();
+ this.idTopicHolder.start();
+ this.cacheHolder.start();
+ }
+
+ /**
+ * close
+ */
+ public void close() {
+ super.close();
+ this.idTopicHolder.close();
+ this.cacheHolder.close();
+ }
+
+ /**
+ * get proxyClusterId
+ *
+ * @return the proxyClusterId
+ */
+ public String getProxyClusterId() {
+ return proxyClusterId;
+ }
+
+ /**
+ * get dispatchQueue
+ *
+ * @return the dispatchQueue
+ */
+ public LinkedBlockingQueue<DispatchProfile> getDispatchQueue() {
+ return dispatchQueue;
+ }
+
+ /**
+ * get producerContext
+ *
+ * @return the producerContext
+ */
+ public Context getProducerContext() {
+ return producerContext;
+ }
+
+ /**
+ * get idTopicHolder
+ *
+ * @return the idTopicHolder
+ */
+ public IdTopicConfigHolder getIdTopicHolder() {
+ return idTopicHolder;
+ }
+
+ /**
+ * get cacheHolder
+ *
+ * @return the cacheHolder
+ */
+ public CacheClusterConfigHolder getCacheHolder() {
+ return cacheHolder;
+ }
+
+ /**
+ * get compressType
+ *
+ * @return the compressType
+ */
+ public INLONG_COMPRESSED_TYPE getCompressType() {
+ return compressType;
+ }
+
+ /**
+ * get nodeId
+ *
+ * @return the nodeId
+ */
+ public String getNodeId() {
+ return nodeId;
+ }
+
+ /**
+ * addSendMetric
+ *
+ * @param currentRecord
+ * @param bid
+ */
+ public void addSendMetric(DispatchProfile currentRecord, String bid) {
+ Map<String, String> dimensions = new HashMap<>();
+ dimensions.put(DataProxyMetricItem.KEY_CLUSTER_ID, this.getClusterId());
+ // metric
+ fillInlongId(currentRecord, dimensions);
+ dimensions.put(DataProxyMetricItem.KEY_SINK_ID, this.getSinkName());
+ dimensions.put(DataProxyMetricItem.KEY_SINK_DATA_ID, bid);
+ long msgTime = currentRecord.getDispatchTime();
+ long auditFormatTime = msgTime - msgTime % CommonPropertiesHolder.getAuditFormatInterval();
+ dimensions.put(DataProxyMetricItem.KEY_MESSAGE_TIME, String.valueOf(auditFormatTime));
+ DataProxyMetricItem metricItem = this.getMetricItemSet().findMetricItem(dimensions);
+ long count = currentRecord.getCount();
+ long size = currentRecord.getSize();
+ metricItem.sendCount.addAndGet(count);
+ metricItem.sendSize.addAndGet(size);
+ }
+
+ /**
+ * addReadFailMetric
+ */
+ public void addSendFailMetric() {
Review comment:
wrong method name. seems like *addReadFailMetric*
--
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] codecov-commenter commented on pull request #2442: [INLONG-2380] DataProxy support Kafka sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
codecov-commenter commented on pull request #2442:
URL: https://github.com/apache/incubator-inlong/pull/2442#issuecomment-1034649003
# [Codecov](https://codecov.io/gh/apache/incubator-inlong/pull/2442?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#2442](https://codecov.io/gh/apache/incubator-inlong/pull/2442?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (e025fcf) into [master](https://codecov.io/gh/apache/incubator-inlong/commit/fc43f6e0533cd20a4985a074c76a04cdae141312?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (fc43f6e) will **increase** coverage by `0.00%`.
> The diff coverage is `n/a`.
[](https://codecov.io/gh/apache/incubator-inlong/pull/2442?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
```diff
@@ Coverage Diff @@
## master #2442 +/- ##
=========================================
Coverage 12.54% 12.54%
- Complexity 1219 1220 +1
=========================================
Files 420 420
Lines 36255 36255
Branches 5674 5674
=========================================
+ Hits 4547 4550 +3
+ Misses 30902 30895 -7
- Partials 806 810 +4
```
| [Impacted Files](https://codecov.io/gh/apache/incubator-inlong/pull/2442?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [.../producer/qltystats/DefaultBrokerRcvQltyStats.java](https://codecov.io/gh/apache/incubator-inlong/pull/2442/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-aW5sb25nLXR1YmVtcS90dWJlbXEtY2xpZW50L3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9pbmxvbmcvdHViZW1xL2NsaWVudC9wcm9kdWNlci9xbHR5c3RhdHMvRGVmYXVsdEJyb2tlclJjdlFsdHlTdGF0cy5qYXZh) | `45.31% <0.00%> (-0.79%)` | :arrow_down: |
| [...ong/tubemq/manager/service/ClusterServiceImpl.java](https://codecov.io/gh/apache/incubator-inlong/pull/2442/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-aW5sb25nLXR1YmVtcS90dWJlbXEtbWFuYWdlci9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvaW5sb25nL3R1YmVtcS9tYW5hZ2VyL3NlcnZpY2UvQ2x1c3RlclNlcnZpY2VJbXBsLmphdmE=) | `55.55% <0.00%> (+2.77%)` | :arrow_up: |
| [...inlong/tubemq/manager/service/TaskServiceImpl.java](https://codecov.io/gh/apache/incubator-inlong/pull/2442/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-aW5sb25nLXR1YmVtcS90dWJlbXEtbWFuYWdlci9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvaW5sb25nL3R1YmVtcS9tYW5hZ2VyL3NlcnZpY2UvVGFza1NlcnZpY2VJbXBsLmphdmE=) | `8.53% <0.00%> (+4.87%)` | :arrow_up: |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-inlong/pull/2442?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/incubator-inlong/pull/2442?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Last update [fc43f6e...e025fcf](https://codecov.io/gh/apache/incubator-inlong/pull/2442?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
--
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 change in pull request #2442: [INLONG-2380] DataProxy support Kafka sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on a change in pull request #2442:
URL: https://github.com/apache/incubator-inlong/pull/2442#discussion_r805468741
##########
File path: inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/dispatch/DispatchProfile.java
##########
@@ -0,0 +1,174 @@
+/**
+ * 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 java.util.ArrayList;
+import java.util.List;
+
Review comment:
need empty line between jdk import and the 3rd party import.
--
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] wardlican commented on a change in pull request #2442: [INLONG-2380] DataProxy support Kafka sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
wardlican commented on a change in pull request #2442:
URL: https://github.com/apache/incubator-inlong/pull/2442#discussion_r805465769
##########
File path: inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/dispatch/DispatchManager.java
##########
@@ -0,0 +1,160 @@
+/**
+ * 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 java.util.ArrayList;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.flume.Context;
+import org.apache.inlong.sdk.commons.protocol.ProxyEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * DispatchManager
+ */
+public class DispatchManager {
+
+ public static final Logger LOG = LoggerFactory.getLogger(DispatchManager.class);
+ public static final String KEY_DISPATCH_TIMEOUT = "dispatchTimeout";
+ public static final String KEY_DISPATCH_MAX_PACKCOUNT = "dispatchMaxPackCount";
+ public static final String KEY_DISPATCH_MAX_PACKSIZE = "dispatchMaxPackSize";
+ public static final long DEFAULT_DISPATCH_TIMEOUT = 2000;
+ public static final long DEFAULT_DISPATCH_MAX_PACKCOUNT = 256;
+ public static final long DEFAULT_DISPATCH_MAX_PACKSIZE = 327680;
+ public static final long MINUTE_MS = 60L * 1000;
+
+ private LinkedBlockingQueue<DispatchProfile> dispatchQueue;
+ private final long dispatchTimeout;
+ private final long maxPackCount;
+ private final long maxPackSize;
+ private ConcurrentHashMap<String, DispatchProfile> profileCache = new ConcurrentHashMap<>();
+ //
+ private AtomicBoolean needOutputOvertimeData = new AtomicBoolean(false);
+
+ /**
+ * Constructor
+ *
+ * @param context
+ * @param dispatchQueue
+ */
+ public DispatchManager(Context context, LinkedBlockingQueue<DispatchProfile> dispatchQueue) {
+ this.dispatchQueue = dispatchQueue;
+ this.dispatchTimeout = context.getLong(KEY_DISPATCH_TIMEOUT, DEFAULT_DISPATCH_TIMEOUT);
+ this.maxPackCount = context.getLong(KEY_DISPATCH_MAX_PACKCOUNT, DEFAULT_DISPATCH_MAX_PACKCOUNT);
+ this.maxPackSize = context.getLong(KEY_DISPATCH_MAX_PACKSIZE, DEFAULT_DISPATCH_MAX_PACKSIZE);
+ }
+
+ /**
+ * addEvent
+ *
+ * @param event
+ */
+ public void addEvent(ProxyEvent event) {
+ if (needOutputOvertimeData.get()) {
+ this.outputOvertimeData();
+ this.needOutputOvertimeData.set(false);
+ }
+ // parse
+ String eventUid = event.getUid();
+ long dispatchTime = event.getMsgTime() - event.getMsgTime() % MINUTE_MS;
+ String dispatchKey = eventUid + "." + dispatchTime;
+ //
Review comment:
Delete empty comments
##########
File path: inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/dispatch/DispatchManager.java
##########
@@ -0,0 +1,160 @@
+/**
+ * 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 java.util.ArrayList;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.flume.Context;
+import org.apache.inlong.sdk.commons.protocol.ProxyEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * DispatchManager
+ */
+public class DispatchManager {
+
+ public static final Logger LOG = LoggerFactory.getLogger(DispatchManager.class);
+ public static final String KEY_DISPATCH_TIMEOUT = "dispatchTimeout";
+ public static final String KEY_DISPATCH_MAX_PACKCOUNT = "dispatchMaxPackCount";
+ public static final String KEY_DISPATCH_MAX_PACKSIZE = "dispatchMaxPackSize";
+ public static final long DEFAULT_DISPATCH_TIMEOUT = 2000;
+ public static final long DEFAULT_DISPATCH_MAX_PACKCOUNT = 256;
+ public static final long DEFAULT_DISPATCH_MAX_PACKSIZE = 327680;
+ public static final long MINUTE_MS = 60L * 1000;
+
+ private LinkedBlockingQueue<DispatchProfile> dispatchQueue;
+ private final long dispatchTimeout;
+ private final long maxPackCount;
+ private final long maxPackSize;
+ private ConcurrentHashMap<String, DispatchProfile> profileCache = new ConcurrentHashMap<>();
+ //
+ private AtomicBoolean needOutputOvertimeData = new AtomicBoolean(false);
+
+ /**
+ * Constructor
+ *
+ * @param context
+ * @param dispatchQueue
+ */
+ public DispatchManager(Context context, LinkedBlockingQueue<DispatchProfile> dispatchQueue) {
+ this.dispatchQueue = dispatchQueue;
+ this.dispatchTimeout = context.getLong(KEY_DISPATCH_TIMEOUT, DEFAULT_DISPATCH_TIMEOUT);
+ this.maxPackCount = context.getLong(KEY_DISPATCH_MAX_PACKCOUNT, DEFAULT_DISPATCH_MAX_PACKCOUNT);
+ this.maxPackSize = context.getLong(KEY_DISPATCH_MAX_PACKSIZE, DEFAULT_DISPATCH_MAX_PACKSIZE);
+ }
+
+ /**
+ * addEvent
+ *
+ * @param event
+ */
+ public void addEvent(ProxyEvent event) {
+ if (needOutputOvertimeData.get()) {
+ this.outputOvertimeData();
+ this.needOutputOvertimeData.set(false);
+ }
+ // parse
+ String eventUid = event.getUid();
+ long dispatchTime = event.getMsgTime() - event.getMsgTime() % MINUTE_MS;
+ String dispatchKey = eventUid + "." + dispatchTime;
+ //
+ DispatchProfile dispatchProfile = this.profileCache.get(dispatchKey);
+ if (dispatchProfile == null) {
+ dispatchProfile = new DispatchProfile(eventUid, event.getInlongGroupId(), event.getInlongStreamId(),
+ dispatchTime);
+ this.profileCache.put(dispatchKey, dispatchProfile);
+ }
+ //
Review comment:
ditto
##########
File path: inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/dispatch/DispatchProfile.java
##########
@@ -0,0 +1,174 @@
+/**
+ * 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 java.util.ArrayList;
+import java.util.List;
+
Review comment:
Delete empty line
##########
File path: inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/SinkContext.java
##########
@@ -0,0 +1,190 @@
+/**
+ * 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.sink;
+
+import java.util.Date;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.apache.flume.Channel;
+import org.apache.flume.Context;
+import org.apache.inlong.commons.config.metrics.MetricRegister;
+import org.apache.inlong.dataproxy.config.holder.CommonPropertiesHolder;
+import org.apache.inlong.dataproxy.metrics.DataProxyMetricItemSet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * SinkContext
+ */
+public class SinkContext {
+
+ public static final Logger LOG = LoggerFactory.getLogger(SinkContext.class);
+
+ public static final String KEY_MAX_THREADS = "maxThreads";
+ public static final String KEY_PROCESSINTERVAL = "processInterval";
+ public static final String KEY_RELOADINTERVAL = "reloadInterval";
+
+ protected final String clusterId;
+ protected final String sinkName;
+ protected final Context sinkContext;
+
+ protected final Channel channel;
+ //
Review comment:
ditto
--
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] imvan commented on a change in pull request #2442: [INLONG-2380] DataProxy support Kafka sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
imvan commented on a change in pull request #2442:
URL: https://github.com/apache/incubator-inlong/pull/2442#discussion_r805536654
##########
File path: inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/kafkazone/KafkaZoneSinkContext.java
##########
@@ -0,0 +1,261 @@
+/**
+ * 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.sink.kafkazone;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.flume.Channel;
+import org.apache.flume.Context;
+import org.apache.inlong.dataproxy.config.RemoteConfigManager;
+import org.apache.inlong.dataproxy.config.holder.CacheClusterConfigHolder;
+import org.apache.inlong.dataproxy.config.holder.CommonPropertiesHolder;
+import org.apache.inlong.dataproxy.config.holder.IdTopicConfigHolder;
+import org.apache.inlong.dataproxy.dispatch.DispatchProfile;
+import org.apache.inlong.dataproxy.metrics.DataProxyMetricItem;
+import org.apache.inlong.dataproxy.metrics.audit.AuditUtils;
+import org.apache.inlong.dataproxy.sink.SinkContext;
+import org.apache.inlong.sdk.commons.protocol.ProxySdk.INLONG_COMPRESSED_TYPE;
+
+/**
+ *
+ * KafkaZoneSinkContext
+ */
+public class KafkaZoneSinkContext extends SinkContext {
+
+ public static final String KEY_NODE_ID = "nodeId";
+ public static final String PREFIX_PRODUCER = "producer.";
+ public static final String KEY_COMPRESS_TYPE = "compressType";
+
+ private final LinkedBlockingQueue<DispatchProfile> dispatchQueue;
+
+ private final String proxyClusterId;
+ private final String nodeId;
+ private final Context producerContext;
+ //
+ private final IdTopicConfigHolder idTopicHolder;
+ private final CacheClusterConfigHolder cacheHolder;
+ private final INLONG_COMPRESSED_TYPE compressType;
+
+ /**
+ * Constructor
+ *
+ * @param context
+ */
+ public KafkaZoneSinkContext(String sinkName, Context context, Channel channel,
+ LinkedBlockingQueue<DispatchProfile> dispatchQueue) {
+ super(sinkName, context, channel);
+ this.dispatchQueue = dispatchQueue;
+ // proxyClusterId
+ this.proxyClusterId = CommonPropertiesHolder.getString(RemoteConfigManager.KEY_PROXY_CLUSTER_NAME);
+ // nodeId
+ this.nodeId = CommonPropertiesHolder.getString(KEY_NODE_ID, "127.0.0.1");
+ // compressionType
+ String strCompressionType = CommonPropertiesHolder.getString(KEY_COMPRESS_TYPE,
+ INLONG_COMPRESSED_TYPE.INLONG_SNAPPY.name());
+ this.compressType = INLONG_COMPRESSED_TYPE.valueOf(strCompressionType);
+ // producerContext
+ Map<String, String> producerParams = context.getSubProperties(PREFIX_PRODUCER);
+ this.producerContext = new Context(producerParams);
+ // idTopicHolder
+ this.idTopicHolder = new IdTopicConfigHolder();
+ this.idTopicHolder.configure(context);
+ // cacheHolder
+ this.cacheHolder = new CacheClusterConfigHolder();
+ this.cacheHolder.configure(context);
+ }
+
+ /**
+ * start
+ */
+ public void start() {
+ super.start();
+ this.idTopicHolder.start();
+ this.cacheHolder.start();
+ }
+
+ /**
+ * close
+ */
+ public void close() {
+ super.close();
+ this.idTopicHolder.close();
+ this.cacheHolder.close();
+ }
+
+ /**
+ * get proxyClusterId
+ *
+ * @return the proxyClusterId
+ */
+ public String getProxyClusterId() {
+ return proxyClusterId;
+ }
+
+ /**
+ * get dispatchQueue
+ *
+ * @return the dispatchQueue
+ */
+ public LinkedBlockingQueue<DispatchProfile> getDispatchQueue() {
+ return dispatchQueue;
+ }
+
+ /**
+ * get producerContext
+ *
+ * @return the producerContext
+ */
+ public Context getProducerContext() {
+ return producerContext;
+ }
+
+ /**
+ * get idTopicHolder
+ *
+ * @return the idTopicHolder
+ */
+ public IdTopicConfigHolder getIdTopicHolder() {
+ return idTopicHolder;
+ }
+
+ /**
+ * get cacheHolder
+ *
+ * @return the cacheHolder
+ */
+ public CacheClusterConfigHolder getCacheHolder() {
+ return cacheHolder;
+ }
+
+ /**
+ * get compressType
+ *
+ * @return the compressType
+ */
+ public INLONG_COMPRESSED_TYPE getCompressType() {
+ return compressType;
+ }
+
+ /**
+ * get nodeId
+ *
+ * @return the nodeId
+ */
+ public String getNodeId() {
+ return nodeId;
+ }
+
+ /**
+ * addSendMetric
+ *
+ * @param currentRecord
+ * @param bid
+ */
+ public void addSendMetric(DispatchProfile currentRecord, String bid) {
Review comment:
i think *addSendingMetric* is a better 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 change in pull request #2442: [INLONG-2380] DataProxy support Kafka sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on a change in pull request #2442:
URL: https://github.com/apache/incubator-inlong/pull/2442#discussion_r805540317
##########
File path: inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/kafkazone/KafkaZoneSinkContext.java
##########
@@ -0,0 +1,261 @@
+/**
+ * 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.sink.kafkazone;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.flume.Channel;
+import org.apache.flume.Context;
+import org.apache.inlong.dataproxy.config.RemoteConfigManager;
+import org.apache.inlong.dataproxy.config.holder.CacheClusterConfigHolder;
+import org.apache.inlong.dataproxy.config.holder.CommonPropertiesHolder;
+import org.apache.inlong.dataproxy.config.holder.IdTopicConfigHolder;
+import org.apache.inlong.dataproxy.dispatch.DispatchProfile;
+import org.apache.inlong.dataproxy.metrics.DataProxyMetricItem;
+import org.apache.inlong.dataproxy.metrics.audit.AuditUtils;
+import org.apache.inlong.dataproxy.sink.SinkContext;
+import org.apache.inlong.sdk.commons.protocol.ProxySdk.INLONG_COMPRESSED_TYPE;
+
+/**
+ *
+ * KafkaZoneSinkContext
+ */
+public class KafkaZoneSinkContext extends SinkContext {
+
+ public static final String KEY_NODE_ID = "nodeId";
+ public static final String PREFIX_PRODUCER = "producer.";
+ public static final String KEY_COMPRESS_TYPE = "compressType";
+
+ private final LinkedBlockingQueue<DispatchProfile> dispatchQueue;
+
+ private final String proxyClusterId;
+ private final String nodeId;
+ private final Context producerContext;
+ //
+ private final IdTopicConfigHolder idTopicHolder;
+ private final CacheClusterConfigHolder cacheHolder;
+ private final INLONG_COMPRESSED_TYPE compressType;
+
+ /**
+ * Constructor
+ *
+ * @param context
+ */
+ public KafkaZoneSinkContext(String sinkName, Context context, Channel channel,
+ LinkedBlockingQueue<DispatchProfile> dispatchQueue) {
+ super(sinkName, context, channel);
+ this.dispatchQueue = dispatchQueue;
+ // proxyClusterId
+ this.proxyClusterId = CommonPropertiesHolder.getString(RemoteConfigManager.KEY_PROXY_CLUSTER_NAME);
+ // nodeId
+ this.nodeId = CommonPropertiesHolder.getString(KEY_NODE_ID, "127.0.0.1");
+ // compressionType
+ String strCompressionType = CommonPropertiesHolder.getString(KEY_COMPRESS_TYPE,
+ INLONG_COMPRESSED_TYPE.INLONG_SNAPPY.name());
+ this.compressType = INLONG_COMPRESSED_TYPE.valueOf(strCompressionType);
+ // producerContext
+ Map<String, String> producerParams = context.getSubProperties(PREFIX_PRODUCER);
+ this.producerContext = new Context(producerParams);
+ // idTopicHolder
+ this.idTopicHolder = new IdTopicConfigHolder();
+ this.idTopicHolder.configure(context);
+ // cacheHolder
+ this.cacheHolder = new CacheClusterConfigHolder();
+ this.cacheHolder.configure(context);
+ }
+
+ /**
+ * start
+ */
+ public void start() {
+ super.start();
+ this.idTopicHolder.start();
+ this.cacheHolder.start();
+ }
+
+ /**
+ * close
+ */
+ public void close() {
+ super.close();
+ this.idTopicHolder.close();
+ this.cacheHolder.close();
+ }
+
+ /**
+ * get proxyClusterId
+ *
+ * @return the proxyClusterId
+ */
+ public String getProxyClusterId() {
+ return proxyClusterId;
+ }
+
+ /**
+ * get dispatchQueue
+ *
+ * @return the dispatchQueue
+ */
+ public LinkedBlockingQueue<DispatchProfile> getDispatchQueue() {
+ return dispatchQueue;
+ }
+
+ /**
+ * get producerContext
+ *
+ * @return the producerContext
+ */
+ public Context getProducerContext() {
+ return producerContext;
+ }
+
+ /**
+ * get idTopicHolder
+ *
+ * @return the idTopicHolder
+ */
+ public IdTopicConfigHolder getIdTopicHolder() {
+ return idTopicHolder;
+ }
+
+ /**
+ * get cacheHolder
+ *
+ * @return the cacheHolder
+ */
+ public CacheClusterConfigHolder getCacheHolder() {
+ return cacheHolder;
+ }
+
+ /**
+ * get compressType
+ *
+ * @return the compressType
+ */
+ public INLONG_COMPRESSED_TYPE getCompressType() {
+ return compressType;
+ }
+
+ /**
+ * get nodeId
+ *
+ * @return the nodeId
+ */
+ public String getNodeId() {
+ return nodeId;
+ }
+
+ /**
+ * addSendMetric
+ *
+ * @param currentRecord
+ * @param bid
+ */
+ public void addSendMetric(DispatchProfile currentRecord, String bid) {
Review comment:
change to addSendingMetric
--
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] imvan commented on a change in pull request #2442: [INLONG-2380] DataProxy support Kafka sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
imvan commented on a change in pull request #2442:
URL: https://github.com/apache/incubator-inlong/pull/2442#discussion_r805465955
##########
File path: inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/dispatch/DispatchManager.java
##########
@@ -0,0 +1,160 @@
+/**
+ * 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 java.util.ArrayList;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.flume.Context;
+import org.apache.inlong.sdk.commons.protocol.ProxyEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * DispatchManager
+ */
+public class DispatchManager {
+
+ public static final Logger LOG = LoggerFactory.getLogger(DispatchManager.class);
+ public static final String KEY_DISPATCH_TIMEOUT = "dispatchTimeout";
+ public static final String KEY_DISPATCH_MAX_PACKCOUNT = "dispatchMaxPackCount";
+ public static final String KEY_DISPATCH_MAX_PACKSIZE = "dispatchMaxPackSize";
+ public static final long DEFAULT_DISPATCH_TIMEOUT = 2000;
+ public static final long DEFAULT_DISPATCH_MAX_PACKCOUNT = 256;
+ public static final long DEFAULT_DISPATCH_MAX_PACKSIZE = 327680;
+ public static final long MINUTE_MS = 60L * 1000;
+
+ private LinkedBlockingQueue<DispatchProfile> dispatchQueue;
+ private final long dispatchTimeout;
+ private final long maxPackCount;
+ private final long maxPackSize;
+ private ConcurrentHashMap<String, DispatchProfile> profileCache = new ConcurrentHashMap<>();
Review comment:
dispatchQueue should be defined after maxPackSize
--
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 change in pull request #2442: [INLONG-2380] DataProxy support Kafka sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on a change in pull request #2442:
URL: https://github.com/apache/incubator-inlong/pull/2442#discussion_r805470071
##########
File path: inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/SinkContext.java
##########
@@ -0,0 +1,190 @@
+/**
+ * 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.sink;
+
+import java.util.Date;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.apache.flume.Channel;
+import org.apache.flume.Context;
+import org.apache.inlong.commons.config.metrics.MetricRegister;
+import org.apache.inlong.dataproxy.config.holder.CommonPropertiesHolder;
+import org.apache.inlong.dataproxy.metrics.DataProxyMetricItemSet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * SinkContext
+ */
+public class SinkContext {
+
+ public static final Logger LOG = LoggerFactory.getLogger(SinkContext.class);
+
+ public static final String KEY_MAX_THREADS = "maxThreads";
+ public static final String KEY_PROCESSINTERVAL = "processInterval";
+ public static final String KEY_RELOADINTERVAL = "reloadInterval";
+
+ protected final String clusterId;
+ protected final String sinkName;
+ protected final Context sinkContext;
+
+ protected final Channel channel;
+ //
Review comment:
add comment.
--
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 closed pull request #2442: [INLONG-2380] DataProxy support Kafka sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
dockerzhang closed pull request #2442:
URL: https://github.com/apache/incubator-inlong/pull/2442
--
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 change in pull request #2442: [INLONG-2380] DataProxy support Kafka sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on a change in pull request #2442:
URL: https://github.com/apache/incubator-inlong/pull/2442#discussion_r805540794
##########
File path: inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/kafkazone/KafkaZoneProducer.java
##########
@@ -0,0 +1,162 @@
+/**
+ * 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.sink.kafkazone;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.inlong.dataproxy.config.pojo.CacheClusterConfig;
+import org.apache.inlong.dataproxy.dispatch.DispatchProfile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * KafkaZoneProducer
+ */
+public class KafkaZoneProducer {
+
+ public static final Logger LOG = LoggerFactory.getLogger(KafkaZoneProducer.class);
+
+ private final String workerName;
+ private final KafkaZoneSinkContext context;
+ private Timer reloadTimer;
+
+ private List<KafkaClusterProducer> clusterList = new ArrayList<>();
+ private List<KafkaClusterProducer> deletingClusterList = new ArrayList<>();
+
+ private AtomicInteger clusterIndex = new AtomicInteger(0);
+
+ /**
+ * Constructor
+ *
+ * @param workerName
+ * @param context
+ */
+ public KafkaZoneProducer(String workerName, KafkaZoneSinkContext context) {
+ this.workerName = workerName;
+ this.context = context;
+ }
+
+ /**
+ * start
+ */
+ public void start() {
+ try {
+ this.reload();
+ this.setReloadTimer();
+ } catch (Exception e) {
+ LOG.error(e.getMessage(), e);
+ }
+ }
+
+ /**
+ * close
+ */
+ public void close() {
+ try {
+ this.reloadTimer.cancel();
+ } catch (Exception e) {
+ LOG.error(e.getMessage(), e);
+ }
+ for (KafkaClusterProducer cluster : this.clusterList) {
+ cluster.stop();
+ }
+ }
+
+ /**
+ * setReloadTimer
+ */
+ private void setReloadTimer() {
+ reloadTimer = new Timer(true);
+ TimerTask task = new TimerTask() {
+
+ public void run() {
+ reload();
+ }
+ };
+ reloadTimer.schedule(task, new Date(System.currentTimeMillis() + context.getReloadInterval()),
+ context.getReloadInterval());
+ }
+
+ /**
+ * reload
+ */
+ public void reload() {
+ try {
+ // stop deleted cluster
+ deletingClusterList.forEach(item -> {
+ item.stop();
+ });
+ deletingClusterList.clear();
+ // update cluster list
+ List<CacheClusterConfig> configList = this.context.getCacheHolder().getConfigList();
+ List<KafkaClusterProducer> newClusterList = new ArrayList<>(configList.size());
+ // prepare
+ Set<String> newClusterNames = new HashSet<>();
+ configList.forEach(item -> {
+ newClusterNames.add(item.getClusterName());
+ });
+ Set<String> oldClusterNames = new HashSet<>();
+ clusterList.forEach(item -> {
+ oldClusterNames.add(item.getCacheClusterName());
+ });
+ // add
+ for (CacheClusterConfig config : configList) {
+ if (!oldClusterNames.contains(config.getClusterName())) {
+ KafkaClusterProducer cluster = new KafkaClusterProducer(workerName, config, context);
+ cluster.start();
+ newClusterList.add(cluster);
+ }
+ }
+ // remove
+ for (KafkaClusterProducer cluster : this.clusterList) {
+ if (newClusterNames.contains(cluster.getCacheClusterName())) {
+ newClusterList.add(cluster);
+ } else {
+ deletingClusterList.add(cluster);
+ }
+ }
+ this.clusterList = newClusterList;
+ } catch (Throwable e) {
+ LOG.error(e.getMessage(), e);
+ }
+ }
+
+ /**
+ * send
+ *
+ * @param event
+ */
+ public boolean send(DispatchProfile event) {
+ int currentIndex = clusterIndex.getAndIncrement();
+ if (currentIndex > Integer.MAX_VALUE / 2) {
Review comment:
ADD MAX_INDEX
--
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 change in pull request #2442: [INLONG-2380] DataProxy support Kafka sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on a change in pull request #2442:
URL: https://github.com/apache/incubator-inlong/pull/2442#discussion_r805539706
##########
File path: inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/kafkazone/KafkaZoneSinkContext.java
##########
@@ -0,0 +1,261 @@
+/**
+ * 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.sink.kafkazone;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.flume.Channel;
+import org.apache.flume.Context;
+import org.apache.inlong.dataproxy.config.RemoteConfigManager;
+import org.apache.inlong.dataproxy.config.holder.CacheClusterConfigHolder;
+import org.apache.inlong.dataproxy.config.holder.CommonPropertiesHolder;
+import org.apache.inlong.dataproxy.config.holder.IdTopicConfigHolder;
+import org.apache.inlong.dataproxy.dispatch.DispatchProfile;
+import org.apache.inlong.dataproxy.metrics.DataProxyMetricItem;
+import org.apache.inlong.dataproxy.metrics.audit.AuditUtils;
+import org.apache.inlong.dataproxy.sink.SinkContext;
+import org.apache.inlong.sdk.commons.protocol.ProxySdk.INLONG_COMPRESSED_TYPE;
+
+/**
+ *
+ * KafkaZoneSinkContext
+ */
+public class KafkaZoneSinkContext extends SinkContext {
+
+ public static final String KEY_NODE_ID = "nodeId";
+ public static final String PREFIX_PRODUCER = "producer.";
+ public static final String KEY_COMPRESS_TYPE = "compressType";
+
+ private final LinkedBlockingQueue<DispatchProfile> dispatchQueue;
+
+ private final String proxyClusterId;
+ private final String nodeId;
+ private final Context producerContext;
+ //
+ private final IdTopicConfigHolder idTopicHolder;
+ private final CacheClusterConfigHolder cacheHolder;
+ private final INLONG_COMPRESSED_TYPE compressType;
+
+ /**
+ * Constructor
+ *
+ * @param context
+ */
+ public KafkaZoneSinkContext(String sinkName, Context context, Channel channel,
+ LinkedBlockingQueue<DispatchProfile> dispatchQueue) {
+ super(sinkName, context, channel);
+ this.dispatchQueue = dispatchQueue;
+ // proxyClusterId
+ this.proxyClusterId = CommonPropertiesHolder.getString(RemoteConfigManager.KEY_PROXY_CLUSTER_NAME);
+ // nodeId
+ this.nodeId = CommonPropertiesHolder.getString(KEY_NODE_ID, "127.0.0.1");
+ // compressionType
+ String strCompressionType = CommonPropertiesHolder.getString(KEY_COMPRESS_TYPE,
+ INLONG_COMPRESSED_TYPE.INLONG_SNAPPY.name());
+ this.compressType = INLONG_COMPRESSED_TYPE.valueOf(strCompressionType);
+ // producerContext
+ Map<String, String> producerParams = context.getSubProperties(PREFIX_PRODUCER);
+ this.producerContext = new Context(producerParams);
+ // idTopicHolder
+ this.idTopicHolder = new IdTopicConfigHolder();
+ this.idTopicHolder.configure(context);
+ // cacheHolder
+ this.cacheHolder = new CacheClusterConfigHolder();
+ this.cacheHolder.configure(context);
+ }
+
+ /**
+ * start
+ */
+ public void start() {
+ super.start();
+ this.idTopicHolder.start();
+ this.cacheHolder.start();
+ }
+
+ /**
+ * close
+ */
+ public void close() {
+ super.close();
+ this.idTopicHolder.close();
+ this.cacheHolder.close();
+ }
+
+ /**
+ * get proxyClusterId
+ *
+ * @return the proxyClusterId
+ */
+ public String getProxyClusterId() {
+ return proxyClusterId;
+ }
+
+ /**
+ * get dispatchQueue
+ *
+ * @return the dispatchQueue
+ */
+ public LinkedBlockingQueue<DispatchProfile> getDispatchQueue() {
+ return dispatchQueue;
+ }
+
+ /**
+ * get producerContext
+ *
+ * @return the producerContext
+ */
+ public Context getProducerContext() {
+ return producerContext;
+ }
+
+ /**
+ * get idTopicHolder
+ *
+ * @return the idTopicHolder
+ */
+ public IdTopicConfigHolder getIdTopicHolder() {
+ return idTopicHolder;
+ }
+
+ /**
+ * get cacheHolder
+ *
+ * @return the cacheHolder
+ */
+ public CacheClusterConfigHolder getCacheHolder() {
+ return cacheHolder;
+ }
+
+ /**
+ * get compressType
+ *
+ * @return the compressType
+ */
+ public INLONG_COMPRESSED_TYPE getCompressType() {
+ return compressType;
+ }
+
+ /**
+ * get nodeId
+ *
+ * @return the nodeId
+ */
+ public String getNodeId() {
+ return nodeId;
+ }
+
+ /**
+ * addSendMetric
+ *
+ * @param currentRecord
+ * @param bid
+ */
+ public void addSendMetric(DispatchProfile currentRecord, String bid) {
+ Map<String, String> dimensions = new HashMap<>();
+ dimensions.put(DataProxyMetricItem.KEY_CLUSTER_ID, this.getClusterId());
+ // metric
+ fillInlongId(currentRecord, dimensions);
+ dimensions.put(DataProxyMetricItem.KEY_SINK_ID, this.getSinkName());
+ dimensions.put(DataProxyMetricItem.KEY_SINK_DATA_ID, bid);
+ long msgTime = currentRecord.getDispatchTime();
+ long auditFormatTime = msgTime - msgTime % CommonPropertiesHolder.getAuditFormatInterval();
+ dimensions.put(DataProxyMetricItem.KEY_MESSAGE_TIME, String.valueOf(auditFormatTime));
+ DataProxyMetricItem metricItem = this.getMetricItemSet().findMetricItem(dimensions);
+ long count = currentRecord.getCount();
+ long size = currentRecord.getSize();
+ metricItem.sendCount.addAndGet(count);
+ metricItem.sendSize.addAndGet(size);
+ }
+
+ /**
+ * addReadFailMetric
+ */
+ public void addSendFailMetric() {
Review comment:
Sink module only have send operation 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.
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 closed pull request #2442: [INLONG-2380] DataProxy support Kafka sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
dockerzhang closed pull request #2442:
URL: https://github.com/apache/incubator-inlong/pull/2442
--
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 commented on pull request #2442: [INLONG-2380] DataProxy support Kafka sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
dockerzhang commented on pull request #2442:
URL: https://github.com/apache/incubator-inlong/pull/2442#issuecomment-1040067781
duplicate with https://github.com/apache/incubator-inlong/pull/2503， close 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] dockerzhang commented on pull request #2442: [INLONG-2380] DataProxy support Kafka sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
dockerzhang commented on pull request #2442:
URL: https://github.com/apache/incubator-inlong/pull/2442#issuecomment-1040067781
duplicate with https://github.com/apache/incubator-inlong/pull/2503， close 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] imvan commented on a change in pull request #2442: [INLONG-2380] DataProxy support Kafka sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
imvan commented on a change in pull request #2442:
URL: https://github.com/apache/incubator-inlong/pull/2442#discussion_r805476365
##########
File path: inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/kafkazone/KafkaZoneProducer.java
##########
@@ -0,0 +1,162 @@
+/**
+ * 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.sink.kafkazone;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.inlong.dataproxy.config.pojo.CacheClusterConfig;
+import org.apache.inlong.dataproxy.dispatch.DispatchProfile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * KafkaZoneProducer
+ */
+public class KafkaZoneProducer {
+
+ public static final Logger LOG = LoggerFactory.getLogger(KafkaZoneProducer.class);
+
+ private final String workerName;
+ private final KafkaZoneSinkContext context;
+ private Timer reloadTimer;
+
+ private List<KafkaClusterProducer> clusterList = new ArrayList<>();
+ private List<KafkaClusterProducer> deletingClusterList = new ArrayList<>();
+
+ private AtomicInteger clusterIndex = new AtomicInteger(0);
+
+ /**
+ * Constructor
+ *
+ * @param workerName
+ * @param context
+ */
+ public KafkaZoneProducer(String workerName, KafkaZoneSinkContext context) {
+ this.workerName = workerName;
+ this.context = context;
+ }
+
+ /**
+ * start
+ */
+ public void start() {
+ try {
+ this.reload();
+ this.setReloadTimer();
+ } catch (Exception e) {
+ LOG.error(e.getMessage(), e);
+ }
+ }
+
+ /**
+ * close
+ */
+ public void close() {
+ try {
+ this.reloadTimer.cancel();
+ } catch (Exception e) {
+ LOG.error(e.getMessage(), e);
+ }
+ for (KafkaClusterProducer cluster : this.clusterList) {
+ cluster.stop();
+ }
+ }
+
+ /**
+ * setReloadTimer
+ */
+ private void setReloadTimer() {
+ reloadTimer = new Timer(true);
+ TimerTask task = new TimerTask() {
+
+ public void run() {
+ reload();
+ }
+ };
+ reloadTimer.schedule(task, new Date(System.currentTimeMillis() + context.getReloadInterval()),
+ context.getReloadInterval());
+ }
+
+ /**
+ * reload
+ */
+ public void reload() {
+ try {
+ // stop deleted cluster
+ deletingClusterList.forEach(item -> {
+ item.stop();
+ });
+ deletingClusterList.clear();
+ // update cluster list
+ List<CacheClusterConfig> configList = this.context.getCacheHolder().getConfigList();
+ List<KafkaClusterProducer> newClusterList = new ArrayList<>(configList.size());
+ // prepare
+ Set<String> newClusterNames = new HashSet<>();
+ configList.forEach(item -> {
+ newClusterNames.add(item.getClusterName());
+ });
+ Set<String> oldClusterNames = new HashSet<>();
+ clusterList.forEach(item -> {
+ oldClusterNames.add(item.getCacheClusterName());
+ });
+ // add
+ for (CacheClusterConfig config : configList) {
+ if (!oldClusterNames.contains(config.getClusterName())) {
+ KafkaClusterProducer cluster = new KafkaClusterProducer(workerName, config, context);
+ cluster.start();
+ newClusterList.add(cluster);
+ }
+ }
+ // remove
+ for (KafkaClusterProducer cluster : this.clusterList) {
+ if (newClusterNames.contains(cluster.getCacheClusterName())) {
+ newClusterList.add(cluster);
+ } else {
+ deletingClusterList.add(cluster);
+ }
+ }
+ this.clusterList = newClusterList;
+ } catch (Throwable e) {
+ LOG.error(e.getMessage(), e);
+ }
+ }
+
+ /**
+ * send
+ *
+ * @param event
+ */
+ public boolean send(DispatchProfile event) {
+ int currentIndex = clusterIndex.getAndIncrement();
+ if (currentIndex > Integer.MAX_VALUE / 2) {
Review comment:
magic number
--
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] imvan commented on a change in pull request #2442: [INLONG-2380] DataProxy support Kafka sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
imvan commented on a change in pull request #2442:
URL: https://github.com/apache/incubator-inlong/pull/2442#discussion_r805545067
##########
File path: inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/kafkazone/KafkaZoneSinkContext.java
##########
@@ -0,0 +1,261 @@
+/**
+ * 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.sink.kafkazone;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.flume.Channel;
+import org.apache.flume.Context;
+import org.apache.inlong.dataproxy.config.RemoteConfigManager;
+import org.apache.inlong.dataproxy.config.holder.CacheClusterConfigHolder;
+import org.apache.inlong.dataproxy.config.holder.CommonPropertiesHolder;
+import org.apache.inlong.dataproxy.config.holder.IdTopicConfigHolder;
+import org.apache.inlong.dataproxy.dispatch.DispatchProfile;
+import org.apache.inlong.dataproxy.metrics.DataProxyMetricItem;
+import org.apache.inlong.dataproxy.metrics.audit.AuditUtils;
+import org.apache.inlong.dataproxy.sink.SinkContext;
+import org.apache.inlong.sdk.commons.protocol.ProxySdk.INLONG_COMPRESSED_TYPE;
+
+/**
+ *
+ * KafkaZoneSinkContext
+ */
+public class KafkaZoneSinkContext extends SinkContext {
+
+ public static final String KEY_NODE_ID = "nodeId";
+ public static final String PREFIX_PRODUCER = "producer.";
+ public static final String KEY_COMPRESS_TYPE = "compressType";
+
+ private final LinkedBlockingQueue<DispatchProfile> dispatchQueue;
+
+ private final String proxyClusterId;
+ private final String nodeId;
+ private final Context producerContext;
+ //
+ private final IdTopicConfigHolder idTopicHolder;
+ private final CacheClusterConfigHolder cacheHolder;
+ private final INLONG_COMPRESSED_TYPE compressType;
+
+ /**
+ * Constructor
+ *
+ * @param context
+ */
+ public KafkaZoneSinkContext(String sinkName, Context context, Channel channel,
+ LinkedBlockingQueue<DispatchProfile> dispatchQueue) {
+ super(sinkName, context, channel);
+ this.dispatchQueue = dispatchQueue;
+ // proxyClusterId
+ this.proxyClusterId = CommonPropertiesHolder.getString(RemoteConfigManager.KEY_PROXY_CLUSTER_NAME);
+ // nodeId
+ this.nodeId = CommonPropertiesHolder.getString(KEY_NODE_ID, "127.0.0.1");
+ // compressionType
+ String strCompressionType = CommonPropertiesHolder.getString(KEY_COMPRESS_TYPE,
+ INLONG_COMPRESSED_TYPE.INLONG_SNAPPY.name());
+ this.compressType = INLONG_COMPRESSED_TYPE.valueOf(strCompressionType);
+ // producerContext
+ Map<String, String> producerParams = context.getSubProperties(PREFIX_PRODUCER);
+ this.producerContext = new Context(producerParams);
+ // idTopicHolder
+ this.idTopicHolder = new IdTopicConfigHolder();
+ this.idTopicHolder.configure(context);
+ // cacheHolder
+ this.cacheHolder = new CacheClusterConfigHolder();
+ this.cacheHolder.configure(context);
+ }
+
+ /**
+ * start
+ */
+ public void start() {
+ super.start();
+ this.idTopicHolder.start();
+ this.cacheHolder.start();
+ }
+
+ /**
+ * close
+ */
+ public void close() {
+ super.close();
+ this.idTopicHolder.close();
+ this.cacheHolder.close();
+ }
+
+ /**
+ * get proxyClusterId
+ *
+ * @return the proxyClusterId
+ */
+ public String getProxyClusterId() {
+ return proxyClusterId;
+ }
+
+ /**
+ * get dispatchQueue
+ *
+ * @return the dispatchQueue
+ */
+ public LinkedBlockingQueue<DispatchProfile> getDispatchQueue() {
+ return dispatchQueue;
+ }
+
+ /**
+ * get producerContext
+ *
+ * @return the producerContext
+ */
+ public Context getProducerContext() {
+ return producerContext;
+ }
+
+ /**
+ * get idTopicHolder
+ *
+ * @return the idTopicHolder
+ */
+ public IdTopicConfigHolder getIdTopicHolder() {
+ return idTopicHolder;
+ }
+
+ /**
+ * get cacheHolder
+ *
+ * @return the cacheHolder
+ */
+ public CacheClusterConfigHolder getCacheHolder() {
+ return cacheHolder;
+ }
+
+ /**
+ * get compressType
+ *
+ * @return the compressType
+ */
+ public INLONG_COMPRESSED_TYPE getCompressType() {
+ return compressType;
+ }
+
+ /**
+ * get nodeId
+ *
+ * @return the nodeId
+ */
+ public String getNodeId() {
+ return nodeId;
+ }
+
+ /**
+ * addSendMetric
+ *
+ * @param currentRecord
+ * @param bid
+ */
+ public void addSendMetric(DispatchProfile currentRecord, String bid) {
+ Map<String, String> dimensions = new HashMap<>();
+ dimensions.put(DataProxyMetricItem.KEY_CLUSTER_ID, this.getClusterId());
+ // metric
+ fillInlongId(currentRecord, dimensions);
+ dimensions.put(DataProxyMetricItem.KEY_SINK_ID, this.getSinkName());
+ dimensions.put(DataProxyMetricItem.KEY_SINK_DATA_ID, bid);
+ long msgTime = currentRecord.getDispatchTime();
+ long auditFormatTime = msgTime - msgTime % CommonPropertiesHolder.getAuditFormatInterval();
+ dimensions.put(DataProxyMetricItem.KEY_MESSAGE_TIME, String.valueOf(auditFormatTime));
+ DataProxyMetricItem metricItem = this.getMetricItemSet().findMetricItem(dimensions);
+ long count = currentRecord.getCount();
+ long size = currentRecord.getSize();
+ metricItem.sendCount.addAndGet(count);
+ metricItem.sendSize.addAndGet(size);
+ }
+
+ /**
+ * addReadFailMetric
+ */
+ public void addSendFailMetric() {
Review comment:
maybe should add some comments to explain the reason why method name sendFailMetric, but add readFailCount
--
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 change in pull request #2442: [INLONG-2380] DataProxy support Kafka sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on a change in pull request #2442:
URL: https://github.com/apache/incubator-inlong/pull/2442#discussion_r805469809
##########
File path: inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/dispatch/DispatchManager.java
##########
@@ -0,0 +1,160 @@
+/**
+ * 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 java.util.ArrayList;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.flume.Context;
+import org.apache.inlong.sdk.commons.protocol.ProxyEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * DispatchManager
+ */
+public class DispatchManager {
+
+ public static final Logger LOG = LoggerFactory.getLogger(DispatchManager.class);
+ public static final String KEY_DISPATCH_TIMEOUT = "dispatchTimeout";
+ public static final String KEY_DISPATCH_MAX_PACKCOUNT = "dispatchMaxPackCount";
+ public static final String KEY_DISPATCH_MAX_PACKSIZE = "dispatchMaxPackSize";
+ public static final long DEFAULT_DISPATCH_TIMEOUT = 2000;
+ public static final long DEFAULT_DISPATCH_MAX_PACKCOUNT = 256;
+ public static final long DEFAULT_DISPATCH_MAX_PACKSIZE = 327680;
+ public static final long MINUTE_MS = 60L * 1000;
+
+ private LinkedBlockingQueue<DispatchProfile> dispatchQueue;
+ private final long dispatchTimeout;
+ private final long maxPackCount;
+ private final long maxPackSize;
+ private ConcurrentHashMap<String, DispatchProfile> profileCache = new ConcurrentHashMap<>();
+ //
+ private AtomicBoolean needOutputOvertimeData = new AtomicBoolean(false);
+
+ /**
+ * Constructor
+ *
+ * @param context
+ * @param dispatchQueue
+ */
+ public DispatchManager(Context context, LinkedBlockingQueue<DispatchProfile> dispatchQueue) {
+ this.dispatchQueue = dispatchQueue;
+ this.dispatchTimeout = context.getLong(KEY_DISPATCH_TIMEOUT, DEFAULT_DISPATCH_TIMEOUT);
+ this.maxPackCount = context.getLong(KEY_DISPATCH_MAX_PACKCOUNT, DEFAULT_DISPATCH_MAX_PACKCOUNT);
+ this.maxPackSize = context.getLong(KEY_DISPATCH_MAX_PACKSIZE, DEFAULT_DISPATCH_MAX_PACKSIZE);
+ }
+
+ /**
+ * addEvent
+ *
+ * @param event
+ */
+ public void addEvent(ProxyEvent event) {
+ if (needOutputOvertimeData.get()) {
+ this.outputOvertimeData();
+ this.needOutputOvertimeData.set(false);
+ }
+ // parse
+ String eventUid = event.getUid();
+ long dispatchTime = event.getMsgTime() - event.getMsgTime() % MINUTE_MS;
+ String dispatchKey = eventUid + "." + dispatchTime;
+ //
Review comment:
add comment.
##########
File path: inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/dispatch/DispatchManager.java
##########
@@ -0,0 +1,160 @@
+/**
+ * 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 java.util.ArrayList;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.flume.Context;
+import org.apache.inlong.sdk.commons.protocol.ProxyEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * DispatchManager
+ */
+public class DispatchManager {
+
+ public static final Logger LOG = LoggerFactory.getLogger(DispatchManager.class);
+ public static final String KEY_DISPATCH_TIMEOUT = "dispatchTimeout";
+ public static final String KEY_DISPATCH_MAX_PACKCOUNT = "dispatchMaxPackCount";
+ public static final String KEY_DISPATCH_MAX_PACKSIZE = "dispatchMaxPackSize";
+ public static final long DEFAULT_DISPATCH_TIMEOUT = 2000;
+ public static final long DEFAULT_DISPATCH_MAX_PACKCOUNT = 256;
+ public static final long DEFAULT_DISPATCH_MAX_PACKSIZE = 327680;
+ public static final long MINUTE_MS = 60L * 1000;
+
+ private LinkedBlockingQueue<DispatchProfile> dispatchQueue;
+ private final long dispatchTimeout;
+ private final long maxPackCount;
+ private final long maxPackSize;
+ private ConcurrentHashMap<String, DispatchProfile> profileCache = new ConcurrentHashMap<>();
+ //
+ private AtomicBoolean needOutputOvertimeData = new AtomicBoolean(false);
+
+ /**
+ * Constructor
+ *
+ * @param context
+ * @param dispatchQueue
+ */
+ public DispatchManager(Context context, LinkedBlockingQueue<DispatchProfile> dispatchQueue) {
+ this.dispatchQueue = dispatchQueue;
+ this.dispatchTimeout = context.getLong(KEY_DISPATCH_TIMEOUT, DEFAULT_DISPATCH_TIMEOUT);
+ this.maxPackCount = context.getLong(KEY_DISPATCH_MAX_PACKCOUNT, DEFAULT_DISPATCH_MAX_PACKCOUNT);
+ this.maxPackSize = context.getLong(KEY_DISPATCH_MAX_PACKSIZE, DEFAULT_DISPATCH_MAX_PACKSIZE);
+ }
+
+ /**
+ * addEvent
+ *
+ * @param event
+ */
+ public void addEvent(ProxyEvent event) {
+ if (needOutputOvertimeData.get()) {
+ this.outputOvertimeData();
+ this.needOutputOvertimeData.set(false);
+ }
+ // parse
+ String eventUid = event.getUid();
+ long dispatchTime = event.getMsgTime() - event.getMsgTime() % MINUTE_MS;
+ String dispatchKey = eventUid + "." + dispatchTime;
+ //
+ DispatchProfile dispatchProfile = this.profileCache.get(dispatchKey);
+ if (dispatchProfile == null) {
+ dispatchProfile = new DispatchProfile(eventUid, event.getInlongGroupId(), event.getInlongStreamId(),
+ dispatchTime);
+ this.profileCache.put(dispatchKey, dispatchProfile);
+ }
+ //
Review comment:
add comment.
--
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