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 09:40:58 UTC
[GitHub] [incubator-inlong] luchunliang opened a new pull request #2447: [INLONG-2381] DataProxy support Tube sink of PB compression cache message protocol.
luchunliang opened a new pull request #2447:
URL: https://github.com/apache/incubator-inlong/pull/2447
### Title Name: [INLONG-2381][Inlong-DataProxy] DataProxy support Tube sink of PB compression cache message protocol.
Fixes #2381
### 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] dockerzhang merged pull request #2447: [INLONG-2381] DataProxy support Tube sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
dockerzhang merged pull request #2447:
URL: https://github.com/apache/incubator-inlong/pull/2447
--
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 #2447: [INLONG-2381] DataProxy support Tube sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on a change in pull request #2447:
URL: https://github.com/apache/incubator-inlong/pull/2447#discussion_r805541495
##########
File path: inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/tubezone/TubeZoneSinkContext.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.tubezone;
+
+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;
+
+/**
+ *
+ * TubeZoneSinkContext
+ */
+public class TubeZoneSinkContext 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 TubeZoneSinkContext(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, not read 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] imvan commented on a change in pull request #2447: [INLONG-2381] DataProxy support Tube sink of PB compression cache message protocol.
Posted by GitBox <gi...@apache.org>.
imvan commented on a change in pull request #2447:
URL: https://github.com/apache/incubator-inlong/pull/2447#discussion_r805538948
##########
File path: inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/sink/tubezone/TubeZoneSinkContext.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.tubezone;
+
+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;
+
+/**
+ *
+ * TubeZoneSinkContext
+ */
+public class TubeZoneSinkContext 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 TubeZoneSinkContext(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 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