xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: report service status

This commit is contained in:
Shengliang Guan 2022-04-19 21:53:16 +08:00
parent b66718a4d8
commit 2702903e94
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/dnode/mgmt/interface/src/dmInt.c
View File

@ -157,10 +157,10 @@ static void dmGetServerStatus(SDnode *pDnode, SServerStatusRsp *pStatus) {
pStatus->statusCode = TSDB_SRV_STATUS_EXTING; pStatus->statusCode = TSDB_SRV_STATUS_EXTING;
} else { } else {
SDnodeData *pData = &pDnode->data; SDnodeData *pData = &pDnode->data;
if (pData->isMnode && pData->mndState != TAOS_SYNC_STATE_FOLLOWER && pData->mndState != TAOS_SYNC_STATE_FOLLOWER) { if (pData->isMnode && pData->mndState != TAOS_SYNC_STATE_LEADER && pData->mndState == TAOS_SYNC_STATE_FOLLOWER) {
pStatus->statusCode = TSDB_SRV_STATUS_SERVICE_DEGRADED; pStatus->statusCode = TSDB_SRV_STATUS_SERVICE_DEGRADED;
snprintf(pStatus->details, sizeof(pStatus->details), "mnode sync state is %s", syncStr(pData->mndState)); snprintf(pStatus->details, sizeof(pStatus->details), "mnode sync state is %s", syncStr(pData->mndState));
} else if (pData->unsyncedVgId != 0 && pData->vndState != TAOS_SYNC_STATE_FOLLOWER && } else if (pData->unsyncedVgId != 0 && pData->vndState != TAOS_SYNC_STATE_LEADER &&
pData->vndState != TAOS_SYNC_STATE_FOLLOWER) { pData->vndState != TAOS_SYNC_STATE_FOLLOWER) {
pStatus->statusCode = TSDB_SRV_STATUS_SERVICE_DEGRADED; pStatus->statusCode = TSDB_SRV_STATUS_SERVICE_DEGRADED;
snprintf(pStatus->details, sizeof(pStatus->details), "vnode:%d sync state is %s", pData->unsyncedVgId, snprintf(pStatus->details, sizeof(pStatus->details), "vnode:%d sync state is %s", pData->unsyncedVgId,

8
tools/shell/src/shellMain.c
View File

@ -633,7 +633,7 @@ void shellCheckServerStatus() {
printf("2: service ok\n"); printf("2: service ok\n");
break; break;
case TSDB_SRV_STATUS_SERVICE_DEGRADED: case TSDB_SRV_STATUS_SERVICE_DEGRADED:
printf("3: service degradedk\n"); printf("3: service degraded\n");
break; break;
case TSDB_SRV_STATUS_EXTING: case TSDB_SRV_STATUS_EXTING:
printf("4: exiting\n"); printf("4: exiting\n");
@ -642,10 +642,12 @@ void shellCheckServerStatus() {
if (strlen(details) != 0) { if (strlen(details) != 0) {
printf("%s\n\n", details); printf("%s\n\n", details);
} }
if (code == TSDB_SRV_STATUS_NETWORK_OK) { if (code == TSDB_SRV_STATUS_NETWORK_OK && args.verbose) {
taosMsleep(1000); taosMsleep(1000);
} else {
break;
} }
} while (code == TSDB_SRV_STATUS_NETWORK_OK); } while (1);
exitShell(); exitShell();
} }