shm

include/util/taoserror.h

@@ -88,6 +88,8 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_COMPRESS_ERROR                TAOS_DEF_ERROR_CODE(0, 0x0123)
 #define TSDB_CODE_NODE_ALREADY_DEPLOYED         TAOS_DEF_ERROR_CODE(0, 0x0124)
 #define TSDB_CODE_NODE_NOT_DEPLOYED             TAOS_DEF_ERROR_CODE(0, 0x0125)
+#define TSDB_CODE_NODE_READ_FILE_ERROR          TAOS_DEF_ERROR_CODE(0, 0x0126)
+#define TSDB_CODE_NODE_WRITE_FILE_ERROR         TAOS_DEF_ERROR_CODE(0, 0x0127)
 
 //client
 #define TSDB_CODE_TSC_INVALID_OPERATION         TAOS_DEF_ERROR_CODE(0, 0x0200)
@@ -300,8 +302,6 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_DND_BNODE_ALREADY_DEPLOYED    TAOS_DEF_ERROR_CODE(0, 0x0450)
 #define TSDB_CODE_DND_BNODE_NOT_DEPLOYED        TAOS_DEF_ERROR_CODE(0, 0x0451)
 #define TSDB_CODE_DND_BNODE_INVALID_OPTION      TAOS_DEF_ERROR_CODE(0, 0x0452)
-#define TSDB_CODE_DND_BNODE_READ_FILE_ERROR     TAOS_DEF_ERROR_CODE(0, 0x0453)
-#define TSDB_CODE_DND_BNODE_WRITE_FILE_ERROR    TAOS_DEF_ERROR_CODE(0, 0x0454)
 #define TSDB_CODE_DND_VNODE_ALREADY_DEPLOYED    TAOS_DEF_ERROR_CODE(0, 0x0460)
 #define TSDB_CODE_DND_VNODE_NOT_DEPLOYED        TAOS_DEF_ERROR_CODE(0, 0x0461)
 #define TSDB_CODE_DND_VNODE_INVALID_OPTION      TAOS_DEF_ERROR_CODE(0, 0x0462)

source/dnode/mgmt/bnode/inc/bmInt.h

@@ -31,10 +31,6 @@ typedef struct SBnodeMgmt {
   SDnodeWorker  writeWorker;
 } SBnodeMgmt;
 
-// bmFile.c
-int32_t bmReadFile(SBnodeMgmt *pMgmt, bool *pDeployed);
-int32_t bmWriteFile(SBnodeMgmt *pMgmt, bool deployed);
-
 // bmInt.c
 int32_t bmOpen(SMgmtWrapper *pWrapper);
 int32_t bmDrop(SMgmtWrapper *pWrapper);

source/dnode/mgmt/bnode/src/bmInt.c

@@ -21,7 +21,7 @@ static bool bmRequire(SMgmtWrapper *pWrapper) {
   mgmt.path = pWrapper->path;
 
   bool deployed = false;
-  (void)bmReadFile(&mgmt, &deployed);
+  (void)dndReadFile(pWrapper, &deployed);
 
   return deployed;
 }
@@ -51,7 +51,7 @@ static int32_t bmOpenImp(SBnodeMgmt *pMgmt) {
   }
 
   bool deployed = true;
-  if (bmWriteFile(pMgmt, deployed) != 0) {
+  if (dndWriteFile(pMgmt->pWrapper, deployed) != 0) {
     dError("failed to write bnode file since %s", terrstr());
     return -1;
   }
@@ -73,7 +73,7 @@ int32_t bmDrop(SMgmtWrapper *pWrapper) {
 
   dInfo("bnode-mgmt start to drop");
   bool deployed = false;
-  if (bmWriteFile(pMgmt, deployed) != 0) {
+  if (dndWriteFile(pWrapper, deployed) != 0) {
     dError("failed to drop bnode since %s", terrstr());
     return -1;
   }

source/dnode/mgmt/container/inc/dnd.h

@@ -168,6 +168,9 @@ int32_t dndWriteMsgToWorker(SDnodeWorker *pWorker, void *pCont, int32_t contLen)
 
 int32_t dndProcessNodeMsg(SDnode *pDnode, SNodeMsg *pMsg);
 
+int32_t dndReadFile(SMgmtWrapper *pWrapper, bool *pDeployed);
+int32_t dndWriteFile(SMgmtWrapper *pWrapper, bool deployed);
+
 #ifdef __cplusplus
 }
 #endif

source/dnode/mgmt/bnode/src/bmFile.c → source/dnode/mgmt/container/src/dndFile.c

@@ -14,10 +14,10 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "bmInt.h"
+#include "dndInt.h"
 
-int32_t bmReadFile(SBnodeMgmt *pMgmt, bool *pDeployed) {
-  int32_t   code = TSDB_CODE_DND_BNODE_READ_FILE_ERROR;
+int32_t dndReadFile(SMgmtWrapper *pWrapper, bool *pDeployed) {
+  int32_t   code = TSDB_CODE_NODE_READ_FILE_ERROR;
   int32_t   len = 0;
   int32_t   maxLen = 1024;
   char     *content = calloc(1, maxLen + 1);
@@ -25,7 +25,7 @@ int32_t bmReadFile(SBnodeMgmt *pMgmt, bool *pDeployed) {
   char      file[PATH_MAX];
   TdFilePtr pFile = NULL;
 
-  snprintf(file, sizeof(file), "%s%sbnode.json", pMgmt->path, TD_DIRSEP);
+  snprintf(file, sizeof(file), "%s%s%s.json", pWrapper->path, pWrapper->name, TD_DIRSEP);
   pFile = taosOpenFile(file, TD_FILE_READ);
   if (pFile == NULL) {
     dDebug("file %s not exist", file);
@@ -65,13 +65,13 @@ PRASE_BNODE_OVER:
   return code;
 }
 
-int32_t bmWriteFile(SBnodeMgmt *pMgmt, bool deployed) {
+int32_t dndWriteFile(SMgmtWrapper *pWrapper, bool deployed) {
   char file[PATH_MAX];
-  snprintf(file, sizeof(file), "%s%sbnode.json", pMgmt->path, TD_DIRSEP);
+  snprintf(file, sizeof(file), "%s%s%s.json", pWrapper->path, pWrapper->name, TD_DIRSEP);
 
   TdFilePtr pFile = taosOpenFile(file, TD_FILE_CTEATE | TD_FILE_WRITE | TD_FILE_TRUNC);
   if (pFile == NULL) {
-    terrno = TSDB_CODE_DND_BNODE_WRITE_FILE_ERROR;
+    terrno = TSDB_CODE_NODE_WRITE_FILE_ERROR;
     dError("failed to write %s since %s", file, terrstr());
     return -1;
   }
@@ -90,10 +90,10 @@ int32_t bmWriteFile(SBnodeMgmt *pMgmt, bool deployed) {
   free(content);
 
   char realfile[PATH_MAX];
-  snprintf(realfile, sizeof(realfile), "%s%sbnode.json", pMgmt->path, TD_DIRSEP);
+  snprintf(realfile, sizeof(realfile), "%s%s%s.json", pWrapper->path, pWrapper->name, TD_DIRSEP);
 
   if (taosRenameFile(file, realfile) != 0) {
-    terrno = TSDB_CODE_DND_BNODE_WRITE_FILE_ERROR;
+    terrno = TSDB_CODE_NODE_WRITE_FILE_ERROR;
     dError("failed to rename %s since %s", file, terrstr());
     return -1;
   }

source/util/src/terror.c

@@ -71,6 +71,8 @@ TAOS_DEFINE_ERROR(TSDB_CODE_RPC_INVALID_VERSION,          "Invalid app version")
 TAOS_DEFINE_ERROR(TSDB_CODE_COMPRESS_ERROR,               "Failed to compress msg")
 TAOS_DEFINE_ERROR(TSDB_CODE_NODE_ALREADY_DEPLOYED,        "Node already deployed")
 TAOS_DEFINE_ERROR(TSDB_CODE_NODE_NOT_DEPLOYED,            "Node not deployed")
+TAOS_DEFINE_ERROR(TSDB_CODE_NODE_READ_FILE_ERROR,         "Read node.json error")
+TAOS_DEFINE_ERROR(TSDB_CODE_NODE_WRITE_FILE_ERROR,        "Write node.json error")
 
 //common & util
 TAOS_DEFINE_ERROR(TSDB_CODE_OPS_NOT_SUPPORT,              "Operation not supported")
@@ -296,8 +298,6 @@ TAOS_DEFINE_ERROR(TSDB_CODE_DND_SNODE_WRITE_FILE_ERROR,   "Write snode.json erro
 TAOS_DEFINE_ERROR(TSDB_CODE_DND_BNODE_ALREADY_DEPLOYED,   "Bnode already deployed")
 TAOS_DEFINE_ERROR(TSDB_CODE_DND_BNODE_NOT_DEPLOYED,       "Bnode not deployed")
 TAOS_DEFINE_ERROR(TSDB_CODE_DND_BNODE_INVALID_OPTION,     "Bnode option invalid")
-TAOS_DEFINE_ERROR(TSDB_CODE_DND_BNODE_READ_FILE_ERROR,    "Read bnode.json error")
-TAOS_DEFINE_ERROR(TSDB_CODE_DND_BNODE_WRITE_FILE_ERROR,   "Write bnode.json error")
 TAOS_DEFINE_ERROR(TSDB_CODE_DND_VNODE_ALREADY_DEPLOYED,   "Vnode already deployed")
 TAOS_DEFINE_ERROR(TSDB_CODE_DND_VNODE_NOT_DEPLOYED,       "Vnode not deployed")
 TAOS_DEFINE_ERROR(TSDB_CODE_DND_VNODE_INVALID_OPTION,     "Vnode option invalid")