jt2594838 commented on code in PR #17869:
URL: https://github.com/apache/iotdb/pull/17869#discussion_r3860546066
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java:
##########
@@ -1126,6 +1162,122 @@ protected TSStatus
getReceiverTemporaryUnavailableStatus(
PipeDataNodeResourceManager.memory().getTotalNonFloatingMemorySizeInBytes()));
}
+ private TPipeTransferResp recordDataNodeHandshakeIfSuccess(
+ final TPipeTransferResp resp, final TPipeTransferReq req) {
+ if (isSuccess(resp)) {
+ recordPipeReceiverHandshake(
+ PipeReceiverRuntimeRegistry.NODE_TYPE_DATA_NODE,
+ IOTDB_CONFIG.getDataNodeId(),
+ getProtocol(req));
+ }
+ return resp;
+ }
+
+ private TPipeTransferResp recordDataNodeTransferIfSuccess(final
TPipeTransferResp resp) {
+ if (isSuccess(resp)) {
+ recordPipeReceiverTransfer();
+ }
+ return resp;
+ }
+
+ private TPipeTransferResp recordConfigNodeReceiverRuntimeIfSuccess(
+ final Pair<TPipeTransferResp, Integer> respWithReceiverNodeId, final
TPipeTransferReq req) {
+ final TPipeTransferResp resp = respWithReceiverNodeId.left;
+ if (!PipeRequestType.isValidatedRequestType(req.getType())) {
+ return resp;
+ }
+
+ final PipeRequestType requestType = PipeRequestType.valueOf(req.getType());
+ if (requestType == PipeRequestType.HANDSHAKE_CONFIGNODE_V1
+ || requestType == PipeRequestType.HANDSHAKE_CONFIGNODE_V2) {
+ if (isSuccess(resp)) {
+ recordConfigNodeHandshake(req, requestType,
respWithReceiverNodeId.right);
+ }
+ } else {
+ if (isSuccess(resp)) {
+ PipeReceiverRuntimeRegistry.getInstance()
+ .markTransfer(configPipeReceiverRuntimeSessionKey.get(),
System.currentTimeMillis());
+ }
+ }
+ return resp;
+ }
Review Comment:
The return value is fixed. Is it necessary?
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java:
##########
@@ -1126,6 +1162,122 @@ protected TSStatus
getReceiverTemporaryUnavailableStatus(
PipeDataNodeResourceManager.memory().getTotalNonFloatingMemorySizeInBytes()));
}
+ private TPipeTransferResp recordDataNodeHandshakeIfSuccess(
+ final TPipeTransferResp resp, final TPipeTransferReq req) {
+ if (isSuccess(resp)) {
+ recordPipeReceiverHandshake(
+ PipeReceiverRuntimeRegistry.NODE_TYPE_DATA_NODE,
+ IOTDB_CONFIG.getDataNodeId(),
+ getProtocol(req));
+ }
+ return resp;
+ }
+
+ private TPipeTransferResp recordDataNodeTransferIfSuccess(final
TPipeTransferResp resp) {
+ if (isSuccess(resp)) {
+ recordPipeReceiverTransfer();
+ }
+ return resp;
+ }
+
+ private TPipeTransferResp recordConfigNodeReceiverRuntimeIfSuccess(
+ final Pair<TPipeTransferResp, Integer> respWithReceiverNodeId, final
TPipeTransferReq req) {
+ final TPipeTransferResp resp = respWithReceiverNodeId.left;
+ if (!PipeRequestType.isValidatedRequestType(req.getType())) {
+ return resp;
+ }
+
+ final PipeRequestType requestType = PipeRequestType.valueOf(req.getType());
+ if (requestType == PipeRequestType.HANDSHAKE_CONFIGNODE_V1
+ || requestType == PipeRequestType.HANDSHAKE_CONFIGNODE_V2) {
+ if (isSuccess(resp)) {
+ recordConfigNodeHandshake(req, requestType,
respWithReceiverNodeId.right);
+ }
+ } else {
+ if (isSuccess(resp)) {
+ PipeReceiverRuntimeRegistry.getInstance()
+ .markTransfer(configPipeReceiverRuntimeSessionKey.get(),
System.currentTimeMillis());
+ }
+ }
+ return resp;
+ }
+
+ private void recordConfigNodeHandshake(
+ final TPipeTransferReq req, final PipeRequestType requestType, final int
receiverNodeId) {
+ final String protocol = getProtocol(req);
+ final String sessionKey =
+ String.format(
+ "%s-%s-%s-%s",
+ PipeReceiverRuntimeRegistry.NODE_TYPE_CONFIG_NODE,
+ receiverNodeId,
+ protocol,
+ getConfigReceiverId());
+ final String oldSessionKey =
configPipeReceiverRuntimeSessionKey.getAndSet(sessionKey);
+ if (!Objects.equals(oldSessionKey, sessionKey)) {
+ PipeReceiverRuntimeRegistry.getInstance().deregister(oldSessionKey);
+ }
+
+ final Map<String, String> params =
+ requestType == PipeRequestType.HANDSHAKE_CONFIGNODE_V2
+ ? parseHandshakeV2Params(req)
+ : Collections.emptyMap();
+ PipeReceiverRuntimeRegistry.getInstance()
+ .registerOrUpdateSession(
+ sessionKey,
+ PipeReceiverRuntimeRegistry.NODE_TYPE_CONFIG_NODE,
+ receiverNodeId,
+ protocol,
+ getSenderHost(),
+ parseSenderPort(getSenderPort()),
Review Comment:
Why are both needed.
##########
integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/basic/IoTDBShowReceiversLifecycleIT.java:
##########
@@ -0,0 +1,379 @@
+/*
+ * 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.iotdb.pipe.it.dual.treemodel.auto.basic;
+
+import org.apache.iotdb.common.rpc.thrift.TSStatus;
+import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
+import org.apache.iotdb.confignode.rpc.thrift.TCreatePipeReq;
+import org.apache.iotdb.db.it.utils.TestUtils;
+import org.apache.iotdb.isession.SessionConfig;
+import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper;
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.MultiClusterIT2DualTreeAutoBasic;
+import org.apache.iotdb.itbase.env.BaseEnv;
+import
org.apache.iotdb.pipe.it.dual.treemodel.auto.AbstractPipeDualTreeModelAutoIT;
+import org.apache.iotdb.rpc.TSStatusCode;
+
+import org.awaitility.Awaitility;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+@RunWith(IoTDBTestRunner.class)
+@Category({MultiClusterIT2DualTreeAutoBasic.class})
+public class IoTDBShowReceiversLifecycleIT extends
AbstractPipeDualTreeModelAutoIT {
+
+ @Override
+ protected void setupConfig() {
+ super.setupConfig();
+ senderEnv.getConfig().getCommonConfig().setPipeAirGapReceiverEnabled(true);
+
receiverEnv.getConfig().getCommonConfig().setPipeAirGapReceiverEnabled(true);
+ }
+
+ @Test
+ public void testShowReceiversPipeIdsDisappearAfterDropPipe() throws
Exception {
+ final String database = "root.show_receivers_lifecycle";
+ final String pipeName = "show_receivers_lifecycle_pipe";
+
+ createThriftPipe(database, pipeName);
+
+ assertShowReceivers("show receivers", BaseEnv.TREE_SQL_DIALECT, pipeName);
+ assertShowReceivers(
+ "select * from information_schema.receivers",
BaseEnv.TABLE_SQL_DIALECT, pipeName);
Review Comment:
Why can a tree pipe be shown in the table model?
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java:
##########
@@ -1126,6 +1162,122 @@ protected TSStatus
getReceiverTemporaryUnavailableStatus(
PipeDataNodeResourceManager.memory().getTotalNonFloatingMemorySizeInBytes()));
}
+ private TPipeTransferResp recordDataNodeHandshakeIfSuccess(
+ final TPipeTransferResp resp, final TPipeTransferReq req) {
+ if (isSuccess(resp)) {
+ recordPipeReceiverHandshake(
+ PipeReceiverRuntimeRegistry.NODE_TYPE_DATA_NODE,
+ IOTDB_CONFIG.getDataNodeId(),
+ getProtocol(req));
+ }
+ return resp;
+ }
+
+ private TPipeTransferResp recordDataNodeTransferIfSuccess(final
TPipeTransferResp resp) {
+ if (isSuccess(resp)) {
+ recordPipeReceiverTransfer();
+ }
+ return resp;
+ }
+
+ private TPipeTransferResp recordConfigNodeReceiverRuntimeIfSuccess(
+ final Pair<TPipeTransferResp, Integer> respWithReceiverNodeId, final
TPipeTransferReq req) {
+ final TPipeTransferResp resp = respWithReceiverNodeId.left;
+ if (!PipeRequestType.isValidatedRequestType(req.getType())) {
+ return resp;
+ }
+
+ final PipeRequestType requestType = PipeRequestType.valueOf(req.getType());
+ if (requestType == PipeRequestType.HANDSHAKE_CONFIGNODE_V1
+ || requestType == PipeRequestType.HANDSHAKE_CONFIGNODE_V2) {
+ if (isSuccess(resp)) {
+ recordConfigNodeHandshake(req, requestType,
respWithReceiverNodeId.right);
+ }
+ } else {
+ if (isSuccess(resp)) {
+ PipeReceiverRuntimeRegistry.getInstance()
+ .markTransfer(configPipeReceiverRuntimeSessionKey.get(),
System.currentTimeMillis());
+ }
+ }
+ return resp;
+ }
+
+ private void recordConfigNodeHandshake(
+ final TPipeTransferReq req, final PipeRequestType requestType, final int
receiverNodeId) {
+ final String protocol = getProtocol(req);
+ final String sessionKey =
+ String.format(
+ "%s-%s-%s-%s",
+ PipeReceiverRuntimeRegistry.NODE_TYPE_CONFIG_NODE,
+ receiverNodeId,
+ protocol,
+ getConfigReceiverId());
+ final String oldSessionKey =
configPipeReceiverRuntimeSessionKey.getAndSet(sessionKey);
+ if (!Objects.equals(oldSessionKey, sessionKey)) {
+ PipeReceiverRuntimeRegistry.getInstance().deregister(oldSessionKey);
+ }
+
+ final Map<String, String> params =
+ requestType == PipeRequestType.HANDSHAKE_CONFIGNODE_V2
+ ? parseHandshakeV2Params(req)
+ : Collections.emptyMap();
+ PipeReceiverRuntimeRegistry.getInstance()
+ .registerOrUpdateSession(
+ sessionKey,
+ PipeReceiverRuntimeRegistry.NODE_TYPE_CONFIG_NODE,
+ receiverNodeId,
+ protocol,
+ getSenderHost(),
+ parseSenderPort(getSenderPort()),
+
params.getOrDefault(PipeTransferHandshakeConstant.HANDSHAKE_KEY_USERNAME,
username),
+ params.getOrDefault(
+ PipeTransferHandshakeConstant.HANDSHAKE_KEY_CLUSTER_ID,
+ PipeReceiverRuntimeRegistry.UNKNOWN),
+ params.get(PipeTransferHandshakeConstant.HANDSHAKE_KEY_PIPE_NAME),
+ parsePipeCreationTime(
+
params.get(PipeTransferHandshakeConstant.HANDSHAKE_KEY_PIPE_CREATION_TIME)),
+ System.currentTimeMillis());
+ }
+
+ private static Map<String, String> parseHandshakeV2Params(final
TPipeTransferReq req) {
+ final Map<String, String> params = new HashMap<>();
+ if (req.getBody() == null) {
+ return params;
+ }
Review Comment:
Move the judgment to the very beginning and return Collections.emptyMap if
the map will not be written later.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
