Merge pull request #3764 from taosdata/patch/TD-1632

Patch/td 1632

src/dnode/src/dnodeMgmt.c

@@ -468,8 +468,24 @@ void dnodeUpdateMnodeEpSetForPeer(SRpcEpSet *pEpSet) {
 
     if (!mnodeIsRunning()) {
       if (strcmp(pEpSet->fqdn[i], tsLocalFqdn) == 0 && pEpSet->port[i] == tsServerPort) {
-        dInfo("mnode index:%d %s:%u should work as master", i, pEpSet->fqdn[i], pEpSet->port[i]);
-        sdbUpdateSync();
+        dInfo("mnode index:%d %s:%u should work as mnode", i, pEpSet->fqdn[i], pEpSet->port[i]);
+        bool find = false;
+        for (int i = 0; i < tsDMnodeInfos.nodeNum; ++i) {
+          if (tsDMnodeInfos.nodeInfos[i].nodeId == dnodeGetDnodeId()) {
+            dInfo("localEp found in mnode infos");
+            find = true;
+            break;
+          }
+        }
+
+        if (!find) {
+          dInfo("localEp not found in mnode infos, will set into mnode infos");
+          tstrncpy(tsDMnodeInfos.nodeInfos[tsDMnodeInfos.nodeNum].nodeEp, tsLocalEp, TSDB_EP_LEN);
+          tsDMnodeInfos.nodeInfos[tsDMnodeInfos.nodeNum].nodeId = dnodeGetDnodeId();
+          tsDMnodeInfos.nodeNum++;
+        }
+
+        dnodeStartMnode();
       }
     }
   }

src/dnode/src/dnodeModule.c

@@ -146,19 +146,16 @@ void dnodeProcessModuleStatus(uint32_t moduleStatus) {
   }
 }
 
-bool dnodeCheckMnodeStarting() {
-  if (tsModuleStatus & (1 << TSDB_MOD_MNODE)) return false;
+bool dnodeStartMnode() {
+  if (tsModuleStatus & (1 << TSDB_MOD_MNODE)) {
+    dDebug("mnode module is already started, module status:%d", tsModuleStatus);
+    return false;
+  }
 
-  SDMMnodeInfos *mnodes = dnodeGetMnodeInfos();
-  for (int32_t i = 0; i < mnodes->nodeNum; ++i) {
-    SDMMnodeInfo *node = &mnodes->nodeInfos[i];
-    if (node->nodeId == dnodeGetDnodeId()) {
   uint32_t moduleStatus = tsModuleStatus | (1 << TSDB_MOD_MNODE);
   dInfo("start mnode module, module status:%d, new status:%d", tsModuleStatus, moduleStatus);
   dnodeProcessModuleStatus(moduleStatus);
-      return true;
-    }
-  }
 
-  return false;
+  sdbUpdateSync();
+  return true;
 }

src/inc/dnode.h

@@ -43,7 +43,7 @@ void    dnodeGetMnodeEpSetForPeer(void *epSet);
 void    dnodeGetMnodeEpSetForShell(void *epSet);
 void *  dnodeGetMnodeInfos();
 int32_t dnodeGetDnodeId();
-bool    dnodeCheckMnodeStarting();
+bool    dnodeStartMnode();
 
 void  dnodeAddClientRspHandle(uint8_t msgType, void (*fp)(SRpcMsg *rpcMsg));
 void  dnodeSendMsgToDnode(SRpcEpSet *epSet, SRpcMsg *rpcMsg);

src/mnode/src/mnodeSdb.c

@@ -91,7 +91,6 @@ typedef struct {
 } SSdbWriteWorkerPool;
 
 extern void *     tsMnodeTmr;
-static void *     tsUpdateSyncTmr;
 static SSdbObject tsSdbObj = {0};
 static taos_qset  tsSdbWriteQset;
 static taos_qall  tsSdbWriteQall;
@@ -298,16 +297,12 @@ static void sdbConfirmForward(void *ahandle, void *param, int32_t code) {
   taosFreeQitem(pOper);
 }
 
-static void sdbUpdateSyncTmrFp(void *param, void *tmrId) { sdbUpdateSync(); }
-
 void sdbUpdateSync() {
   if (!mnodeIsRunning()) {
     mDebug("mnode not start yet, update sync info later");
-    if (dnodeCheckMnodeStarting()) {
-      taosTmrReset(sdbUpdateSyncTmrFp, 1000, NULL, tsMnodeTmr, &tsUpdateSyncTmr);
-    }
     return;
   }
+
   mDebug("update sync info in sdb");
 
   SSyncCfg syncCfg = {0};

tests/script/unique/mnode/mgmt23.sim

@@ -65,7 +65,7 @@ endi
 
 print ============== step4
 sql drop dnode $hostname2
-sleep 16000
+sleep 10000
 
 sql show mnodes
 $dnode1Role = $data2_1