From 5340c96a089b36161e1491f6a35ec140811bf6f8 Mon Sep 17 00:00:00 2001 From: xue_meng_en <1836611252@qq.com> Date: Wed, 7 Dec 2022 19:12:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=83=B5=E6=AD=BB=E5=90=8E?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=99=E6=80=81=E4=B8=BB=E7=9A=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/cm_server/cms_global_params.cpp | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/cm_server/cms_global_params.cpp b/src/cm_server/cms_global_params.cpp index fc16549..fc05af8 100644 --- a/src/cm_server/cms_global_params.cpp +++ b/src/cm_server/cms_global_params.cpp @@ -1028,24 +1028,6 @@ static void ReportAlarmAndSendRestart( (void)RespondMsg(recvMsgInfo, 'S', (const char *)&restartMsg, sizeof(cm_to_agent_restart)); } -static void CheckLocalDnIsPrimaryAndChangePrimaryIdx(uint32 groupIdx, int32 memIdx, int32 oMemIdx) -{ - if (oMemIdx == -1) { - return; - } - cm_instance_datanode_report_status *dnReport = - g_instance_group_report_status_ptr[groupIdx].instance_status.data_node_member; - cm_instance_datanode_report_status *curRep = &(dnReport[memIdx]); - if (curRep->local_status.local_role == INSTANCE_ROLE_PRIMARY && - g_instance_role_group_ptr[groupIdx].instanceMember[memIdx].role == INSTANCE_ROLE_PRIMARY && - dnReport[oMemIdx].phony_dead_times == 0) { - if (!g_multi_az_cluster || (g_instance_group_report_status_ptr[groupIdx].instance_status.term <= - dnReport[oMemIdx].local_status.term)) { - ChangeDnPrimaryMemberIndex(groupIdx, oMemIdx); - } - } -} - static void RestInstDynamicRoleToUnkown(int32 *localRole, int32 phonyDeadTimes, uint32 instd, int32 instType) { if (phonyDeadTimes >= phony_dead_effective_time && (*localRole == INSTANCE_ROLE_PRIMARY)) { @@ -1128,7 +1110,6 @@ static void DealDnPhonyDead(MsgRecvInfo* recvMsgInfo, uint32 groupIdx, int32 mem return; } ReportAlarmAndSendRestart(recvMsgInfo, groupIdx, memIdx, otherMemIdx, INSTANCE_TYPE_DATANODE); - CheckLocalDnIsPrimaryAndChangePrimaryIdx(groupIdx, memIdx, otherMemIdx); } } -- Gitee