diff --git a/src/system/lite/src/mgmtBalance.spec.c b/src/system/lite/src/mgmtBalance.spec.c index 7fbc863391a87d532297f09a02690a1e2aa8c3a8..91a93fd1d91d0b4df1b50a5d45382cbcc7900dfb 100644 --- a/src/system/lite/src/mgmtBalance.spec.c +++ b/src/system/lite/src/mgmtBalance.spec.c @@ -15,6 +15,7 @@ #define _DEFAULT_SOURCE #include "mgmtBalance.h" +#include "tstatus.h" void mgmtStartBalanceTimer(int mseconds) {} @@ -28,7 +29,7 @@ int mgmtAllocVnodes(SVgObj *pVgroup) { for (int i = 0; i < pDnode->numOfVnodes; i++) { int vnode = (i + pDnode->lastAllocVnode) % pDnode->numOfVnodes; - if (pDnode->vload[vnode].vgId == 0 && pDnode->vload[vnode].status == TSDB_VN_STATUS_READY) { + if (pDnode->vload[vnode].vgId == 0 && pDnode->vload[vnode].status == TSDB_VN_STATUS_OFFLINE) { selectedVnode = vnode; break; } diff --git a/src/system/lite/src/mgmtDnode.spec.c b/src/system/lite/src/mgmtDnode.spec.c index 84c33d7a6340a689fbe1639aa9695cf397c8a7e5..fa14dc1cb81130f5a4cee8f76db2ce2cc08f959d 100644 --- a/src/system/lite/src/mgmtDnode.spec.c +++ b/src/system/lite/src/mgmtDnode.spec.c @@ -15,6 +15,7 @@ #define _DEFAULT_SOURCE #include "mgmt.h" +#include "tstatus.h" SDnodeObj dnodeObj; extern uint32_t tsRebootTime; diff --git a/src/system/lite/src/mgmtDnodeInt.spec.c b/src/system/lite/src/mgmtDnodeInt.spec.c index f994cc63d0d0824dafb62e54ad0e99cbf4d8b0a7..b99815844d6fe4e2e50a0bb1d9d6a5f1bc5411af 100644 --- a/src/system/lite/src/mgmtDnodeInt.spec.c +++ b/src/system/lite/src/mgmtDnodeInt.spec.c @@ -23,6 +23,7 @@ #include "tutil.h" #include "vnode.h" #include "tsystem.h" +#include "tstatus.h" extern void *dmQhandle; void * mgmtStatusTimer = NULL; @@ -93,7 +94,7 @@ void mgmtProcessDnodeStatus(void *handle, void *tmrId) { SVnodeObj * pVnode = vnodeList + vnode; // wait vnode dropped - if (pVload->dropStatus == TSDB_VN_STATUS_DROPPING) { + if (pVload->dropStatus == TSDB_VN_DROP_STATUS_DROPPING) { if (vnodeList[vnode].cfg.maxSessions <= 0) { pVload->dropStatus = TSDB_VN_DROP_STATUS_READY; pVload->status = TSDB_VN_STATUS_OFFLINE; @@ -116,7 +117,7 @@ void mgmtProcessDnodeStatus(void *handle, void *tmrId) { SVgObj *pVgroup = mgmtGetVgroup(vgId); if (pVgroup == NULL) { mError("vgroup:%d is not there, but associated with vnode %d", vgId, vnode); - pVload->dropStatus = TSDB_VN_STATUS_DROPPING; + pVload->dropStatus = TSDB_VN_DROP_STATUS_DROPPING; continue; } @@ -126,9 +127,9 @@ void mgmtProcessDnodeStatus(void *handle, void *tmrId) { continue; } - if (pVload->vgId == 0 || pVload->dropStatus == TSDB_VN_STATUS_DROPPING) { + if (pVload->vgId == 0 || pVload->dropStatus == TSDB_VN_DROP_STATUS_DROPPING) { mError("vid:%d, mgmt not exist, drop it", vnode); - pVload->dropStatus = TSDB_VN_STATUS_DROPPING; + pVload->dropStatus = TSDB_VN_DROP_STATUS_DROPPING; } }