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

!155 5.0.1回合-资源池化相关bugfix

Browse Source 
Merge pull request !155 from 张翱/5.0.0
This commit is contained in:
opengauss_bot 2023-10-12 09:39:56 +00:00 committed by Gitee
commit 6c460b45ca
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 58 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cm_agent/cma_instance_management_res.cpp
View File

@ -393,14 +393,12 @@ static void ProcessAbnormalInstance(CmResConfList *conf)
write_runlog(LOG, "res(%s) inst(%u) has been abnormal (%d)s, >= timeout(%d)s, need restart.\n",
conf->resName, conf->cmInstanceId, duration, conf->checkInfo.abnormalTimeout);
RestartOneResInst(conf);
conf->checkInfo.startCount++;
conf->checkInfo.startTime = curTime;
if (conf->checkInfo.restartTimes != -1) {
write_runlog(LOG, "res(%s) inst(%u) has been restart (%d) times, restart more (%d) time will manually stop.\n",
conf->resName, conf->cmInstanceId, conf->checkInfo.startCount, conf->checkInfo.restartTimes);
if (CleanOneResInst(conf) == CM_SUCCESS) {
write_runlog(LOG, "res(%s) inst(%u) clean abnormal time.\n", conf->resName, conf->cmInstanceId);
} else {
conf->checkInfo.startCount++;
}
conf->checkInfo.startTime = curTime;
}
static inline bool NeedStopResInst(const char *resName, uint32 cmInstId)

89
src/cm_agent/cma_mes.cpp
View File

@ -20,9 +20,9 @@
*
* -------------------------------------------------------------------------
*/
#include "cma_mes.h"
#include "mes_interface.h"
#include "mes.h"
#include "cm_debug.h"
#include "cm_config.h"
#include "cm_elog.h"
@ -37,6 +37,14 @@
#define AGENT_RHB_BUFF_POOL_SIZE (1024)
#define AGENT_RHB_CHECK_SID (0)
typedef struct CmaMesMsgHeadT {
uint32 version;
uint32 cmd; // command
char reserved[64];
uint32 bufSize;
char buf[0];
} CmaMesMsgHead; // total size is 76
static pthread_t g_rhbThread;
static const uint32 PASSWD_MAX_LEN = 64;
@ -122,10 +130,6 @@ static void InitTaskCmdGroup(mes_profile_t *pf)
pf->task_group[MES_TASK_GROUP_ONE] = 0;
pf->task_group[MES_TASK_GROUP_TWO] = 0;
pf->task_group[MES_TASK_GROUP_THREE] = 0;
for (uint8 i = (uint8)RHB_MSG_BEGIN; i < (uint8)RHB_MSG_CEIL; i++) {
mes_set_command_task_group(i, MES_TASK_GROUP_ZERO);
}
}
static void InitBuffPool(mes_profile_t *pf)
@ -147,7 +151,7 @@ static void initPfile(mes_profile_t *pf, const RhbCtx *ctx)
pf->mes_elapsed_switch = 0;
pf->inst_cnt = ctx->instCount;
error_t rc = memcpy_s(
errno_t rc = memcpy_s(
pf->inst_net_addr, sizeof(mes_addr_t) * MES_MAX_INSTANCES, ctx->instAddrs, sizeof(mes_addr_t) * MAX_RHB_NUM);
securec_check_errno(rc, (void)rc);
@ -218,7 +222,7 @@ static void LogCallBack(int logType, int logLevel, const char *codeFileName, uns
va_end(ap);
}
typedef void (*CmMesMsgProc)(mes_message_t *mgs);
typedef void (*CmMesMsgProc)(mes_msg_t *mgs);
typedef struct ProcessorFunc_ {
RhbMsgCmd cmd;
@ -242,35 +246,42 @@ void GetHbs(time_t *hbs, unsigned int *hwl)
securec_check_errno(rc, (void)rc);
}
void CmaHdlRhbReq(mes_message_t *msg)
void CmaHdlRhbReq(mes_msg_t *msg)
{
write_runlog(DEBUG1, "[RHB] receive a hb msg from inst[%hhu]!\n", msg->head->src_inst);
if (msg->head->src_inst < g_curNodeHb.hwl) {
g_curNodeHb.hbs[msg->head->src_inst] = time(NULL);
write_runlog(DEBUG1, "[RHB] receive a hb msg from inst[%hhu]!\n", msg->src_inst);
if (msg->src_inst < g_curNodeHb.hwl) {
g_curNodeHb.hbs[msg->src_inst] = time(NULL);
}
}
void CmaHdlRhbAck(mes_message_t *msg)
{
mes_notify_broadcast_msg_recv_and_release(msg);
}
static const ProcessorFunc g_processors[RHB_MSG_CEIL] = {
{RHB_MSG_HB_BC, CmaHdlRhbReq, CM_FALSE, "handle cma rhb broadcast message"},
};
void MesMsgProc(uint32 workThread, mes_message_t *msg)
void MesMsgProc(unsigned int work_idx, ruid_type ruid, mes_msg_t *msg)
{
mes_message_head_t *head = msg->head;
if (head->cmd >= (uint8)RHB_MSG_CEIL) {
write_runlog(ERROR, "unknow cmd(%hhu) from inst:[%hhu], size:[%hu]!\n", head->cmd, head->src_inst, head->size);
return;
}
do {
if (msg == NULL || msg->buffer == NULL) {
write_runlog(ERROR, "invaild msg, when msg or buffer is null.\n");
break;
}
if (msg->size < sizeof(CmaMesMsgHead)) {
write_runlog(ERROR, "unknown msg head from inst:[%u], size:[%u].\n", msg->src_inst, msg->size);
break;
}
const ProcessorFunc *processor = &g_processors[head->cmd];
CmaMesMsgHead *head = (CmaMesMsgHead *)msg->buffer;
if (head->cmd >= (uint32)RHB_MSG_CEIL) {
write_runlog(ERROR, "unknow cmd(%hhu) from inst:[%hhu], size:[%hu]!\n",
head->cmd, msg->src_inst, head->bufSize);
break;
}
processor->proc(msg);
mes_release_message_buf(msg);
const ProcessorFunc *processor = &g_processors[head->cmd];
CM_ASSERT(processor->proc != NULL);
processor->proc(msg);
} while (0);
mes_release_msg(msg);
}
status_t CmaRhbInit(const RhbCtx *ctx)
@ -314,10 +325,6 @@ status_t CmaRhbInit(const RhbCtx *ctx)
write_runlog(WARNING, "mes ssl not enable!.\n");
}
for (uint32 i = (uint32)RHB_MSG_BEGIN; i < (uint32)RHB_MSG_CEIL; i++) {
mes_set_msg_enqueue((uint32)g_processors[i].cmd, (uint32)g_processors[i].isEnqueue);
}
status_t ret = (status_t)mes_init(&pf);
if (ret != CM_SUCCESS) {
write_runlog(ERROR, "mes init failed!.\n");
@ -328,10 +335,11 @@ status_t CmaRhbInit(const RhbCtx *ctx)
return CM_SUCCESS;
}
static void InitMsgHead(mes_message_head_t *head, const RhbCtx *ctx)
static void InitMsgHead(CmaMesMsgHead *head, const RhbCtx *ctx)
{
MES_INIT_MESSAGE_HEAD(head, RHB_MSG_HB_BC, 0, ctx->instId, 0, ctx->sid, 0xFFFF);
head->size = sizeof(mes_message_head_t);
head->version = 0;
head->cmd = (uint32)RHB_MSG_HB_BC;
head->bufSize = 0;
}
static void checkMesSslCertExpire()
@ -369,11 +377,9 @@ void *CmaRhbMain(void *args)
(void)atexit(CmaRhbUnInit);
write_runlog(LOG, "RHB check is ready to work!\n");
mes_message_head_t head = {0};
CmaMesMsgHead head = {0};
InitMsgHead(&head, &ctx);
uint64 succInsts = 0;
uint64 bcInsts = ctx.instMap & (~((uint64)0x1 << (ctx.instId)));
int32 ret = 0;
int itv = 0;
struct timespec curTime = {0, 0};
struct timespec lastTime = {0, 0};
@ -391,12 +397,9 @@ void *CmaRhbMain(void *args)
}
write_runlog(DEBUG1, "RHB broadcast hb to all nodes.!\n");
mes_broadcast(ctx.sid, bcInsts, &head, &succInsts);
if (bcInsts != succInsts) {
write_runlog(DEBUG1,
"bc not all success, send idx:[%llu], success status:[%llu]!\n",
(long long unsigned int)bcInsts,
(long long unsigned int)succInsts);
ret = mes_broadcast(0, (char*)&head, sizeof(CmaMesMsgHead));
if (ret != 0) {
write_runlog(DEBUG1, "bc not all success, ret=%d.\n", ret);
}
const int printItv = 5;

14
src/cm_ctl/ctl_res_check.cpp
View File

@ -146,7 +146,7 @@ static status_t CheckResNumberOptInfo(cJSON *resItem, const char *resName, const
cJSON *objValue = cJSON_GetObjectItem(resItem, checkKey);
CM_RETERR_IF_FALSE(CmCheckIsJsonNumber(objValue, resName, checkKey, WARNING));
if (!IsResConfValid(checkKey, objValue->valueint)) {
PrintCheckJsonInfo(WARNING, "resource(%s)'s %s=%d out of range, range[%u %u], default(%s).\n",
PrintCheckJsonInfo(WARNING, "resource(%s)'s %s=%d out of range, range[%d %d], default(%s).\n",
resName, checkKey, objValue->valueint,
ResConfMinValue(checkKey), ResConfMaxValue(checkKey), ResConfDefValue(checkKey));
return CM_ERROR;
@ -353,7 +353,7 @@ static status_t CheckAndGetNumberFromJson(cJSON *resItem, const char *resName, c
CM_RETERR_IF_FALSE(CmCheckIsJsonNumber(objValue, resName, checkKey, ERROR));
if (!IsResConfValid(checkKey, objValue->valueint)) {
PrintCheckJsonInfo(ERROR, "resource(%s)'s %s=%d out of range, range[%u %u].\n", resName, checkKey,
PrintCheckJsonInfo(ERROR, "resource(%s)'s %s=%d out of range, range[%d %d].\n", resName, checkKey,
objValue->valueint, ResConfMinValue(checkKey), ResConfMaxValue(checkKey));
return CM_ERROR;
}
@ -463,13 +463,13 @@ static void GetAllRestypeStr(char *typeStr, uint32 maxlen)
uint32 arrLen = (uint32)(sizeof(g_resTypeMap) / sizeof(g_resTypeMap[0]));
char tmpStr[MAX_PATH_LEN] = {0};
for (uint32 i = 0; i < arrLen; ++i) {
if (g_resTypeMap[i].type == RES_TYPE_UNKNOWN) {
if (g_resTypeMap[i].type == RES_TYPE_INIT || g_resTypeMap[i].type == RES_TYPE_UNKNOWN) {
continue;
}
if (strlen(typeStr) + strlen(g_resTypeMap[i].typeStr) >= maxlen) {
return;
}
if (i == 0) {
if (typeStr[0] == '\0') {
rc = snprintf_s(tmpStr, MAX_PATH_LEN, MAX_PATH_LEN - 1, "\"%s\"", g_resTypeMap[i].typeStr);
} else {
rc = snprintf_s(tmpStr, MAX_PATH_LEN, MAX_PATH_LEN - 1, ", \"%s\"", g_resTypeMap[i].typeStr);
@ -517,7 +517,7 @@ static uint32 GetResTypeIndex(cJSON *resItem, const char *resName)
{
cJSON *objValue = cJSON_GetObjectItem(resItem, RESOURCE_TYPE);
if (!CmCheckIsJsonString(objValue, resName, RESOURCE_TYPE, WARNING)) {
return 0;
return RES_TYPE_UNKNOWN;
}
uint32 index = 0;
@ -527,8 +527,8 @@ static uint32 GetResTypeIndex(cJSON *resItem, const char *resName)
char allResName[MAX_PATH_LEN] = {0};
GetAllRestypeStr(allResName, MAX_PATH_LEN);
PrintCheckJsonInfo(WARNING, "resource(%s)'s resources_type is (%s), not in range(%s), default(%s).\n",
resName, objValue->string, allResName, ResConfDefValue(RESOURCE_TYPE));
return 0;
resName, objValue->valuestring, allResName, ResConfDefValue(RESOURCE_TYPE));
return RES_TYPE_UNKNOWN;
}
ResType GetResTypeFromCjson(cJSON *resItem)