diff --git a/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h b/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h index 2a3d95363bf551d049f298a532f9a54a3eab7581..2b5b43def87ffe8dc74a4c860183355290c9cf73 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 1bac3e2dcff435bd9687cac8f87b3b39d4371f8a..27bab8677f7e713a93fcec37a963892fd703a0f6 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 4608b43851e8103709c85935aff0363676ecb38a..43748fb688aa00abd873a2fc0fd67620c55b0d5d 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;