From 893fb646d572ec3b71b24847f467738ce8c296a4 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 16 May 2022 09:40:13 +0800
Subject: [PATCH] refactor: enable multi-process mode

---
 source/dnode/mgmt/node_mgmt/inc/dmMgmt.h  | 6 +++---
 source/dnode/mgmt/node_mgmt/src/dmMgmt.c  | 2 +-
 source/dnode/mgmt/node_mgmt/src/dmNodes.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h b/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h
index 2a3d95363b..2b5b43def8 100644
--- a/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h
+++ b/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h
@@ -34,7 +34,7 @@ typedef struct SMgmtWrapper SMgmtWrapper;
 #define OnlyInSingleProc(ptype) (ptype == SINGLE_PROC)
 #define OnlyInChildProc(ptype)  (ptype == CHILD_PROC)
 #define OnlyInParentProc(ptype) (ptype == PARENT_PROC)
-#define OnlyInTestProc(ptype)   (ptype & TEST_PROC)
+#define OnlyInTestProc(ptype)   (ptype == TEST_PROC)
 #define InChildProc(ptype)      (ptype & CHILD_PROC)
 #define InParentProc(ptype)     (ptype & PARENT_PROC)
 
@@ -60,7 +60,7 @@ typedef struct {
   TdThread      cthread;
   SShm          shm;
   int32_t       pid;
-  int8_t        ptype;
+  EDndProcType  ptype;
   bool          stop;
 } SProc;
 
@@ -110,7 +110,7 @@ typedef struct SUdfdData {
 } SUdfdData;
 
 typedef struct SDnode {
-  int8_t        ptype;
+  EDndProcType  ptype;
   EDndNodeType  rtype;
   EDndEvent     event;
   EDndRunStatus status;
diff --git a/source/dnode/mgmt/node_mgmt/src/dmMgmt.c b/source/dnode/mgmt/node_mgmt/src/dmMgmt.c
index 1bac3e2dcf..27bab8677f 100644
--- a/source/dnode/mgmt/node_mgmt/src/dmMgmt.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmMgmt.c
@@ -267,7 +267,7 @@ int32_t dmMarkWrapper(SMgmtWrapper *pWrapper) {
   int32_t code = 0;
 
   taosRLockLatch(&pWrapper->latch);
-  if (pWrapper->deployed /* || (OnlyInParentProc(pWrapper->proc.ptype) && pWrapper->required) */) {
+  if (pWrapper->deployed || (InParentProc(pWrapper->proc.ptype) && pWrapper->required)) {
     int32_t refCount = atomic_add_fetch_32(&pWrapper->refCount, 1);
     dTrace("node:%s, is marked, ref:%d", pWrapper->name, refCount);
   } else {
diff --git a/source/dnode/mgmt/node_mgmt/src/dmNodes.c b/source/dnode/mgmt/node_mgmt/src/dmNodes.c
index 4608b43851..43748fb688 100644
--- a/source/dnode/mgmt/node_mgmt/src/dmNodes.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmNodes.c
@@ -96,7 +96,7 @@ int32_t dmOpenNode(SMgmtWrapper *pWrapper) {
       return -1;
     }
 
-    if (!OnlyInTestProc(pWrapper->proc.ptype)) {
+    if (OnlyInParentProc(pWrapper->proc.ptype)) {
       if (dmInitProc(pWrapper) != 0) {
         dError("node:%s, failed to init proc since %s", pWrapper->name, terrstr());
         return -1;
-- 
GitLab