minor changes

source/dnode/mgmt/impl/src/dndMnode.c

@@ -438,12 +438,14 @@ int32_t dndProcessCreateMnodeReq(SDnode *pDnode, SRpcMsg *pReq) {
 
   if (pCreate->replica <= 1 || pCreate->dnodeId != dndGetDnodeId(pDnode)) {
     terrno = TSDB_CODE_DND_MNODE_INVALID_OPTION;
+    dError("failed to create mnode since %s", terrstr());
     return -1;
   }
 
   SMnodeOpt option = {0};
   if (dndBuildMnodeOptionFromReq(pDnode, &option, pCreate) != 0) {
     terrno = TSDB_CODE_DND_MNODE_INVALID_OPTION;
+    dError("failed to create mnode since %s", terrstr());
     return -1;
   }
 
@@ -451,9 +453,11 @@ int32_t dndProcessCreateMnodeReq(SDnode *pDnode, SRpcMsg *pReq) {
   if (pMnode != NULL) {
     dndReleaseMnode(pDnode, pMnode);
     terrno = TSDB_CODE_DND_MNODE_ALREADY_DEPLOYED;
+    dError("failed to create mnode since %s", terrstr());
     return -1;
   }
 
+  dDebug("start to create mnode");
   return dndOpenMnode(pDnode, &option);
 }
 
@@ -462,21 +466,25 @@ int32_t dndProcessAlterMnodeReq(SDnode *pDnode, SRpcMsg *pReq) {
 
   if (pAlter->dnodeId != dndGetDnodeId(pDnode)) {
     terrno = TSDB_CODE_DND_MNODE_INVALID_OPTION;
+    dError("failed to alter mnode since %s", terrstr());
     return -1;
   }
 
   SMnodeOpt option = {0};
   if (dndBuildMnodeOptionFromReq(pDnode, &option, pAlter) != 0) {
     terrno = TSDB_CODE_DND_MNODE_INVALID_OPTION;
+    dError("failed to alter mnode since %s", terrstr());
     return -1;
   }
 
   SMnode *pMnode = dndAcquireMnode(pDnode);
   if (pMnode == NULL) {
     terrno = TSDB_CODE_DND_MNODE_NOT_DEPLOYED;
+    dError("failed to alter mnode since %s", terrstr());
     return -1;
   }
 
+  dDebug("start to alter mnode");
   int32_t code = dndAlterMnode(pDnode, &option);
   dndReleaseMnode(pDnode, pMnode);
 
@@ -489,15 +497,18 @@ int32_t dndProcessDropMnodeReq(SDnode *pDnode, SRpcMsg *pReq) {
 
   if (pDrop->dnodeId != dndGetDnodeId(pDnode)) {
     terrno = TSDB_CODE_DND_MNODE_INVALID_OPTION;
+    dError("failed to drop mnode since %s", terrstr());
     return -1;
   }
 
   SMnode *pMnode = dndAcquireMnode(pDnode);
   if (pMnode != NULL) {
     terrno = TSDB_CODE_DND_MNODE_NOT_DEPLOYED;
+    dError("failed to drop mnode since %s", terrstr());
     return -1;
   }
 
+  dDebug("start to drop mnode");
   int32_t code = dndDropMnode(pDnode);
   dndReleaseMnode(pDnode, pMnode);
 

source/dnode/mgmt/impl/test/mnode/qmnode.cpp

@@ -54,50 +54,53 @@ TEST_F(DndTestMnode, 01_Create_Dnode) {
 }
 
 TEST_F(DndTestMnode, 01_Create_Mnode) {
-  // {
-  //   int32_t contLen = sizeof(SDCreateMnodeReq);
+  {
+    int32_t contLen = sizeof(SDCreateMnodeReq);
 
-  //   SDCreateMnodeReq* pReq = (SDCreateMnodeReq*)rpcMallocCont(contLen);
-  //   pReq->dnodeId = htonl(2);
-  //   pReq->replica = 1;
-  //   pReq->replicas[0].id = htonl(1);
-  //   pReq->replicas[0].port = htonl(9113);
-  //   strcpy(pReq->replicas[0].fqdn, "localhost");
+    SDCreateMnodeReq* pReq = (SDCreateMnodeReq*)rpcMallocCont(contLen);
+    pReq->dnodeId = htonl(2);
+    pReq->replica = 1;
+    pReq->replicas[0].id = htonl(1);
+    pReq->replicas[0].port = htonl(9113);
+    strcpy(pReq->replicas[0].fqdn, "localhost");
 
-  //   SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_MNODE, pReq, contLen);
-  //   ASSERT_NE(pRsp, nullptr);
-  //   ASSERT_EQ(pRsp->code, TSDB_CODE_DND_MNODE_ID_INVALID);
-  // }
+    SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_MNODE, pReq, contLen);
+    ASSERT_NE(pRsp, nullptr);
+    ASSERT_EQ(pRsp->code, TSDB_CODE_DND_MNODE_INVALID_OPTION);
+  }
 
-  // {
-  //   int32_t contLen = sizeof(SDCreateMnodeReq);
+  {
+    int32_t contLen = sizeof(SDCreateMnodeReq);
 
-  //   SDCreateMnodeReq* pReq = (SDCreateMnodeReq*)rpcMallocCont(contLen);
-  //   pReq->dnodeId = htonl(1);
-  //   pReq->replica = 1;
-  //   pReq->replicas[0].id = htonl(2);
-  //   pReq->replicas[0].port = htonl(9113);
-  //   strcpy(pReq->replicas[0].fqdn, "localhost");
+    SDCreateMnodeReq* pReq = (SDCreateMnodeReq*)rpcMallocCont(contLen);
+    pReq->dnodeId = htonl(1);
+    pReq->replica = 1;
+    pReq->replicas[0].id = htonl(2);
+    pReq->replicas[0].port = htonl(9113);
+    strcpy(pReq->replicas[0].fqdn, "localhost");
 
-  //   SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_MNODE, pReq, contLen);
-  //   ASSERT_NE(pRsp, nullptr);
-  //   ASSERT_EQ(pRsp->code, TSDB_CODE_DND_MNODE_ID_NOT_FOUND);
-  // }
+    SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_MNODE, pReq, contLen);
+    ASSERT_NE(pRsp, nullptr);
+    ASSERT_EQ(pRsp->code, TSDB_CODE_DND_MNODE_INVALID_OPTION);
+  }
 
-  // {
-  //   int32_t contLen = sizeof(SDCreateMnodeReq);
+  {
+    int32_t contLen = sizeof(SDCreateMnodeReq);
 
-  //   SDCreateMnodeReq* pReq = (SDCreateMnodeReq*)rpcMallocCont(contLen);
-  //   pReq->dnodeId = htonl(1);
-  //   pReq->replica = 1;
-  //   pReq->replicas[0].id = htonl(1);
-  //   pReq->replicas[0].port = htonl(9113);
-  //   strcpy(pReq->replicas[0].fqdn, "localhost");
+    SDCreateMnodeReq* pReq = (SDCreateMnodeReq*)rpcMallocCont(contLen);
+    pReq->dnodeId = htonl(1);
+    pReq->replica = 2;
+    pReq->replicas[0].id = htonl(1);
+    pReq->replicas[0].port = htonl(9113);
+    strcpy(pReq->replicas[0].fqdn, "localhost");
+    pReq->replicas[1].id = htonl(1);
+    pReq->replicas[1].port = htonl(9114);
+    strcpy(pReq->replicas[1].fqdn, "localhost");
 
-  //   SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_MNODE, pReq, contLen);
-  //   ASSERT_NE(pRsp, nullptr);
-  //   ASSERT_EQ(pRsp->code, TSDB_CODE_DND_MNODE_ALREADY_DEPLOYED);
-  // }
+    SRpcMsg* pRsp = test.SendReq(TDMT_DND_CREATE_MNODE, pReq, contLen);
+    ASSERT_NE(pRsp, nullptr);
+    ASSERT_EQ(pRsp->code, TSDB_CODE_DND_MNODE_ALREADY_DEPLOYED);
+  }
 
   // {
   //   int32_t contLen = sizeof(SDCreateMnodeReq);

source/dnode/mgmt/impl/test/sut/src/sut.cpp

@@ -16,7 +16,7 @@
 #include "sut.h"
 
 void Testbase::InitLog(const char* path) {
-  dDebugFlag = 0;
+  dDebugFlag = 143;
   vDebugFlag = 0;
   mDebugFlag = 143;
   cDebugFlag = 0;