hcq/CM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!49 修复check_interval大于2小于5时资源状态为unknown的问题

Browse Source 
Merge pull request !49 from 薛蒙恩/check_inertval
This commit is contained in:
opengauss-bot
2022-08-19 01:25:53 +00:00
committed by Gitee
parent efaf2f6357 8d04578cb9
commit 36cebbc7ab
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cm_agent/cma_status_check.cpp
View File

@ -1438,17 +1438,21 @@ static void CheckOneResInstStatus(const CmResConfList *resConf, CmResourceStatus
static void DoCheckResourceStatus(CmResConfList *resConf, CmResourceStatus *resStat) static void DoCheckResourceStatus(CmResConfList *resConf, CmResourceStatus *resStat)
{ {
static uint32 lastResStatus = 0;
long currTime = time(NULL); long currTime = time(NULL);
if (resConf->checkInfo.checkTime == 0) { if (resConf->checkInfo.checkTime == 0) {
CheckOneResInstStatus(resConf, resStat, resConf->checkInfo.timeOut); CheckOneResInstStatus(resConf, resStat, resConf->checkInfo.timeOut);
lastResStatus = resStat->status;
resConf->checkInfo.checkTime = currTime; resConf->checkInfo.checkTime = currTime;
return; return;
} }
if((currTime - resConf->checkInfo.checkTime) < resConf->checkInfo.checkInterval) { if((currTime - resConf->checkInfo.checkTime) < resConf->checkInfo.checkInterval) {
resStat->status = lastResStatus;
return; return;
} }
CheckOneResInstStatus(resConf, resStat, resConf->checkInfo.timeOut); CheckOneResInstStatus(resConf, resStat, resConf->checkInfo.timeOut);
resConf->checkInfo.checkTime = currTime; resConf->checkInfo.checkTime = currTime;
lastResStatus = resStat->status;
} }
void CheckResourceState(OneNodeResourceStatus *nodeStat) void CheckResourceState(OneNodeResourceStatus *nodeStat)