diff --git a/include/common/taosmsg.h b/include/common/taosmsg.h
index 86df19d04d..135a79a48e 100644
--- a/include/common/taosmsg.h
+++ b/include/common/taosmsg.h
@@ -697,8 +697,9 @@ typedef struct {
 } SStatusRsp;
 
 typedef struct {
-  uint16_t port;
-  char     fqdn[TSDB_FQDN_LEN];
+  int32_t  id;
+  uint16_t port;                 // node sync Port
+  char     fqdn[TSDB_FQDN_LEN];  // node FQDN
 } SReplica;
 
 typedef struct {
@@ -719,8 +720,8 @@ typedef struct {
   int8_t   cacheLastRow;
   int8_t   update;
   int8_t   walLevel;
-  int8_t   replica;
   int8_t   quorum;
+  int8_t   replica;
   int8_t   selfIndex;
   SReplica replicas[TSDB_MAX_REPLICA];
 } SCreateVnodeMsg, SAlterVnodeMsg;
diff --git a/include/server/mnode/mnode.h b/include/server/mnode/mnode.h
index b4c98ceb85..09dd4a3f2d 100644
--- a/include/server/mnode/mnode.h
+++ b/include/server/mnode/mnode.h
@@ -26,6 +26,7 @@ typedef struct SMnodeMsg SMnodeMsg;
 
 typedef struct {
   int8_t   replica;
+  int8_t   selfIndex;
   SReplica replicas[TSDB_MAX_REPLICA];
 } SMnodeCfg;
 
diff --git a/include/server/vnode/vnode.h b/include/server/vnode/vnode.h
index f7c4b594f7..352b98dec0 100644
--- a/include/server/vnode/vnode.h
+++ b/include/server/vnode/vnode.h
@@ -27,23 +27,24 @@ extern "C" {
 typedef struct SVnode SVnode;
 
 typedef struct {
-  char       db[TSDB_FULL_DB_NAME_LEN];
-  int32_t    cacheBlockSize;  // MB
-  int32_t    totalBlocks;
-  int32_t    daysPerFile;
-  int32_t    daysToKeep0;
-  int32_t    daysToKeep1;
-  int32_t    daysToKeep2;
-  int32_t    minRowsPerFileBlock;
-  int32_t    maxRowsPerFileBlock;
-  int8_t     precision;  // time resolution
-  int8_t     compression;
-  int8_t     cacheLastRow;
-  int8_t     update;
-  int8_t     quorum;
-  int8_t     replica;
-  int8_t     walLevel;
-  int32_t    fsyncPeriod;  // millisecond
+  char     db[TSDB_FULL_DB_NAME_LEN];
+  int32_t  cacheBlockSize;  // MB
+  int32_t  totalBlocks;
+  int32_t  daysPerFile;
+  int32_t  daysToKeep0;
+  int32_t  daysToKeep1;
+  int32_t  daysToKeep2;
+  int32_t  minRowsPerFileBlock;
+  int32_t  maxRowsPerFileBlock;
+  int8_t   precision;  // time resolution
+  int8_t   compression;
+  int8_t   cacheLastRow;
+  int8_t   update;
+  int8_t   quorum;
+  int8_t   replica;
+  int8_t   selfIndex;
+  int8_t   walLevel;
+  int32_t  fsyncPeriod;  // millisecond
   SReplica replicas[TSDB_MAX_REPLICA];
 } SVnodeCfg;