From b4d667d574f5e8a4cd51eb4b560d94cd875fb350 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Sat, 26 Dec 2020 17:04:50 +0800
Subject: [PATCH] [TD-2561]<enhance>: new field clusterId for SConnectRsp

---
 src/dnode/inc/dnodeCfg.h  | 1 +
 src/dnode/src/dnodeCfg.c  | 6 ++++++
 src/inc/dnode.h           | 4 +++-
 src/inc/taosmsg.h         | 1 +
 src/mnode/src/mnodeShow.c | 2 ++
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/dnode/inc/dnodeCfg.h b/src/dnode/inc/dnodeCfg.h
index d74303f325..896b3f574c 100644
--- a/src/dnode/inc/dnodeCfg.h
+++ b/src/dnode/inc/dnodeCfg.h
@@ -25,6 +25,7 @@ int32_t dnodeInitCfg();
 void    dnodeCleanupCfg();
 void    dnodeUpdateCfg(SDnodeCfg *cfg);
 int32_t dnodeGetDnodeId();
+void    dnodeGetClusterId(char *clusterId);
 void    dnodeGetCfg(int32_t *dnodeId, char *clusterId);
 
 #ifdef __cplusplus
diff --git a/src/dnode/src/dnodeCfg.c b/src/dnode/src/dnodeCfg.c
index 89249d773b..f495dbe285 100644
--- a/src/dnode/src/dnodeCfg.c
+++ b/src/dnode/src/dnodeCfg.c
@@ -51,6 +51,12 @@ int32_t dnodeGetDnodeId() {
   return dnodeId;
 }
 
+void dnodeGetClusterId(char *clusterId) {
+  pthread_mutex_lock(&tsCfgMutex);
+  tstrncpy(clusterId, tsCfg.clusterId, TSDB_CLUSTER_ID_LEN);
+  pthread_mutex_unlock(&tsCfgMutex);
+}
+
 void dnodeGetCfg(int32_t *dnodeId, char *clusterId) {
   pthread_mutex_lock(&tsCfgMutex);
   *dnodeId = tsCfg.dnodeId;
diff --git a/src/inc/dnode.h b/src/inc/dnode.h
index dd41360e68..877738778b 100644
--- a/src/inc/dnode.h
+++ b/src/inc/dnode.h
@@ -36,6 +36,8 @@ bool    dnodeIsMasterEp(char *ep);
 void    dnodeGetEpSetForPeer(SRpcEpSet *epSet);
 void    dnodeGetEpSetForShell(SRpcEpSet *epSet);
 int32_t dnodeGetDnodeId();
+void    dnodeGetClusterId(char *clusterId);
+
 void    dnodeUpdateEp(int32_t dnodeId, char *ep, char *fqdn, uint16_t *port);
 bool    dnodeCheckEpChanged(int32_t dnodeId, char *epstr);
 bool    dnodeStartMnode(SMInfos *pMinfos);
@@ -80,4 +82,4 @@ void    dnodeReportStep(char *name, char *desc, int8_t finished);
 }
 #endif
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h
index 2df243eb3e..f27af2a37b 100644
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@@ -324,6 +324,7 @@ typedef struct {
 typedef struct {
   char      acctId[TSDB_ACCT_LEN];
   char      serverVersion[TSDB_VERSION_LEN];
+  char      clusterId[TSDB_CLUSTER_ID_LEN];
   int8_t    writeAuth;
   int8_t    superAuth;
   int8_t    reserved1;
diff --git a/src/mnode/src/mnodeShow.c b/src/mnode/src/mnodeShow.c
index 3c1c92226a..6b9f0e26a7 100644
--- a/src/mnode/src/mnodeShow.c
+++ b/src/mnode/src/mnodeShow.c
@@ -351,6 +351,8 @@ static int32_t mnodeProcessConnectMsg(SMnodeMsg *pMsg) {
   
   mnodeGetMnodeEpSetForShell(&pConnectRsp->epSet, false);
 
+  dnodeGetClusterId(pConnectRsp->clusterId);
+
 connect_over:
   if (code != TSDB_CODE_SUCCESS) {
     if (pConnectRsp) rpcFreeCont(pConnectRsp);
-- 
GitLab