unittest

source/dnode/mgmt/impl/test/CMakeLists.txt

@@ -9,8 +9,8 @@ add_subdirectory(dnode)
 # add_subdirectory(func)
 add_subdirectory(mnode)
 add_subdirectory(qnode)
-#add_subdirectory(mnode)
-#add_subdirectory(mnode)
+add_subdirectory(snode)
+add_subdirectory(bnode)
 add_subdirectory(profile)
 add_subdirectory(show)
 add_subdirectory(stb)

source/dnode/mgmt/impl/test/bnode/CMakeLists.txt

+aux_source_directory(. STEST_SRC)
+add_executable(dnode_test_bnode ${STEST_SRC})
+target_link_libraries(
+    dnode_test_bnode
+    PUBLIC sut
+)
+
+add_test(
+    NAME dnode_test_bnode
+    COMMAND dnode_test_bnode
+)

source/dnode/mgmt/impl/test/bnode/bnode.cpp

+/**
+ * @file dnode.cpp
+ * @author slguan (slguan@taosdata.com)
+ * @brief DNODE module dnode-msg tests
+ * @version 0.1
+ * @date 2021-12-15
+ *
+ * @copyright Copyright (c) 2021
+ *
+ */
+
+#include "base.h"
+
+class DndTestBnode : public ::testing::Test {
+ public:
+  void SetUp() override {}
+  void TearDown() override {}
+
+ public:
+  static void SetUpTestSuite() {
+    test.Init("/tmp/dnode_test_bnode1", 9068);
+    const char* fqdn = "localhost";
+    const char* firstEp = "localhost:9068";
+
+    server2.Start("/tmp/dnode_test_bnode2", fqdn, 9069, firstEp);
+    taosMsleep(300);
+  }
+
+  static void TearDownTestSuite() {
+    server2.Stop();
+    test.Cleanup();
+  }
+
+  static Testbase   test;
+  static TestServer server2;
+};
+
+Testbase   DndTestBnode::test;
+TestServer DndTestBnode::server2;
+
+TEST_F(DndTestBnode, 01_ShowBnode) {
+  test.SendShowMetaMsg(TSDB_MGMT_TABLE_BNODE, "");
+  CHECK_META("show bnodes", 3);
+
+  CHECK_SCHEMA(0, TSDB_DATA_TYPE_SMALLINT, 2, "id");
+  CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, TSDB_EP_LEN + VARSTR_HEADER_SIZE, "endpoint");
+  CHECK_SCHEMA(2, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
+
+  test.SendShowRetrieveMsg();
+  EXPECT_EQ(test.GetShowRows(), 0);
+}
+
+TEST_F(DndTestBnode, 02_Create_Bnode_Invalid_Id) {
+  {
+    int32_t contLen = sizeof(SMCreateBnodeMsg);
+
+    SMCreateBnodeMsg* pReq = (SMCreateBnodeMsg*)rpcMallocCont(contLen);
+    pReq->dnodeId = htonl(1);
+
+    SRpcMsg* pMsg = test.SendMsg(TDMT_MND_CREATE_BNODE, pReq, contLen);
+    ASSERT_NE(pMsg, nullptr);
+    ASSERT_EQ(pMsg->code, 0);
+
+    test.SendShowMetaMsg(TSDB_MGMT_TABLE_BNODE, "");
+    CHECK_META("show bnodes", 3);
+
+    CHECK_SCHEMA(0, TSDB_DATA_TYPE_SMALLINT, 2, "id");
+    CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, TSDB_EP_LEN + VARSTR_HEADER_SIZE, "endpoint");
+    CHECK_SCHEMA(2, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
+
+    test.SendShowRetrieveMsg();
+    EXPECT_EQ(test.GetShowRows(), 1);
+
+    CheckInt16(1);
+    CheckBinary("localhost:9068", TSDB_EP_LEN);
+    CheckTimestamp();
+  }
+}
+
+TEST_F(DndTestBnode, 03_Create_Bnode_Invalid_Id) {
+  {
+    int32_t contLen = sizeof(SMCreateBnodeMsg);
+
+    SMCreateBnodeMsg* pReq = (SMCreateBnodeMsg*)rpcMallocCont(contLen);
+    pReq->dnodeId = htonl(2);
+
+    SRpcMsg* pMsg = test.SendMsg(TDMT_MND_CREATE_BNODE, pReq, contLen);
+    ASSERT_NE(pMsg, nullptr);
+    ASSERT_EQ(pMsg->code, TSDB_CODE_MND_DNODE_NOT_EXIST);
+  }
+}
+
+TEST_F(DndTestBnode, 04_Create_Bnode) {
+  {
+    // create dnode
+    int32_t contLen = sizeof(SCreateDnodeMsg);
+
+    SCreateDnodeMsg* pReq = (SCreateDnodeMsg*)rpcMallocCont(contLen);
+    strcpy(pReq->fqdn, "localhost");
+    pReq->port = htonl(9069);
+
+    SRpcMsg* pMsg = test.SendMsg(TDMT_MND_CREATE_DNODE, pReq, contLen);
+    ASSERT_NE(pMsg, nullptr);
+    ASSERT_EQ(pMsg->code, 0);
+
+    taosMsleep(1300);
+    test.SendShowMetaMsg(TSDB_MGMT_TABLE_DNODE, "");
+    test.SendShowRetrieveMsg();
+    EXPECT_EQ(test.GetShowRows(), 2);
+  }
+
+  {
+    // create bnode
+    int32_t contLen = sizeof(SMCreateBnodeMsg);
+
+    SMCreateBnodeMsg* pReq = (SMCreateBnodeMsg*)rpcMallocCont(contLen);
+    pReq->dnodeId = htonl(2);
+
+    SRpcMsg* pMsg = test.SendMsg(TDMT_MND_CREATE_BNODE, pReq, contLen);
+    ASSERT_NE(pMsg, nullptr);
+    ASSERT_EQ(pMsg->code, 0);
+
+    test.SendShowMetaMsg(TSDB_MGMT_TABLE_BNODE, "");
+    test.SendShowRetrieveMsg();
+    EXPECT_EQ(test.GetShowRows(), 2);
+
+    CheckInt16(1);
+    CheckInt16(2);
+    CheckBinary("localhost:9068", TSDB_EP_LEN);
+    CheckBinary("localhost:9069", TSDB_EP_LEN);
+    CheckTimestamp();
+    CheckTimestamp();
+  }
+
+  {
+    // drop bnode
+    int32_t contLen = sizeof(SMDropBnodeMsg);
+
+    SMDropBnodeMsg* pReq = (SMDropBnodeMsg*)rpcMallocCont(contLen);
+    pReq->dnodeId = htonl(2);
+
+    SRpcMsg* pMsg = test.SendMsg(TDMT_MND_DROP_BNODE, pReq, contLen);
+    ASSERT_NE(pMsg, nullptr);
+    ASSERT_EQ(pMsg->code, 0);
+
+    test.SendShowMetaMsg(TSDB_MGMT_TABLE_BNODE, "");
+    test.SendShowRetrieveMsg();
+    EXPECT_EQ(test.GetShowRows(), 1);
+
+    CheckInt16(1);
+    CheckBinary("localhost:9068", TSDB_EP_LEN);
+    CheckTimestamp();
+  }
+}
\ No newline at end of file

source/dnode/mgmt/impl/test/qnode/qnode.cpp

@@ -18,53 +18,37 @@ class DndTestQnode : public ::testing::Test {
 
  public:
   static void SetUpTestSuite() {
-    test.Init("/tmp/dnode_test_qnode1", 9071);
+    test.Init("/tmp/dnode_test_qnode1", 9064);
     const char* fqdn = "localhost";
-    const char* firstEp = "localhost:9071";
+    const char* firstEp = "localhost:9064";
 
-    server2.Start("/tmp/dnode_test_qnode2", fqdn, 9072, firstEp);
-    server3.Start("/tmp/dnode_test_qnode3", fqdn, 9073, firstEp);
-    server4.Start("/tmp/dnode_test_qnode4", fqdn, 9074, firstEp);
-    server5.Start("/tmp/dnode_test_qnode5", fqdn, 9075, firstEp);
+    server2.Start("/tmp/dnode_test_qnode2", fqdn, 9065, firstEp);
     taosMsleep(300);
   }
 
   static void TearDownTestSuite() {
     server2.Stop();
-    server3.Stop();
-    server4.Stop();
-    server5.Stop();
     test.Cleanup();
   }
 
   static Testbase   test;
   static TestServer server2;
-  static TestServer server3;
-  static TestServer server4;
-  static TestServer server5;
 };
 
 Testbase   DndTestQnode::test;
 TestServer DndTestQnode::server2;
-TestServer DndTestQnode::server3;
-TestServer DndTestQnode::server4;
-TestServer DndTestQnode::server5;
 
-// TEST_F(DndTestQnode, 01_ShowQnode) {
-//   test.SendShowMetaMsg(TSDB_MGMT_TABLE_QNODE, "");
-//   CHECK_META("show qnodes", 3);
+TEST_F(DndTestQnode, 01_ShowQnode) {
+  test.SendShowMetaMsg(TSDB_MGMT_TABLE_QNODE, "");
+  CHECK_META("show qnodes", 3);
 
-//   CHECK_SCHEMA(0, TSDB_DATA_TYPE_SMALLINT, 2, "id");
-//   CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, TSDB_EP_LEN + VARSTR_HEADER_SIZE, "endpoint");
-//   CHECK_SCHEMA(2, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
+  CHECK_SCHEMA(0, TSDB_DATA_TYPE_SMALLINT, 2, "id");
+  CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, TSDB_EP_LEN + VARSTR_HEADER_SIZE, "endpoint");
+  CHECK_SCHEMA(2, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
 
-//   test.SendShowRetrieveMsg();
-//   EXPECT_EQ(test.GetShowRows(), 1);
-
-//   CheckInt16(1);
-//   CheckBinary("localhost:9071", TSDB_EP_LEN);
-//   CheckTimestamp();
-// }
+  test.SendShowRetrieveMsg();
+  EXPECT_EQ(test.GetShowRows(), 0);
+}
 
 TEST_F(DndTestQnode, 02_Create_Qnode_Invalid_Id) {
   {
@@ -88,83 +72,83 @@ TEST_F(DndTestQnode, 02_Create_Qnode_Invalid_Id) {
     EXPECT_EQ(test.GetShowRows(), 1);
 
     CheckInt16(1);
-    CheckBinary("localhost:9071", TSDB_EP_LEN);
+    CheckBinary("localhost:9064", TSDB_EP_LEN);
     CheckTimestamp();
   }
 }
 
-// TEST_F(DndTestQnode, 03_Create_Qnode_Invalid_Id) {
-//   {
-//     int32_t contLen = sizeof(SMCreateQnodeMsg);
-
-//     SMCreateQnodeMsg* pReq = (SMCreateQnodeMsg*)rpcMallocCont(contLen);
-//     pReq->dnodeId = htonl(2);
-
-//     SRpcMsg* pMsg = test.SendMsg(TDMT_MND_CREATE_QNODE, pReq, contLen);
-//     ASSERT_NE(pMsg, nullptr);
-//     ASSERT_EQ(pMsg->code, TSDB_CODE_MND_DNODE_NOT_EXIST);
-//   }
-// }
-
-// TEST_F(DndTestQnode, 04_Create_Qnode) {
-//   {
-//     // create dnode
-//     int32_t contLen = sizeof(SCreateDnodeMsg);
-
-//     SCreateDnodeMsg* pReq = (SCreateDnodeMsg*)rpcMallocCont(contLen);
-//     strcpy(pReq->fqdn, "localhost");
-//     pReq->port = htonl(9072);
-
-//     SRpcMsg* pMsg = test.SendMsg(TDMT_MND_CREATE_DNODE, pReq, contLen);
-//     ASSERT_NE(pMsg, nullptr);
-//     ASSERT_EQ(pMsg->code, 0);
-
-//     taosMsleep(1300);
-//     test.SendShowMetaMsg(TSDB_MGMT_TABLE_DNODE, "");
-//     test.SendShowRetrieveMsg();
-//     EXPECT_EQ(test.GetShowRows(), 2);
-//   }
-
-//   {
-//     // create qnode
-//     int32_t contLen = sizeof(SMCreateQnodeMsg);
-
-//     SMCreateQnodeMsg* pReq = (SMCreateQnodeMsg*)rpcMallocCont(contLen);
-//     pReq->dnodeId = htonl(2);
-
-//     SRpcMsg* pMsg = test.SendMsg(TDMT_MND_CREATE_QNODE, pReq, contLen);
-//     ASSERT_NE(pMsg, nullptr);
-//     ASSERT_EQ(pMsg->code, 0);
-
-//     test.SendShowMetaMsg(TSDB_MGMT_TABLE_QNODE, "");
-//     test.SendShowRetrieveMsg();
-//     EXPECT_EQ(test.GetShowRows(), 2);
-
-//     CheckInt16(1);
-//     CheckInt16(2);
-//     CheckBinary("localhost:9071", TSDB_EP_LEN);
-//     CheckBinary("localhost:9072", TSDB_EP_LEN);
-//     CheckTimestamp();
-//     CheckTimestamp();
-//   }
-
-//   {
-//     // drop qnode
-//     int32_t contLen = sizeof(SMDropQnodeMsg);
-
-//     SMDropQnodeMsg* pReq = (SMDropQnodeMsg*)rpcMallocCont(contLen);
-//     pReq->dnodeId = htonl(2);
-
-//     SRpcMsg* pMsg = test.SendMsg(TDMT_MND_DROP_QNODE, pReq, contLen);
-//     ASSERT_NE(pMsg, nullptr);
-//     ASSERT_EQ(pMsg->code, 0);
-
-//     test.SendShowMetaMsg(TSDB_MGMT_TABLE_QNODE, "");
-//     test.SendShowRetrieveMsg();
-//     EXPECT_EQ(test.GetShowRows(), 1);
-
-//     CheckInt16(1);
-//     CheckBinary("localhost:9071", TSDB_EP_LEN);
-//     CheckTimestamp();
-//   }
-// }
\ No newline at end of file
+TEST_F(DndTestQnode, 03_Create_Qnode_Invalid_Id) {
+  {
+    int32_t contLen = sizeof(SMCreateQnodeMsg);
+
+    SMCreateQnodeMsg* pReq = (SMCreateQnodeMsg*)rpcMallocCont(contLen);
+    pReq->dnodeId = htonl(2);
+
+    SRpcMsg* pMsg = test.SendMsg(TDMT_MND_CREATE_QNODE, pReq, contLen);
+    ASSERT_NE(pMsg, nullptr);
+    ASSERT_EQ(pMsg->code, TSDB_CODE_MND_DNODE_NOT_EXIST);
+  }
+}
+
+TEST_F(DndTestQnode, 04_Create_Qnode) {
+  {
+    // create dnode
+    int32_t contLen = sizeof(SCreateDnodeMsg);
+
+    SCreateDnodeMsg* pReq = (SCreateDnodeMsg*)rpcMallocCont(contLen);
+    strcpy(pReq->fqdn, "localhost");
+    pReq->port = htonl(9065);
+
+    SRpcMsg* pMsg = test.SendMsg(TDMT_MND_CREATE_DNODE, pReq, contLen);
+    ASSERT_NE(pMsg, nullptr);
+    ASSERT_EQ(pMsg->code, 0);
+
+    taosMsleep(1300);
+    test.SendShowMetaMsg(TSDB_MGMT_TABLE_DNODE, "");
+    test.SendShowRetrieveMsg();
+    EXPECT_EQ(test.GetShowRows(), 2);
+  }
+
+  {
+    // create qnode
+    int32_t contLen = sizeof(SMCreateQnodeMsg);
+
+    SMCreateQnodeMsg* pReq = (SMCreateQnodeMsg*)rpcMallocCont(contLen);
+    pReq->dnodeId = htonl(2);
+
+    SRpcMsg* pMsg = test.SendMsg(TDMT_MND_CREATE_QNODE, pReq, contLen);
+    ASSERT_NE(pMsg, nullptr);
+    ASSERT_EQ(pMsg->code, 0);
+
+    test.SendShowMetaMsg(TSDB_MGMT_TABLE_QNODE, "");
+    test.SendShowRetrieveMsg();
+    EXPECT_EQ(test.GetShowRows(), 2);
+
+    CheckInt16(1);
+    CheckInt16(2);
+    CheckBinary("localhost:9064", TSDB_EP_LEN);
+    CheckBinary("localhost:9065", TSDB_EP_LEN);
+    CheckTimestamp();
+    CheckTimestamp();
+  }
+
+  {
+    // drop qnode
+    int32_t contLen = sizeof(SMDropQnodeMsg);
+
+    SMDropQnodeMsg* pReq = (SMDropQnodeMsg*)rpcMallocCont(contLen);
+    pReq->dnodeId = htonl(2);
+
+    SRpcMsg* pMsg = test.SendMsg(TDMT_MND_DROP_QNODE, pReq, contLen);
+    ASSERT_NE(pMsg, nullptr);
+    ASSERT_EQ(pMsg->code, 0);
+
+    test.SendShowMetaMsg(TSDB_MGMT_TABLE_QNODE, "");
+    test.SendShowRetrieveMsg();
+    EXPECT_EQ(test.GetShowRows(), 1);
+
+    CheckInt16(1);
+    CheckBinary("localhost:9064", TSDB_EP_LEN);
+    CheckTimestamp();
+  }
+}
\ No newline at end of file

source/dnode/mgmt/impl/test/snode/CMakeLists.txt

+aux_source_directory(. STEST_SRC)
+add_executable(dnode_test_snode ${STEST_SRC})
+target_link_libraries(
+    dnode_test_snode
+    PUBLIC sut
+)
+
+add_test(
+    NAME dnode_test_snode
+    COMMAND dnode_test_snode
+)

source/dnode/mgmt/impl/test/snode/snode.cpp

+/**
+ * @file dnode.cpp
+ * @author slguan (slguan@taosdata.com)
+ * @brief DNODE module dnode-msg tests
+ * @version 0.1
+ * @date 2021-12-15
+ *
+ * @copyright Copyright (c) 2021
+ *
+ */
+
+#include "base.h"
+
+class DndTestSnode : public ::testing::Test {
+ public:
+  void SetUp() override {}
+  void TearDown() override {}
+
+ public:
+  static void SetUpTestSuite() {
+    test.Init("/tmp/dnode_test_snode1", 9066);
+    const char* fqdn = "localhost";
+    const char* firstEp = "localhost:9066";
+
+    server2.Start("/tmp/dnode_test_snode2", fqdn, 9067, firstEp);
+    taosMsleep(300);
+  }
+
+  static void TearDownTestSuite() {
+    server2.Stop();
+    test.Cleanup();
+  }
+
+  static Testbase   test;
+  static TestServer server2;
+};
+
+Testbase   DndTestSnode::test;
+TestServer DndTestSnode::server2;
+
+TEST_F(DndTestSnode, 01_ShowSnode) {
+  test.SendShowMetaMsg(TSDB_MGMT_TABLE_SNODE, "");
+  CHECK_META("show snodes", 3);
+
+  CHECK_SCHEMA(0, TSDB_DATA_TYPE_SMALLINT, 2, "id");
+  CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, TSDB_EP_LEN + VARSTR_HEADER_SIZE, "endpoint");
+  CHECK_SCHEMA(2, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
+
+  test.SendShowRetrieveMsg();
+  EXPECT_EQ(test.GetShowRows(), 0);
+}
+
+TEST_F(DndTestSnode, 02_Create_Snode_Invalid_Id) {
+  {
+    int32_t contLen = sizeof(SMCreateSnodeMsg);
+
+    SMCreateSnodeMsg* pReq = (SMCreateSnodeMsg*)rpcMallocCont(contLen);
+    pReq->dnodeId = htonl(1);
+
+    SRpcMsg* pMsg = test.SendMsg(TDMT_MND_CREATE_SNODE, pReq, contLen);
+    ASSERT_NE(pMsg, nullptr);
+    ASSERT_EQ(pMsg->code, 0);
+
+    test.SendShowMetaMsg(TSDB_MGMT_TABLE_SNODE, "");
+    CHECK_META("show snodes", 3);
+
+    CHECK_SCHEMA(0, TSDB_DATA_TYPE_SMALLINT, 2, "id");
+    CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, TSDB_EP_LEN + VARSTR_HEADER_SIZE, "endpoint");
+    CHECK_SCHEMA(2, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
+
+    test.SendShowRetrieveMsg();
+    EXPECT_EQ(test.GetShowRows(), 1);
+
+    CheckInt16(1);
+    CheckBinary("localhost:9066", TSDB_EP_LEN);
+    CheckTimestamp();
+  }
+}
+
+TEST_F(DndTestSnode, 03_Create_Snode_Invalid_Id) {
+  {
+    int32_t contLen = sizeof(SMCreateSnodeMsg);
+
+    SMCreateSnodeMsg* pReq = (SMCreateSnodeMsg*)rpcMallocCont(contLen);
+    pReq->dnodeId = htonl(2);
+
+    SRpcMsg* pMsg = test.SendMsg(TDMT_MND_CREATE_SNODE, pReq, contLen);
+    ASSERT_NE(pMsg, nullptr);
+    ASSERT_EQ(pMsg->code, TSDB_CODE_MND_DNODE_NOT_EXIST);
+  }
+}
+
+TEST_F(DndTestSnode, 04_Create_Snode) {
+  {
+    // create dnode
+    int32_t contLen = sizeof(SCreateDnodeMsg);
+
+    SCreateDnodeMsg* pReq = (SCreateDnodeMsg*)rpcMallocCont(contLen);
+    strcpy(pReq->fqdn, "localhost");
+    pReq->port = htonl(9067);
+
+    SRpcMsg* pMsg = test.SendMsg(TDMT_MND_CREATE_DNODE, pReq, contLen);
+    ASSERT_NE(pMsg, nullptr);
+    ASSERT_EQ(pMsg->code, 0);
+
+    taosMsleep(1300);
+    test.SendShowMetaMsg(TSDB_MGMT_TABLE_DNODE, "");
+    test.SendShowRetrieveMsg();
+    EXPECT_EQ(test.GetShowRows(), 2);
+  }
+
+  {
+    // create snode
+    int32_t contLen = sizeof(SMCreateSnodeMsg);
+
+    SMCreateSnodeMsg* pReq = (SMCreateSnodeMsg*)rpcMallocCont(contLen);
+    pReq->dnodeId = htonl(2);
+
+    SRpcMsg* pMsg = test.SendMsg(TDMT_MND_CREATE_SNODE, pReq, contLen);
+    ASSERT_NE(pMsg, nullptr);
+    ASSERT_EQ(pMsg->code, 0);
+
+    test.SendShowMetaMsg(TSDB_MGMT_TABLE_SNODE, "");
+    test.SendShowRetrieveMsg();
+    EXPECT_EQ(test.GetShowRows(), 2);
+
+    CheckInt16(1);
+    CheckInt16(2);
+    CheckBinary("localhost:9066", TSDB_EP_LEN);
+    CheckBinary("localhost:9067", TSDB_EP_LEN);
+    CheckTimestamp();
+    CheckTimestamp();
+  }
+
+  {
+    // drop snode
+    int32_t contLen = sizeof(SMDropSnodeMsg);
+
+    SMDropSnodeMsg* pReq = (SMDropSnodeMsg*)rpcMallocCont(contLen);
+    pReq->dnodeId = htonl(2);
+
+    SRpcMsg* pMsg = test.SendMsg(TDMT_MND_DROP_SNODE, pReq, contLen);
+    ASSERT_NE(pMsg, nullptr);
+    ASSERT_EQ(pMsg->code, 0);
+
+    test.SendShowMetaMsg(TSDB_MGMT_TABLE_SNODE, "");
+    test.SendShowRetrieveMsg();
+    EXPECT_EQ(test.GetShowRows(), 1);
+
+    CheckInt16(1);
+    CheckBinary("localhost:9066", TSDB_EP_LEN);
+    CheckTimestamp();
+  }
+}
\ No newline at end of file

source/dnode/mnode/impl/src/mndBnode.c

@@ -158,7 +158,7 @@ static int32_t mndSetCreateBnodeRedoActions(STrans *pTrans, SDnodeObj *pDnode, S
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return -1;
   }
-  pMsg->dnodeId = htonl(pMsg->dnodeId);
+  pMsg->dnodeId = htonl(pDnode->id);
 
   STransAction action = {0};
   action.epSet = mndGetDnodeEpset(pDnode);
@@ -270,7 +270,7 @@ static int32_t mndSetDropBnodeRedoActions(STrans *pTrans, SDnodeObj *pDnode, SBn
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return -1;
   }
-  pMsg->dnodeId = htonl(pMsg->dnodeId);
+  pMsg->dnodeId = htonl(pDnode->id);
 
   STransAction action = {0};
   action.epSet = mndGetDnodeEpset(pDnode);

source/dnode/mnode/impl/src/mndQnode.c

@@ -158,7 +158,7 @@ static int32_t mndSetCreateQnodeRedoActions(STrans *pTrans, SDnodeObj *pDnode, S
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return -1;
   }
-  pMsg->dnodeId = htonl(pMsg->dnodeId);
+  pMsg->dnodeId = htonl(pDnode->id);
 
   STransAction action = {0};
   action.epSet = mndGetDnodeEpset(pDnode);
@@ -270,7 +270,7 @@ static int32_t mndSetDropQnodeRedoActions(STrans *pTrans, SDnodeObj *pDnode, SQn
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return -1;
   }
-  pMsg->dnodeId = htonl(pMsg->dnodeId);
+  pMsg->dnodeId = htonl(pDnode->id);
 
   STransAction action = {0};
   action.epSet = mndGetDnodeEpset(pDnode);

source/dnode/mnode/impl/src/mndSnode.c

@@ -158,7 +158,7 @@ static int32_t mndSetCreateSnodeRedoActions(STrans *pTrans, SDnodeObj *pDnode, S
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return -1;
   }
-  pMsg->dnodeId = htonl(pMsg->dnodeId);
+  pMsg->dnodeId = htonl(pDnode->id);
 
   STransAction action = {0};
   action.epSet = mndGetDnodeEpset(pDnode);
@@ -270,7 +270,7 @@ static int32_t mndSetDropSnodeRedoActions(STrans *pTrans, SDnodeObj *pDnode, SSn
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return -1;
   }
-  pMsg->dnodeId = htonl(pMsg->dnodeId);
+  pMsg->dnodeId = htonl(pDnode->id);
 
   STransAction action = {0};
   action.epSet = mndGetDnodeEpset(pDnode);