From 0f5ee10752148b7e07c4120abd2cfe99d80a70db Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Mon, 14 Mar 2022 10:44:41 +0800
Subject: [PATCH] add arbitrator for docker cluster test

---
 tests/pytest/test.py             | 13 ++++++++++---
 tests/pytest/util/dockerNodes.py |  6 ++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/tests/pytest/test.py b/tests/pytest/test.py
index b15c31dd23..d140ba0865 100644
--- a/tests/pytest/test.py
+++ b/tests/pytest/test.py
@@ -149,15 +149,22 @@ if __name__ == "__main__":
                 numOfNodes = ucase.updatecfgDict.get('numOfNodes')                
                 cluster.init(numOfNodes, dataDir)                    
                 cluster.prepardBuild()
-
+                
+                startArbitrator = False
+                arbitratorHost = "tdnode1"
                 for i in range(numOfNodes):
                     if ucase.updatecfgDict.get('%d' % (i + 1)) != None:
                         config = dict (ucase.updatecfgDict.get('%d' % (i + 1)))
                         print(config)
                         for key, value in config.items():
-                            print(key, value, i + 1)
-                            cluster.cfg(key, value, i + 1)                           
+                            if key == "arbitrator":
+                                startArbitrator = True
+                                arbitratorHost = value
+                            cluster.cfg(key, value, i + 1)                      
                 cluster.run()
+                if startArbitrator:
+                    hostname=value.split(":")[0]
+                    cluster.startArbitrator(hostname)
                 conn = cluster.conn
             except Exception as e:
                 print(e.args)
diff --git a/tests/pytest/util/dockerNodes.py b/tests/pytest/util/dockerNodes.py
index 634acd4896..7053955e6e 100644
--- a/tests/pytest/util/dockerNodes.py
+++ b/tests/pytest/util/dockerNodes.py
@@ -142,10 +142,8 @@ class BuildDockerCluser:
             print("create dnode tdnode%d" % i)         
             self.cursor.execute("create dnode tdnode%d" % i)
     
-    def startArbitrator(self):
-        for i in range(1, self.numOfNodes + 1):
-            self.cfg("arbitrator", "tdnode1:6042", i)
-        cmd = "docker exec -d $(docker ps|grep tdnode1|awk '{print $1}') tarbitrator"
+    def startArbitrator(self, hostname = 'tdnode1'):        
+        cmd = "docker exec -d $(docker ps|grep '%s'|awk '{print $1}') tarbitrator" % hostname        
         self.execCmd(cmd)
 
     def prepardBuild(self):
-- 
GitLab