diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c index d25b2dde53b4456c0127a3a340c6a0e334451712..1b93096b4569bc152507f12bb434a182826a063d 100644 --- a/src/client/src/tscServer.c +++ b/src/client/src/tscServer.c @@ -1400,7 +1400,7 @@ void tscUpdateVnodeInSubmitMsg(SSqlObj *pSql, char *buf) { pShellMsg = (SShellSubmitMsg *)pMsg; pShellMsg->vnode = htons(pMeterMeta->vpeerDesc[pSql->index].vnode); - tscTrace("%p update submit msg vnode:%d", pSql, htons(pShellMsg->vnode)); + tscTrace("%p update submit msg vnode:%s:%d", pSql, taosIpStr(pMeterMeta->vpeerDesc[pSql->index].ip), htons(pShellMsg->vnode)); } int tscBuildSubmitMsg(SSqlObj *pSql) { @@ -1421,7 +1421,7 @@ int tscBuildSubmitMsg(SSqlObj *pSql) { // pSql->cmd.payloadLen is set during parse sql routine, so we do not use it here pSql->cmd.msgType = TSDB_MSG_TYPE_SUBMIT; - tscTrace("%p update submit msg vnode:%d", pSql, htons(pShellMsg->vnode)); + tscTrace("%p update submit msg vnode:%s:%d", pSql, taosIpStr(pMeterMeta->vpeerDesc[pMeterMeta->index].ip), htons(pShellMsg->vnode)); return msgLen; } diff --git a/src/system/detail/src/mgmtConn.c b/src/system/detail/src/mgmtConn.c index 13275300a6f2cc024b17a48346fcb148ec85e1f5..b440a1042e30756f50481f63afb5d82c37c5afc7 100644 --- a/src/system/detail/src/mgmtConn.c +++ b/src/system/detail/src/mgmtConn.c @@ -48,7 +48,7 @@ int mgmtGetConns(SShowObj *pShow, SConnObj *pConn) { pConn = pAcct->pConn; SConnInfo *pConnInfo = pConnShow->connInfo; - while (pConn) { + while (pConn && pConn->pUser) { strcpy(pConnInfo->user, pConn->pUser->user); pConnInfo->ip = pConn->ip; pConnInfo->port = pConn->port; diff --git a/src/system/detail/src/mgmtVgroup.c b/src/system/detail/src/mgmtVgroup.c index e3bed57b33a8a9bc1f38d8c3ee761f70ee4ebc85..6efe9d666044a0ef2675d27ac741632ff821561f 100644 --- a/src/system/detail/src/mgmtVgroup.c +++ b/src/system/detail/src/mgmtVgroup.c @@ -40,6 +40,7 @@ void *mgmtVgroupActionAfterBatchUpdate(void *row, char *str, int size, int *ssiz void *mgmtVgroupActionReset(void *row, char *str, int size, int *ssize); void *mgmtVgroupActionDestroy(void *row, char *str, int size, int *ssize); bool mgmtCheckVnodeReady(SDnodeObj *pDnode, SVgObj *pVgroup, SVnodeGid *pVnode); +char *mgmtGetVnodeStatus(SVgObj *pVgroup, SVnodeGid *pVnode); void mgmtVgroupActionInit() { mgmtVgroupActionFp[SDB_TYPE_INSERT] = mgmtVgroupActionInsert; @@ -328,8 +329,8 @@ int mgmtRetrieveVgroups(SShowObj *pShow, char *data, int rows, SConnObj *pConn) pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; if (pVgroup->vnodeGid[i].ip != 0) { - bool ready = mgmtCheckVnodeReady(NULL, pVgroup, pVgroup->vnodeGid + i); - strcpy(pWrite, ready ? "ready" : "unsynced"); + char *vnodeStatus = mgmtGetVnodeStatus(pVgroup, pVgroup->vnodeGid + i); + strcpy(pWrite, vnodeStatus); } else { strcpy(pWrite, "null"); } diff --git a/src/system/lite/src/mgmtBalance.spec.c b/src/system/lite/src/mgmtBalance.spec.c index 3d2f10dcbbc45e21ec0195067797d7dd439e4e94..33fe4502a4ae6451905106f55b580f69164abdb4 100644 --- a/src/system/lite/src/mgmtBalance.spec.c +++ b/src/system/lite/src/mgmtBalance.spec.c @@ -52,6 +52,8 @@ bool mgmtCheckModuleInDnode(SDnodeObj *pDnode, int moduleType) { return tsModule[moduleType].num != 0; } +char *mgmtGetVnodeStatus(SVgObj *pVgroup, SVnodeGid *pVnode) { return "master"; } + bool mgmtCheckVnodeReady(SDnodeObj *pDnode, SVgObj *pVgroup, SVnodeGid *pVnode) { return true; } void mgmtUpdateDnodeState(SDnodeObj *pDnode, int lbStatus) {}