[TD-913]

src/common/inc/tglobal.h

@@ -30,8 +30,6 @@ extern uint16_t tsDnodeShellPort;
 extern uint16_t tsDnodeDnodePort;
 extern uint16_t tsSyncPort;
 extern int32_t  tsStatusInterval;
-extern int16_t  tsNumOfVnodesPerCore;
-extern int16_t  tsNumOfTotalVnodes;
 extern int32_t  tsNumOfMnodes;
 extern int32_t  tsEnableVnodeBak;
 

src/common/src/tglobal.c

@@ -38,12 +38,9 @@ uint16_t tsDnodeShellPort = 6030;  // udp[6035-6039] tcp[6035]
 uint16_t tsDnodeDnodePort = 6035;  // udp/tcp
 uint16_t tsSyncPort = 6040;
 int32_t  tsStatusInterval = 1;  // second
-int16_t  tsNumOfVnodesPerCore = 32;
-int16_t  tsNumOfTotalVnodes = TSDB_INVALID_VNODE_NUM;
 int32_t  tsNumOfMnodes = 3;
 int32_t  tsEnableVnodeBak = 1;
 
-
 // common
 int32_t tsRpcTimer = 1000;
 int32_t tsRpcMaxTime = 600;  // seconds;
@@ -402,16 +399,6 @@ static void doInitGlobalConfig() {
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
-  cfg.option = "numOfTotalVnodes";
-  cfg.ptr = &tsNumOfTotalVnodes;
-  cfg.valType = TAOS_CFG_VTYPE_INT16;
-  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
-  cfg.minValue = 0;
-  cfg.maxValue = TSDB_MAX_VNODES;
-  cfg.ptrLength = 0;
-  cfg.unitType = TAOS_CFG_UTYPE_NONE;
-  taosInitConfigOption(cfg);
-
   cfg.option = "numOfMnodes";
   cfg.ptr = &tsNumOfMnodes;
   cfg.valType = TAOS_CFG_VTYPE_INT32;
@@ -453,7 +440,7 @@ static void doInitGlobalConfig() {
   taosInitConfigOption(cfg);
 
   // 0-any; 1-mnode; 2-vnode
-  cfg.option = "alternativeRole";
+  cfg.option = "role";
   cfg.ptr = &tsAlternativeRole;
   cfg.valType = TAOS_CFG_VTYPE_INT32;
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
@@ -1280,12 +1267,6 @@ bool taosCheckGlobalCfg() {
     tsNumOfCores = 1;
   }
 
-  if (tsNumOfTotalVnodes == TSDB_INVALID_VNODE_NUM) {
-    tsNumOfTotalVnodes = tsNumOfCores * tsNumOfVnodesPerCore;
-    tsNumOfTotalVnodes = tsNumOfTotalVnodes > TSDB_MAX_VNODES ? TSDB_MAX_VNODES : tsNumOfTotalVnodes;
-    tsNumOfTotalVnodes = tsNumOfTotalVnodes < TSDB_MIN_VNODES ? TSDB_MIN_VNODES : tsNumOfTotalVnodes;     
-  }
-
   // todo refactor
   tsVersion = 0;
   for (int i = 0; i < 10; i++) {

src/dnode/src/dnodeMgmt.c

@@ -699,7 +699,6 @@ static void dnodeSendStatusMsg(void *handle, void *tmrId) {
   pStatus->dnodeId          = htonl(tsDnodeCfg.dnodeId);
   strcpy(pStatus->dnodeEp, tsLocalEp);
   pStatus->lastReboot       = htonl(tsRebootTime);
-  pStatus->numOfTotalVnodes = htons((uint16_t) tsNumOfTotalVnodes);
   pStatus->numOfCores       = htons((uint16_t) tsNumOfCores);
   pStatus->diskAvailable    = tsAvailDataDirGB;
   pStatus->alternativeRole  = (uint8_t) tsAlternativeRole;

src/inc/taosdef.h

@@ -274,9 +274,8 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
 #define TSDB_DEFAULT_PAYLOAD_SIZE 5120   // default payload size, greater than PATH_MAX value
 #define TSDB_EXTRA_PAYLOAD_SIZE   128    // extra bytes for auth
 #define TSDB_CQ_SQL_SIZE          1024
+#define TSDB_MIN_VNODES           64
 #define TSDB_MAX_VNODES           2048
-#define TSDB_MIN_VNODES           256
-#define TSDB_INVALID_VNODE_NUM    0
 
 #define TSDB_DNODE_ROLE_ANY       0
 #define TSDB_DNODE_ROLE_MGMT      1

src/inc/taosmsg.h

@@ -581,12 +581,12 @@ typedef struct {
   char        dnodeEp[TSDB_EP_LEN];
   uint32_t    moduleStatus;
   uint32_t    lastReboot;        // time stamp for last reboot
-  uint16_t    numOfTotalVnodes;  // from config file
+  uint16_t    reserve1;          // from config file
   uint16_t    openVnodes;
   uint16_t    numOfCores;
   float       diskAvailable;  // GB
   uint8_t     alternativeRole;
-  uint8_t     reserve[15];
+  uint8_t     reserve2[15];
   SClusterCfg clusterCfg;
   SVnodeLoad  load[];
 } SDMStatusMsg;

src/mnode/inc/mnodeDef.h

@@ -40,7 +40,7 @@ typedef struct SDnodeObj {
   int32_t    dnodeId;
   int32_t    openVnodes;
   int64_t    createdTime;
-  int32_t    totalVnodes;      // from dnode status msg, config information
+  int32_t    resever0;         // from dnode status msg, config information
   int32_t    customScore;      // config by user
   uint32_t   lastAccess;
   uint16_t   numOfCores;       // from dnode status msg
@@ -50,7 +50,7 @@ typedef struct SDnodeObj {
   int8_t     alternativeRole;  // from dnode status msg, 0-any, 1-mgmt, 2-dnode
   int8_t     status;           // set in balance function
   int8_t     isMgmt;
-  int8_t     reserved0[14];  
+  int8_t     reserve1[14];  
   int8_t     updateEnd[1];
   int32_t    refCount;
   uint32_t   moduleStatus;
@@ -61,7 +61,7 @@ typedef struct SDnodeObj {
   int16_t    cpuAvgUsage;      // calc from sys.cpu
   int16_t    memoryAvgUsage;   // calc from sys.mem
   int16_t    bandwidthUsage;   // calc from sys.band
-  int8_t     reserved1[2];
+  int8_t     reserved2[2];
 } SDnodeObj;
 
 typedef struct SMnodeObj {

src/mnode/src/mnodeDnode.c

@@ -345,7 +345,6 @@ static int32_t mnodeProcessDnodeStatusMsg(SMnodeMsg *pMsg) {
   pStatus->moduleStatus = htonl(pStatus->moduleStatus);
   pStatus->lastReboot   = htonl(pStatus->lastReboot);
   pStatus->numOfCores   = htons(pStatus->numOfCores);
-  pStatus->numOfTotalVnodes = htons(pStatus->numOfTotalVnodes);
   
   uint32_t version = htonl(pStatus->version);
   if (version != tsVersion) {
@@ -372,7 +371,6 @@ static int32_t mnodeProcessDnodeStatusMsg(SMnodeMsg *pMsg) {
   pDnode->numOfCores       = pStatus->numOfCores;
   pDnode->diskAvailable    = pStatus->diskAvailable;
   pDnode->alternativeRole  = pStatus->alternativeRole;
-  pDnode->totalVnodes      = pStatus->numOfTotalVnodes; 
   pDnode->moduleStatus     = pStatus->moduleStatus;
   
   if (pStatus->dnodeId == 0) {
@@ -475,7 +473,6 @@ static int32_t mnodeCreateDnode(char *ep, SMnodeMsg *pMsg) {
   pDnode = (SDnodeObj *) calloc(1, sizeof(SDnodeObj));
   pDnode->createdTime = taosGetTimestampMs();
   pDnode->status = TAOS_DN_STATUS_OFFLINE; 
-  pDnode->totalVnodes = TSDB_INVALID_VNODE_NUM; 
   tstrncpy(pDnode->dnodeEp, ep, TSDB_EP_LEN);
   taosGetFqdnPortFromEp(ep, pDnode->dnodeFqdn, &pDnode->dnodePort);
 
@@ -592,13 +589,13 @@ static int32_t mnodeGetDnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pC
 
   pShow->bytes[cols] = 2;
   pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-  strcpy(pSchema[cols].name, "open_vnodes");
+  strcpy(pSchema[cols].name, "vnodes");
   pSchema[cols].bytes = htons(pShow->bytes[cols]);
   cols++;
 
   pShow->bytes[cols] = 2;
   pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
-  strcpy(pSchema[cols].name, "total_vnodes");
+  strcpy(pSchema[cols].name, "cores");
   pSchema[cols].bytes = htons(pShow->bytes[cols]);
   cols++;
 
@@ -610,7 +607,7 @@ static int32_t mnodeGetDnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pC
 
   pShow->bytes[cols] = 6 + VARSTR_HEADER_SIZE;
   pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-  strcpy(pSchema[cols].name, "alternativeRole");
+  strcpy(pSchema[cols].name, "role");
   pSchema[cols].bytes = htons(pShow->bytes[cols]);
   cols++;
 
@@ -662,7 +659,7 @@ static int32_t mnodeRetrieveDnodes(SShowObj *pShow, char *data, int32_t rows, vo
     cols++;
 
     pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int16_t *)pWrite = pDnode->totalVnodes;
+    *(int16_t *)pWrite = pDnode->numOfCores;
     cols++;
     
     pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;  

src/mnode/src/mnodeVgroup.c

@@ -585,9 +585,9 @@ static int32_t mnodeGetVgroupMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *p
   pSchema[cols].bytes = htons(pShow->bytes[cols]);
   cols++;
 
-  pShow->bytes[cols] = 4;
-  pSchema[cols].type = TSDB_DATA_TYPE_INT;
-  strcpy(pSchema[cols].name, "poolSize");
+  pShow->bytes[cols] = 12 + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "status");
   pSchema[cols].bytes = htons(pShow->bytes[cols]);
   cols++;
 
@@ -689,7 +689,8 @@ static int32_t mnodeRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, v
     cols++;
 
     pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;  
-    *(int32_t *)pWrite = taosIdPoolMaxSize(pVgroup->idPool);
+    char* status = vgroupStatus[pVgroup->status];
+    STR_TO_VARSTR(pWrite, status);
     cols++;
 
     int32_t onlineVnodes = 0;

tests/script/sh/deploy.sh

@@ -139,7 +139,6 @@ echo "clog                2"              >> $TAOS_CFG
 #echo "cache              1"              >> $TAOS_CFG
 #echo "block              2"              >> $TAOS_CFG
 echo "statusInterval      1"              >> $TAOS_CFG
-echo "numOfTotalVnodes    4"              >> $TAOS_CFG
 echo "maxVgroupsPerDb     4"              >> $TAOS_CFG
 echo "minTablesPerVnode   4"              >> $TAOS_CFG
 echo "maxTablesPerVnode   1000"           >> $TAOS_CFG

tests/script/unique/arbitrator/dn2_mn1_cache_file_sync.sim

@@ -34,10 +34,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4

tests/script/unique/arbitrator/dn3_mn1_full_createTableFail.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4

tests/script/unique/arbitrator/dn3_mn1_full_dropDnodeFail.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4

tests/script/unique/arbitrator/dn3_mn1_multiCreateDropTable.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/dn3_mn1_nw_disable_timeout_autoDropDnode.sim

@@ -29,10 +29,10 @@ system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
 system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator

tests/script/unique/arbitrator/dn3_mn1_r2_vnode_delDir.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/dn3_mn1_r3_vnode_delDir.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/dn3_mn1_replica2_wal1_AddDelDnode.sim

@@ -47,11 +47,11 @@ system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 200
 system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 200
 system sh/cfg.sh -n dnode5 -c mnodeEqualVnodeNum -v 200
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode5 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
+system sh/cfg.sh -n dnode5 -c role -v 2
 
 system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
 system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
@@ -217,7 +217,7 @@ system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 200
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
 system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
 system sh/cfg.sh -n dnode3 -c offlineThreshold -v 10
 system sh/cfg.sh -n dnode3 -c enableCoreFile -v 1

tests/script/unique/arbitrator/dn3_mn1_replica_change.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim

@@ -29,10 +29,10 @@ system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
 system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
@@ -180,7 +180,7 @@ system sh/cfg.sh -n dnode4 -c walLevel -v 1
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 system sh/cfg.sh -n dnode4 -c arbitrator -v $arbitrator
 system sh/cfg.sh -n dnode4 -c offlineThreshold -v 5
 system sh/cfg.sh -n dnode4 -c enableCoreFile -v 1

tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/dn3_mn1_vnode_createErrData_online.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/dn3_mn1_vnode_delDir.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/dn3_mn1_vnode_noCorruptFile_offline.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4

tests/script/unique/arbitrator/dn3_mn2_killDnode.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-#system sh/cfg.sh -n dnode1 -c alternativeRole -v 2
-#system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-#system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-#system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+#system sh/cfg.sh -n dnode1 -c role -v 2
+#system sh/cfg.sh -n dnode2 -c role -v 2
+#system sh/cfg.sh -n dnode3 -c role -v 2
+#system sh/cfg.sh -n dnode4 -c role -v 2
 
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4

tests/script/unique/arbitrator/insert_duplicationTs.sim

@@ -34,10 +34,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4

tests/script/unique/arbitrator/offline_replica2_alterTable_online.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/offline_replica2_alterTag_online.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-#system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-#system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-#system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-#system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+#system sh/cfg.sh -n dnode1 -c role -v 1
+#system sh/cfg.sh -n dnode2 -c role -v 2
+#system sh/cfg.sh -n dnode3 -c role -v 2
+#system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/offline_replica2_createTable_online.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 20

tests/script/unique/arbitrator/offline_replica2_dropDb_online.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/offline_replica2_dropTable_online.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/offline_replica3_alterTable_online.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/offline_replica3_alterTag_online.sim

@@ -19,10 +19,10 @@ system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
 system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
 
-#system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-#system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-#system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-#system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+#system sh/cfg.sh -n dnode1 -c role -v 1
+#system sh/cfg.sh -n dnode2 -c role -v 2
+#system sh/cfg.sh -n dnode3 -c role -v 2
+#system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 20

tests/script/unique/arbitrator/offline_replica3_createTable_online.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 20

tests/script/unique/arbitrator/offline_replica3_dropDb_online.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/offline_replica3_dropTable_online.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/replica_changeWithArbitrator.sim

@@ -29,10 +29,10 @@ system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 0
+system sh/cfg.sh -n dnode1 -c role -v 0
+system sh/cfg.sh -n dnode2 -c role -v 0
+system sh/cfg.sh -n dnode3 -c role -v 0
+system sh/cfg.sh -n dnode4 -c role -v 0
 
 $totalTableNum = 12
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum
@@ -150,8 +150,8 @@ system sh/cfg.sh -n dnode2 -c numOfMnodes -v 2
 system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 0
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 0
 
 system sh/exec.sh -n dnode1 -s start
 system sh/exec.sh -n dnode2 -s start

tests/script/unique/arbitrator/sync_replica2_alterTable_add.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/sync_replica2_alterTable_drop.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/sync_replica2_dropDb.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/sync_replica2_dropTable.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/sync_replica3_alterTable_add.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/sync_replica3_alterTable_drop.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/sync_replica3_createTable.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/sync_replica3_dnodeChang_DropAddAlterTableDropDb.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 40
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/sync_replica3_dropDb.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/arbitrator/sync_replica3_dropTable.sim

@@ -24,10 +24,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 2
+system sh/cfg.sh -n dnode4 -c role -v 2
 
 $totalTableNum = 10
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $totalTableNum

tests/script/unique/cluster/cluster_main.sim

@@ -29,11 +29,11 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 256
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 256
 system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 256
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode5 -c alternativeRole -v 0
+system sh/cfg.sh -n dnode1 -c role -v 0
+system sh/cfg.sh -n dnode2 -c role -v 0
+system sh/cfg.sh -n dnode3 -c role -v 0
+system sh/cfg.sh -n dnode4 -c role -v 0
+system sh/cfg.sh -n dnode5 -c role -v 0
 
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5000
 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 5000

tests/script/unique/cluster/cluster_main0.sim

@@ -29,11 +29,11 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 256
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 256
 system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 256
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode5 -c alternativeRole -v 0
+system sh/cfg.sh -n dnode1 -c role -v 0
+system sh/cfg.sh -n dnode2 -c role -v 0
+system sh/cfg.sh -n dnode3 -c role -v 0
+system sh/cfg.sh -n dnode4 -c role -v 0
+system sh/cfg.sh -n dnode5 -c role -v 0
 
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5000
 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 5000

tests/script/unique/cluster/cluster_main1.sim

@@ -29,11 +29,11 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 256
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 256
 system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 256
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode5 -c alternativeRole -v 0
+system sh/cfg.sh -n dnode1 -c role -v 0
+system sh/cfg.sh -n dnode2 -c role -v 0
+system sh/cfg.sh -n dnode3 -c role -v 0
+system sh/cfg.sh -n dnode4 -c role -v 0
+system sh/cfg.sh -n dnode5 -c role -v 0
 
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5000
 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 5000

tests/script/unique/cluster/cluster_main2.sim

@@ -29,11 +29,11 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 256
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 256
 system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 256
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode4 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode5 -c alternativeRole -v 0
+system sh/cfg.sh -n dnode1 -c role -v 0
+system sh/cfg.sh -n dnode2 -c role -v 0
+system sh/cfg.sh -n dnode3 -c role -v 0
+system sh/cfg.sh -n dnode4 -c role -v 0
+system sh/cfg.sh -n dnode5 -c role -v 0
 
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5000
 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 5000

tests/script/unique/dnode/alternativeRole.sim

@@ -4,9 +4,9 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
-system sh/cfg.sh -n dnode3 -c alternativeRole -v 0
+system sh/cfg.sh -n dnode1 -c role -v 1
+system sh/cfg.sh -n dnode2 -c role -v 2
+system sh/cfg.sh -n dnode3 -c role -v 0
 
 system sh/cfg.sh -n dnode1 -c wallevel -v 1
 system sh/cfg.sh -n dnode2 -c wallevel -v 1

tests/script/unique/migrate/mn2_vn2_repl2_rmMnodeDir.sim

@@ -31,10 +31,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 #system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 #system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 0
-#system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-#system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 0
+system sh/cfg.sh -n dnode2 -c role -v 0
+#system sh/cfg.sh -n dnode3 -c role -v 2
+#system sh/cfg.sh -n dnode4 -c role -v 2
 
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4

tests/script/unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir.sim

@@ -31,10 +31,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 #system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 #system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 0
-#system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-#system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 0
+system sh/cfg.sh -n dnode2 -c role -v 0
+#system sh/cfg.sh -n dnode3 -c role -v 2
+#system sh/cfg.sh -n dnode4 -c role -v 2
 
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4

tests/script/unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir_stopAll_starAll.sim

@@ -31,10 +31,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 #system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 #system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 0
-#system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-#system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 0
+system sh/cfg.sh -n dnode2 -c role -v 0
+#system sh/cfg.sh -n dnode3 -c role -v 2
+#system sh/cfg.sh -n dnode4 -c role -v 2
 
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4

tests/script/unique/migrate/mn2_vn2_repl2_rmVnodeDir.sim

@@ -31,10 +31,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 #system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 #system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
-system sh/cfg.sh -n dnode1 -c alternativeRole -v 0
-system sh/cfg.sh -n dnode2 -c alternativeRole -v 0
-#system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
-#system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode1 -c role -v 0
+system sh/cfg.sh -n dnode2 -c role -v 0
+#system sh/cfg.sh -n dnode3 -c role -v 2
+#system sh/cfg.sh -n dnode4 -c role -v 2
 
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4