From ef4102a3056aa5218bf2aa9c78b2f674d41d584a Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Mon, 4 Jan 2021 19:06:41 +0800
Subject: [PATCH] [TD-2644]<fix>: process batch create table sub messages in
 mnodeVgroup module

---
 src/mnode/src/mnodeVgroup.c | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/mnode/src/mnodeVgroup.c b/src/mnode/src/mnodeVgroup.c
index 5b2e89ce16..827be0687d 100644
--- a/src/mnode/src/mnodeVgroup.c
+++ b/src/mnode/src/mnodeVgroup.c
@@ -986,6 +986,19 @@ static void mnodeProcessCreateVnodeRsp(SRpcMsg *rpcMsg) {
     if (code != TSDB_CODE_SUCCESS && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) {
       mnodeMsg->pVgroup = NULL;
       mnodeDestroyVgroup(pVgroup);
+
+      if (mnodeMsg->pBatchMasterMsg) {
+        ++mnodeMsg->pBatchMasterMsg->received;
+        if (mnodeMsg->pBatchMasterMsg->successed + mnodeMsg->pBatchMasterMsg->received
+            >= mnodeMsg->pBatchMasterMsg->expected) {
+          dnodeSendRpcMWriteRsp(mnodeMsg->pBatchMasterMsg, code);
+        }
+
+        mnodeDestroySubMsg(mnodeMsg);
+
+        return;
+      }
+
       dnodeSendRpcMWriteRsp(mnodeMsg, code);
     }
   } else {
@@ -995,6 +1008,19 @@ static void mnodeProcessCreateVnodeRsp(SRpcMsg *rpcMsg) {
       .pObj   = pVgroup
     };
     sdbDeleteRow(&row);
+
+    if (mnodeMsg->pBatchMasterMsg) {
+      ++mnodeMsg->pBatchMasterMsg->received;
+      if (mnodeMsg->pBatchMasterMsg->successed + mnodeMsg->pBatchMasterMsg->received
+          >= mnodeMsg->pBatchMasterMsg->expected) {
+        dnodeSendRpcMWriteRsp(mnodeMsg->pBatchMasterMsg, mnodeMsg->code);
+      }
+
+      mnodeDestroySubMsg(mnodeMsg);
+
+      return;
+    }
+
     dnodeSendRpcMWriteRsp(mnodeMsg, mnodeMsg->code);
   }
 }
@@ -1192,4 +1218,4 @@ void mnodeSetVgidVer(int8_t *cver, uint64_t iver) {
   cver[0] = (int8_t)((int32_t)(iver % 1000000) / 10000);
   cver[1] = (int8_t)((int32_t)(iver % 100000) / 100);
   cver[2] = (int8_t)(iver % 100);
-}
\ No newline at end of file
+}
-- 
GitLab