From 8b16f4b118840e9a19a6aac49e0a5cc63c0e9ca3 Mon Sep 17 00:00:00 2001 From: cadem Date: Wed, 19 Apr 2023 18:02:04 +0800 Subject: [PATCH] config compitible --- source/dnode/vnode/src/vnd/vnodeCfg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source/dnode/vnode/src/vnd/vnodeCfg.c b/source/dnode/vnode/src/vnd/vnodeCfg.c index 7d7a76556c..65f32b0a85 100644 --- a/source/dnode/vnode/src/vnd/vnodeCfg.c +++ b/source/dnode/vnode/src/vnd/vnodeCfg.c @@ -277,6 +277,9 @@ int vnodeDecodeConfig(const SJson *pJson, void *pObj) { SJson *nodeInfo = tjsonGetObjectItem(pJson, "syncCfg.nodeInfo"); int arraySize = tjsonGetArraySize(nodeInfo); + if(pCfg->syncCfg.totalReplicaNum == 0 && pCfg->syncCfg.replicaNum > 0){ + pCfg->syncCfg.totalReplicaNum = pCfg->syncCfg.replicaNum; + } if (arraySize != pCfg->syncCfg.totalReplicaNum) return -1; vDebug("vgId:%d, decode config, replicas:%d totalReplicas:%d selfIndex:%d", pCfg->vgId, pCfg->syncCfg.replicaNum, @@ -292,9 +295,10 @@ int vnodeDecodeConfig(const SJson *pJson, void *pObj) { if (code < 0) return -1; tjsonGetNumberValue(info, "clusterId", pNode->clusterId, code); if (code < 0) return -1; - char role[10]; + char role[10] = {0}; code = tjsonGetStringValue(info, "nodeRole", role); - if(code > 0){ + if (code < 0) return -1; + if(strlen(role) != 0){ pNode->nodeRole = vnodeStrToRole(role); } else{