This is an automated email from the ASF dual-hosted git repository. Caideyipi pushed a commit to branch fix/subscription-removal-timeout in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 900e7af21e2676679efb1f85f741009567f72260 Author: Caideyipi <[email protected]> AuthorDate: Mon Nov 9 19:07:13 2026 +0800 Avoid subscription timeout cleanup on retiring DataNodes --- .../receiver/SubscriptionReceiverV1.java | 9 ++++ .../receiver/SubscriptionReceiverV1Test.java | 55 ++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/receiver/SubscriptionReceiverV1.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/receiver/SubscriptionReceiverV1.java index 052dcbd0fc5..13b52c685cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/receiver/SubscriptionReceiverV1.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/subscription/receiver/SubscriptionReceiverV1.java @@ -24,6 +24,8 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.IClientManager; import org.apache.iotdb.commons.client.exception.ClientManagerException; import org.apache.iotdb.commons.cluster.NodeStatus; +import org.apache.iotdb.commons.conf.CommonConfig; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.consensus.ConfigRegionId; import org.apache.iotdb.commons.subscription.config.SubscriptionConfig; import org.apache.iotdb.confignode.rpc.thrift.TCloseConsumerReq; @@ -368,6 +370,13 @@ public class SubscriptionReceiverV1 implements SubscriptionReceiver { @Override public void handleTimeout() { synchronized (this) { + final CommonConfig commonConfig = CommonDescriptor.getInstance().getConfig(); + if (commonConfig.getNodeStatus() == NodeStatus.Removing || commonConfig.isStopping()) { + // The SDK retires this node's connection while the consumer remains active elsewhere. + // Missing heartbeats here must not unsubscribe that consumer across the cluster. Keep + // the timeout state so ordinary cleanup can resume if the removal is rolled back. + return; + } final ConsumerConfig consumerConfig = sharedConsumerConfig; if (Objects.isNull(consumerConfig) || inFlightRequestCount.get() > 0) { return; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/subscription/receiver/SubscriptionReceiverV1Test.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/subscription/receiver/SubscriptionReceiverV1Test.java index 2b901cda9b8..6f52da42e4b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/subscription/receiver/SubscriptionReceiverV1Test.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/subscription/receiver/SubscriptionReceiverV1Test.java @@ -20,6 +20,9 @@ package org.apache.iotdb.db.subscription.receiver; import org.apache.iotdb.common.rpc.thrift.TSStatus; +import org.apache.iotdb.commons.cluster.NodeStatus; +import org.apache.iotdb.commons.conf.CommonConfig; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.subscription.config.SubscriptionConfig; import org.apache.iotdb.commons.subscription.meta.consumer.ConsumerGroupMeta; import org.apache.iotdb.commons.subscription.meta.consumer.ConsumerMeta; @@ -68,6 +71,58 @@ public class SubscriptionReceiverV1Test { Assert.assertFalse((boolean) getField(receiver, "consumerInvalidated")); } + @Test + public void testHandleTimeoutKeepsConsumerOnRemovingNode() throws Exception { + assertRetiringNodeKeepsConsumer(NodeStatus.Removing, false); + } + + @Test + public void testHandleTimeoutKeepsConsumerOnStoppingNode() throws Exception { + assertRetiringNodeKeepsConsumer(NodeStatus.ReadOnly, true); + } + + private void assertRetiringNodeKeepsConsumer(final NodeStatus status, final boolean stopping) + throws Exception { + final AtomicLong closeAttemptCount = new AtomicLong(); + final SubscriptionReceiverV1 receiver = + new SubscriptionReceiverV1() { + @Override + void closeConsumer(final ConsumerConfig consumerConfig) { + closeAttemptCount.incrementAndGet(); + } + }; + final ConsumerConfig consumerConfig = createConsumerConfig(1_000L); + setField(receiver, "sharedConsumerConfig", consumerConfig); + final long timeoutMs = invokeCalculateConsumerInactivityTimeoutMs(receiver, consumerConfig); + setField(receiver, "lastActivityTimeMs", System.currentTimeMillis() - timeoutMs - 1L); + + final CommonConfig commonConfig = CommonDescriptor.getInstance().getConfig(); + final NodeStatus originalStatus = commonConfig.getNodeStatus(); + final String originalReason = commonConfig.getStatusReason(); + final boolean originalStopping = commonConfig.isStopping(); + try { + commonConfig.setNodeStatus(status); + commonConfig.setStopping(stopping); + receiver.handleTimeout(); + + Assert.assertEquals( + "Retiring a node must not unsubscribe a live consumer", 0L, closeAttemptCount.get()); + Assert.assertSame(consumerConfig, getField(receiver, "sharedConsumerConfig")); + Assert.assertTrue(receiver.hasActiveConsumer()); + + // A failed removal can restore this node. Normal inactivity cleanup must still work then, + // including on a read-only node that is not stopping. + commonConfig.setNodeStatus(NodeStatus.ReadOnly); + commonConfig.setStopping(false); + receiver.handleTimeout(); + Assert.assertEquals(1L, closeAttemptCount.get()); + Assert.assertFalse(receiver.hasActiveConsumer()); + } finally { + commonConfig.setNodeStatusWithReason(originalStatus, originalReason); + commonConfig.setStopping(originalStopping); + } + } + @Test public void testHandleTimeoutSkipsConsumerWithInFlightRequests() throws Exception { final SubscriptionReceiverV1 receiver = new SubscriptionReceiverV1();
