This is an automated email from the ASF dual-hosted git repository.
jt2594838 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 2bfb3a5fe10 [IT] Wait for all Regions to be Running after a cluster
restart (#19114)
2bfb3a5fe10 is described below
commit 2bfb3a5fe10f19182bd46c9c361cab32e314d9cf
Author: Zhenyu Luo <[email protected]>
AuthorDate: Thu Nov 5 10:08:08 2026 +0800
[IT] Wait for all Regions to be Running after a cluster restart (#19114)
restartCluster() returns as soon as every node reports a non-Unknown status
and a JDBC
connection succeeds, but ConfigNode keeps the RegionGroups of a Database
Disabled until all
Regions of the group report Running. Any write issued in that window,
including an active LOAD,
is rejected with NO_AVAILABLE_REGION_GROUP.
IoTDBLoadTsFileActiveScanIT#testIncompletePublicationSurvivesScannerRestartAndPreservesMods
restarts the cluster and immediately publishes a canary TsFile into the
active LOAD listening
directory. The scanner rescans every second, so the canary was picked up
during the Disabled
window, the LOAD failed permanently (the file was moved to ext/load/failed)
and awaitRows timed
out after 60 seconds.
Wait for all Regions reported by SHOW REGIONS to be Running before
restartCluster() returns.
SHOW REGIONS reads the same ConfigNode LoadCache status that rejects the
write, so the wait
covers exactly the condition that fails the LOAD. SHOW REGIONS only lists
the Databases of the
dialect of the connection, so the tree model and the table model are
checked separately, and the
100 ms poll interval keeps the added delay negligible while still
converging within a few
heartbeats. IoTDBRegionReadyAfterRestartTableIT covers a table-model-only
cluster, where a
tree-dialect SHOW REGIONS lists no Region at all.
---
.../org/apache/iotdb/db/it/utils/TestUtils.java | 41 ++++++++++
.../db/it/IoTDBRegionReadyAfterRestartTableIT.java | 94 ++++++++++++++++++++++
2 files changed, 135 insertions(+)
diff --git
a/integration-test/src/test/java/org/apache/iotdb/db/it/utils/TestUtils.java
b/integration-test/src/test/java/org/apache/iotdb/db/it/utils/TestUtils.java
index 2a013e5a014..b9e95129705 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/utils/TestUtils.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/utils/TestUtils.java
@@ -20,6 +20,8 @@
package org.apache.iotdb.db.it.utils;
import org.apache.iotdb.commons.auth.entity.PrivilegeType;
+import org.apache.iotdb.commons.cluster.RegionStatus;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.isession.SessionConfig;
import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.it.env.EnvFactory;
@@ -1747,6 +1749,45 @@ public class TestUtils {
env.startAllConfigNodes();
env.startAllDataNodes();
((AbstractEnv) env).checkClusterStatusWithoutUnknown();
+ awaitAllRegionsRunning(env);
+ }
+
+ /**
+ * Waits until every Region listed by SHOW REGIONS is Running. Right after a
restart the
+ * RegionGroups stay Disabled until their Regions report Running, and writes
issued in that window
+ * are rejected with NO_AVAILABLE_REGION_GROUP.
+ */
+ public static void awaitAllRegionsRunning(final BaseEnv env) {
+ await()
+ .pollInSameThread()
+ .pollDelay(0L, TimeUnit.MILLISECONDS)
+ .pollInterval(100L, TimeUnit.MILLISECONDS)
+ .atMost(2, TimeUnit.MINUTES)
+ .ignoreExceptions()
+ .untilAsserted(
+ () -> {
+ // SHOW REGIONS only lists the Databases of the dialect of the
connection.
+ assertAllRegionsRunning(env, false);
+ assertAllRegionsRunning(env, true);
+ });
+ }
+
+ private static void assertAllRegionsRunning(final BaseEnv env, final boolean
tableModel)
+ throws SQLException {
+ try (final Connection connection = tableModel ? env.getTableConnection() :
env.getConnection();
+ final Statement statement = connection.createStatement();
+ final ResultSet regions = statement.executeQuery("show regions")) {
+ while (regions.next()) {
+ Assert.assertEquals(
+ "Region "
+ + regions.getInt(ColumnHeaderConstant.REGION_ID)
+ + " of database "
+ + regions.getString(ColumnHeaderConstant.DATABASE)
+ + " is not ready",
+ RegionStatus.Running.getStatus(),
+ regions.getString(ColumnHeaderConstant.STATUS));
+ }
+ }
}
public static void assertDataEventuallyOnEnv(
diff --git
a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBRegionReadyAfterRestartTableIT.java
b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBRegionReadyAfterRestartTableIT.java
new file mode 100644
index 00000000000..72bb5d472d6
--- /dev/null
+++
b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBRegionReadyAfterRestartTableIT.java
@@ -0,0 +1,94 @@
+/*
+ * 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.relational.it.db.it;
+
+import org.apache.iotdb.commons.cluster.RegionStatus;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
+import org.apache.iotdb.db.it.utils.TestUtils;
+import org.apache.iotdb.it.env.EnvFactory;
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.TableClusterIT;
+
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+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;
+
+/** Verifies that restartCluster() waits for the Regions of a table-model-only
cluster. */
+@RunWith(IoTDBTestRunner.class)
+@Category(TableClusterIT.class)
+public class IoTDBRegionReadyAfterRestartTableIT {
+
+ private static final String DATABASE = "restart_ready";
+
+ @BeforeClass
+ public static void setUpClass() {
+ EnvFactory.getEnv().initClusterEnvironment(1, 3);
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ EnvFactory.getEnv().cleanClusterEnvironment();
+ }
+
+ @Test
+ public void testWriteAfterClusterRestart() throws SQLException {
+ try (final Connection connection =
EnvFactory.getEnv().getTableConnection();
+ final Statement statement = connection.createStatement()) {
+ statement.execute("create database " + DATABASE);
+ statement.execute("use \"" + DATABASE + "\"");
+ statement.execute("create table t (tag string tag, s int32 field)");
+ statement.execute("insert into t (tag, time, s) values ('d1', 1, 1)");
+ }
+
+ TestUtils.restartCluster(EnvFactory.getEnv());
+
+ try (final Connection connection =
EnvFactory.getEnv().getTableConnection();
+ final Statement statement = connection.createStatement()) {
+ statement.execute("use \"" + DATABASE + "\"");
+ // restartCluster() returns only after the Regions are Running; a write
before that is
+ // rejected with NO_AVAILABLE_REGION_GROUP.
+ try (final ResultSet regions = statement.executeQuery("show regions")) {
+ int regionCount = 0;
+ while (regions.next()) {
+ Assert.assertEquals(
+ RegionStatus.Running.getStatus(),
regions.getString(ColumnHeaderConstant.STATUS));
+ regionCount++;
+ }
+ Assert.assertTrue("no table-model Region is reported", regionCount >
0);
+ }
+ statement.execute("insert into t (tag, time, s) values ('d1', 2, 2)");
+ try (final ResultSet rows = statement.executeQuery("select s from t
order by time")) {
+ Assert.assertTrue(rows.next());
+ Assert.assertEquals(1, rows.getInt(1));
+ Assert.assertTrue(rows.next());
+ Assert.assertEquals(2, rows.getInt(1));
+ Assert.assertFalse(rows.next());
+ }
+ }
+ }
+}