From 0cc4362837c017b7dceb59669076e23f58b64afc Mon Sep 17 00:00:00 2001
From: plum-lihui <huili@taosdata.com>
Date: Wed, 19 Jan 2022 14:46:37 +0800
Subject: [PATCH] [modify]

---
 tests/script/sh/massiveTable/deployCluster.sh | 61 +++++++++++++++++--
 tests/test/c/create_table.c                   |  2 +-
 2 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/tests/script/sh/massiveTable/deployCluster.sh b/tests/script/sh/massiveTable/deployCluster.sh
index a86e9220cd..4febe40054 100755
--- a/tests/script/sh/massiveTable/deployCluster.sh
+++ b/tests/script/sh/massiveTable/deployCluster.sh
@@ -5,6 +5,49 @@
 set -e
 #set -x
 
+masterDnode=slave
+dataRootDir="/data"
+firstEp="trd02:7000"
+startPort=7000
+dnodeNumber=1
+updateSrc=no
+
+while getopts "hm:f:n:r:p:u:" arg
+do
+  case $arg in
+    m)
+      masterDnode=$( echo $OPTARG )
+      ;;
+    n)
+      dnodeNumber=$(echo $OPTARG)
+      ;;
+    u)
+      updateSrc=$(echo $OPTARG)
+      ;;
+    f)
+      firstEp=$(echo $OPTARG)
+      ;;
+    p)
+      startPort=$(echo $OPTARG)
+      ;;
+    r)
+      dataRootDir=$(echo $OPTARG)
+      ;;
+    h)
+      echo "Usage: `basename $0` -m [if master dnode] "
+      echo "                  -n [ dnode number] "
+      echo "                  -f [ first ep] "
+      echo "                  -p [ start port] "
+      echo "                  -r [ dnode root dir] "
+      exit 0
+      ;;
+    ?) #unknow option
+      echo "unkonw argument"
+      exit 1
+      ;;
+  esac
+done
+
 # deployCluster.sh 
 curr_dir=$(readlink -f "$(dirname "$0")")
 echo $curr_dir
@@ -12,13 +55,21 @@ echo $curr_dir
 ${curr_dir}/cleanCluster.sh -r "/data"
 ${curr_dir}/cleanCluster.sh -r "/data2"
 
-${curr_dir}/compileVersion.sh -r ${curr_dir}/../../../../ -v "3.0"
+if [[ "${updateSrc}" == "yes" ]]; then
+  ${curr_dir}/compileVersion.sh -r ${curr_dir}/../../../../ -v "3.0"
+fi
 
-${curr_dir}/setupDnodes.sh -r "/data"  -n 1 -f "trd02:7000" -p 7000
-${curr_dir}/setupDnodes.sh -r "/data2" -n 1 -f "trd02:7000" -p 8000
+${curr_dir}/setupDnodes.sh -r "/data"  -n ${dnodeNumber} -f ${firstEp} -p 7000
+${curr_dir}/setupDnodes.sh -r "/data2" -n ${dnodeNumber} -f ${firstEp} -p 8000
 
-#./setupDnodes.sh -r "/data"  -n 2 -f trd02:7000 -p 7000
-#./setupDnodes.sh -r "/data2" -n 2 -f trd02:7000 -p 8000
+if [[ "${masterDnode}" == "master" ]]; then
+  # create all dnode into cluster
+  taos -s "create dnode trd02 port 8000;"
+  taos -s "create dnode trd03 port 7000;"
+  taos -s "create dnode trd03 port 8000;"
+  taos -s "create dnode trd04 port 7000;"
+  taos -s "create dnode trd04 port 8000;"
+fi
 
 
 
diff --git a/tests/test/c/create_table.c b/tests/test/c/create_table.c
index d8fced3011..d835760423 100644
--- a/tests/test/c/create_table.c
+++ b/tests/test/c/create_table.c
@@ -205,7 +205,7 @@ void *threadFunc(void *param) {
       TAOS_RES *pRes = taos_query(con, qstr);
       code = taos_errno(pRes);
       if ((code != 0) && (code != 0x0002)) {
-        pError("failed to create table t%" PRId64 ", reason:%s", t, tstrerror(code));
+        pError("failed to create table t%" PRId64 ", code: %d, reason:%s", t, code, tstrerror(code));
       }
       taos_free_result(pRes);
       int64_t endTs = taosGetTimestampUs();