Merge pull request #8729 from haoyifan/dnode_alloc_fix

Handle memory allocation failure when open vnode

src/dnode/src/dnodeMain.c

@@ -78,14 +78,14 @@ static SStep tsDnodeSteps[] = {
   {"dnode-vmgmt",     dnodeInitVMgmt,      dnodeCleanupVMgmt},
   {"dnode-mread",     dnodeInitMRead,      NULL},
   {"dnode-mwrite",    dnodeInitMWrite,     NULL},
-  {"dnode-mpeer",     dnodeInitMPeer,      NULL},  
+  {"dnode-mpeer",     dnodeInitMPeer,      NULL},
   {"dnode-client",    dnodeInitClient,     dnodeCleanupClient},
   {"dnode-server",    dnodeInitServer,     dnodeCleanupServer},
   {"dnode-vnodes",    dnodeInitVnodes,     dnodeCleanupVnodes},
   {"dnode-modules",   dnodeInitModules,    dnodeCleanupModules},
   {"dnode-mread",     NULL,                dnodeCleanupMRead},
   {"dnode-mwrite",    NULL,                dnodeCleanupMWrite},
-  {"dnode-mpeer",     NULL,                dnodeCleanupMPeer},  
+  {"dnode-mpeer",     NULL,                dnodeCleanupMPeer},
   {"dnode-shell",     dnodeInitShell,      dnodeCleanupShell},
   {"dnode-statustmr", dnodeInitStatusTimer,dnodeCleanupStatusTimer},
   {"dnode-telemetry", dnodeInitTelemetry,  dnodeCleanupTelemetry},
@@ -121,7 +121,7 @@ static int dnodeCreateDir(const char *dir) {
   if (mkdir(dir, 0755) != 0 && errno != EEXIST) {
     return -1;
   }
-  
+
   return 0;
 }
 
@@ -263,8 +263,8 @@ static int32_t dnodeInitStorage() {
   if (tsDiskCfgNum == 1 && dnodeCreateDir(tsDataDir) < 0) {
     dError("failed to create dir: %s, reason: %s", tsDataDir, strerror(errno));
     return -1;
-  } 
-  
+  }
+
   if (tfsInit(tsDiskCfg, tsDiskCfgNum) < 0) {
     dError("failed to init TFS since %s", tstrerror(terrno));
     return -1;
@@ -296,7 +296,7 @@ static int32_t dnodeInitStorage() {
   if (dnodeCreateDir(tsMnodeDir) < 0) {
    dError("failed to create dir: %s, reason: %s", tsMnodeDir, strerror(errno));
    return -1;
-  } 
+  }
 
   if (dnodeCreateDir(tsDnodeDir) < 0) {
    dError("failed to create dir: %s, reason: %s", tsDnodeDir, strerror(errno));

src/dnode/src/dnodeVnodes.c

@@ -127,9 +127,20 @@ int32_t dnodeInitVnodes() {
   int32_t threadNum = tsNumOfCores;
   int32_t vnodesPerThread = numOfVnodes / threadNum + 1;
   SOpenVnodeThread *threads = calloc(threadNum, sizeof(SOpenVnodeThread));
+
+  if (threads == NULL) {
+    return TSDB_CODE_DND_OUT_OF_MEMORY;
+  }
+
   for (int32_t t = 0; t < threadNum; ++t) {
     threads[t].threadIndex = t;
     threads[t].vnodeList = calloc(vnodesPerThread, sizeof(int32_t));
+
+    if (threads[t].vnodeList == NULL) {
+      dError("vnodeList allocation failed");
+      status = TSDB_CODE_DND_OUT_OF_MEMORY;
+      goto DNODE_INIT_VNODES_OUT;
+    }
   }
 
   for (int32_t v = 0; v < numOfVnodes; ++v) {
@@ -163,18 +174,24 @@ int32_t dnodeInitVnodes() {
     }
     openVnodes += pThread->opened;
     failedVnodes += pThread->failed;
-    free(pThread->vnodeList);
   }
 
-  free(threads);
   dInfo("there are total vnodes:%d, opened:%d", numOfVnodes, openVnodes);
 
   if (failedVnodes != 0) {
     dError("there are total vnodes:%d, failed:%d", numOfVnodes, failedVnodes);
-    return -1;
+    status = TSDB_CODE_DND_VNODE_OPEN_FAILED;
   }
 
-  return TSDB_CODE_SUCCESS;
+DNODE_INIT_VNODES_OUT:
+
+  for (int32_t t = 0; t < threadNum; ++t) {
+    SOpenVnodeThread *pThread = &threads[t];
+    free(pThread->vnodeList);
+  }
+  free(threads);
+
+  return status;
 }
 
 void dnodeCleanupVnodes() {

src/util/src/terror.c

@@ -16,7 +16,7 @@
 #include "os.h"
 
 #define TAOS_ERROR_C
- 
+
 typedef struct {
     int32_t val;
     const char* str;
@@ -232,6 +232,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_DND_INVALID_MSG_LEN,          "Invalid message lengt
 TAOS_DEFINE_ERROR(TSDB_CODE_DND_ACTION_IN_PROGRESS,       "Action in progress")
 TAOS_DEFINE_ERROR(TSDB_CODE_DND_TOO_MANY_VNODES,          "Too many vnode directories")
 TAOS_DEFINE_ERROR(TSDB_CODE_DND_EXITING,                  "Dnode is exiting")
+TAOS_DEFINE_ERROR(TSDB_CODE_DND_VNODE_OPEN_FAILED,        "Vnode open failed")
 
 // vnode
 TAOS_DEFINE_ERROR(TSDB_CODE_VND_ACTION_IN_PROGRESS,       "Action in progress")