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

!38 磁盘检测执行guc命令失败不修改集群状态

Browse Source 
Merge pull request !38 from 薛蒙恩/readonly
This commit is contained in:
opengauss-bot
2022-06-27 06:02:27 +00:00
committed by Gitee
parent 81b618e1b7 41b5267c26
commit 710ba920bf
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cm_server/cms_ddb.cpp
View File

@ -1921,6 +1921,7 @@ status_t SetNodeReadOnlyStatusToDdb(const char* bitsString, int logLevel)
{ {
char keyOfReadOnlyStatus[MAX_PATH_LEN] = {0}; char keyOfReadOnlyStatus[MAX_PATH_LEN] = {0};
char valueOfReadOnlyStatus[MAX_PATH_LEN] = {0}; char valueOfReadOnlyStatus[MAX_PATH_LEN] = {0};
char valueOfReadOnlyStatusOld[MAX_PATH_LEN] = {0};
if (bitsString == NULL) { if (bitsString == NULL) {
write_runlog(ERROR, "[%s][line:%d] bitsString is null!\n", __FUNCTION__, __LINE__); write_runlog(ERROR, "[%s][line:%d] bitsString is null!\n", __FUNCTION__, __LINE__);
@ -1932,10 +1933,25 @@ status_t SetNodeReadOnlyStatusToDdb(const char* bitsString, int logLevel)
securec_check_intval(rci, (void)rci); securec_check_intval(rci, (void)rci);
Bin2Hex(bitsString, valueOfReadOnlyStatus, strlen(bitsString)); Bin2Hex(bitsString, valueOfReadOnlyStatus, strlen(bitsString));
DDB_RESULT ddbResult = SUCCESS_GET_VALUE;
status_t st = GetKVFromDDb(keyOfReadOnlyStatus, MAX_PATH_LEN, valueOfReadOnlyStatusOld, MAX_PATH_LEN, &ddbResult);
if (st != CM_SUCCESS) {
// get kv only for log level, we should continue even got error.
int logLvl = (ddbResult == CAN_NOT_FIND_THE_KEY) ? LOG : ERROR;
write_runlog(logLvl, "failed to get value with key(%s).\n", keyOfReadOnlyStatus);
} else {
if (strcmp(valueOfReadOnlyStatusOld, valueOfReadOnlyStatus) != 0) {
logLevel = LOG;
write_runlog(logLevel, "[%s][line:%d] valueOfReadOnlyStatus in ddb is:%s\n",
__FUNCTION__, __LINE__, valueOfReadOnlyStatusOld);
}
}
write_runlog(logLevel, "[%s][line:%d] bitsString:%s, valueOfReadOnlyStatus:%s, strlen(bitsString):%lu\n", write_runlog(logLevel, "[%s][line:%d] bitsString:%s, valueOfReadOnlyStatus:%s, strlen(bitsString):%lu\n",
__FUNCTION__, __LINE__, bitsString, valueOfReadOnlyStatus, strlen(bitsString)); __FUNCTION__, __LINE__, bitsString, valueOfReadOnlyStatus, strlen(bitsString));
status_t st = SetKV2Ddb(keyOfReadOnlyStatus, MAX_PATH_LEN, valueOfReadOnlyStatus, MAX_PATH_LEN, NULL); st = SetKV2Ddb(keyOfReadOnlyStatus, MAX_PATH_LEN, valueOfReadOnlyStatus, MAX_PATH_LEN, NULL);
if (st != CM_SUCCESS) { if (st != CM_SUCCESS) {
write_runlog(ERROR, write_runlog(ERROR,
"[%s][line:%d]: ddb set failed. key = %s, readonly = %s.\n", "[%s][line:%d]: ddb set failed. key = %s, readonly = %s.\n",

18
src/cm_server/cms_disk_check.cpp
View File

@ -150,12 +150,13 @@ void SaveNodeReadOnlyConfig(int logLevel)
__FUNCTION__, __LINE__, instanceName, alarmIndex); __FUNCTION__, __LINE__, instanceName, alarmIndex);
ReportReadOnlyAlarm(ALM_AT_Resume, instanceName, alarmIndex++); ReportReadOnlyAlarm(ALM_AT_Resume, instanceName, alarmIndex++);
} }
g_dynamicNodeReadOnlyInfo[i].coordinateNode.lastReadOnly = cnCurrReadOnly;
g_dynamicNodeReadOnlyInfo[i].coordinateNode.currReadOnly = READONLY_OFF;
} else { } else {
write_runlog(WARNING, "[%s][line:%d] CN command:[%s] failed, errno=%d.\n", __FUNCTION__, __LINE__, write_runlog(WARNING,
command, errno); "[%s][line:%d] CN command:[%s] failed, rc=%d, errno=%d.\n",
__FUNCTION__, __LINE__, command, rc, errno);
} }
g_dynamicNodeReadOnlyInfo[i].coordinateNode.lastReadOnly = cnCurrReadOnly;
g_dynamicNodeReadOnlyInfo[i].coordinateNode.currReadOnly = READONLY_OFF;
} else { } else {
alarmIndex++; alarmIndex++;
} }
@ -206,12 +207,13 @@ void SaveNodeReadOnlyConfig(int logLevel)
__FUNCTION__, __LINE__, instanceName, alarmIndex); __FUNCTION__, __LINE__, instanceName, alarmIndex);
ReportReadOnlyAlarm(ALM_AT_Resume, instanceName, alarmIndex++); ReportReadOnlyAlarm(ALM_AT_Resume, instanceName, alarmIndex++);
} }
g_dynamicNodeReadOnlyInfo[i].dataNode[j].lastReadOnly = dnCurrReadOnly;
g_dynamicNodeReadOnlyInfo[i].dataNode[j].currReadOnly = READONLY_OFF;
} else { } else {
write_runlog(WARNING, "[%s][line:%d] DN command:[%s] failed, errno=%d.\n", __FUNCTION__, __LINE__, write_runlog(WARNING,
command, errno); "[%s][line:%d] DN command:[%s] failed, rc=%d, errno=%d.\n",
__FUNCTION__, __LINE__, command, rc, errno);
} }
g_dynamicNodeReadOnlyInfo[i].dataNode[j].lastReadOnly = dnCurrReadOnly;
g_dynamicNodeReadOnlyInfo[i].dataNode[j].currReadOnly = READONLY_OFF;
} else { } else {
alarmIndex++; alarmIndex++;
} }