(iotdb) branch master updated: Try to fix set cluster name integration test (#12794)

[tanxinyu]

This is an automated email from the ASF dual-hosted git repository.

tanxinyu 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 bc4cf473b77 Try to fix set cluster name integration test (#12794)
bc4cf473b77 is described below

commit bc4cf473b777bed911655e2a063e1f7e9b423523
Author: Li Yu Heng <liyuheng55...@126.com>
AuthorDate: Mon Jun 24 16:46:35 2024 +0800

    Try to fix set cluster name integration test (#12794)
    
    * done
    
    * try
---
 .../iotdb/db/it/IoTDBSetConfigurationIT.java       | 31 +++++++++++-----------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git 
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSetConfigurationIT.java
 
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSetConfigurationIT.java
index 1862b48d99c..f6e9f98726b 100644
--- 
a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSetConfigurationIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSetConfigurationIT.java
@@ -19,10 +19,7 @@
 
 package org.apache.iotdb.db.it;
 
-import org.apache.iotdb.commons.cluster.NodeStatus;
 import org.apache.iotdb.commons.conf.CommonConfig;
-import org.apache.iotdb.confignode.rpc.thrift.IConfigNodeRPCService;
-import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
 import org.apache.iotdb.it.env.EnvFactory;
 import org.apache.iotdb.it.env.cluster.node.AbstractNodeWrapper;
 import org.apache.iotdb.it.framework.IoTDBTestRunner;
@@ -88,30 +85,34 @@ public class IoTDBSetConfigurationIT {
 
   @Test
   public void testSetClusterName() throws Exception {
-    Connection connection = EnvFactory.getEnv().getConnection();
-    Statement statement = connection.createStatement();
     // set cluster name on cn and dn
-    statement.execute("set configuration \"cluster_name\"=\"xx\"");
-    ResultSet variables = statement.executeQuery("show variables");
-    variables.next();
-    Assert.assertEquals("xx", variables.getString(2));
+    try (Connection connection = EnvFactory.getEnv().getConnection();
+        Statement statement = connection.createStatement()) {
+      statement.execute("set configuration \"cluster_name\"=\"xx\"");
+      ResultSet variables = statement.executeQuery("show variables");
+      variables.next();
+      Assert.assertEquals("xx", variables.getString(2));
+    }
     Assert.assertTrue(
         EnvFactory.getEnv().getNodeWrapperList().stream()
             .allMatch(nodeWrapper -> checkConfigFileContains(nodeWrapper, 
"cluster_name=xx")));
     // restart successfully
     EnvFactory.getEnv().getDataNodeWrapper(0).stop();
     EnvFactory.getEnv().getDataNodeWrapper(0).start();
-    IConfigNodeRPCService.Iface configNodeClient =
-        EnvFactory.getEnv().getLeaderConfigNodeConnection();
+    // set cluster name on datanode
     Awaitility.await()
         .atMost(10, TimeUnit.SECONDS)
         .until(
             () -> {
-              TShowClusterResp resp = configNodeClient.showCluster();
-              return 
NodeStatus.Running.toString().equals(resp.getNodeStatus().get(1));
+              try (Connection connection = EnvFactory.getEnv().getConnection();
+                  Statement statement = connection.createStatement()) {
+                statement.execute("set configuration \"cluster_name\"=\"yy\" 
on 1");
+              } catch (Exception e) {
+                return false;
+              }
+              return true;
             });
-    // set cluster name on datanode, cannot restart
-    statement.execute("set configuration \"cluster_name\"=\"yy\" on 1");
+    // cannot restart
     EnvFactory.getEnv().getDataNodeWrapper(0).stop();
     EnvFactory.getEnv().getDataNodeWrapper(0).start();
     Awaitility.await()