diff --git a/src/cm_server/cms_global_params.cpp b/src/cm_server/cms_global_params.cpp index fc165491507bd2cecf414ca7b146e058ca770a7d..fc05af8ba670be558c04fb187501d745b31e4b6c 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); } }