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

[Arb] the number of members in initial_member_list can be odd number

Browse Source
This commit is contained in:
BinChenn
2023-06-02 07:12:19 +00:00
committed by ob-robot
parent 75673b4261
commit d65d18cf69
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/logservice/palf/log_config_mgr.cpp
View File

@ -239,7 +239,7 @@ int LogConfigMgr::set_initial_member_list(const common::ObMemberList &member_lis
PALF_LOG(WARN, "LogConfigMgr not init", KR(ret));
} else if (!member_list.is_valid() ||
!arb_member.is_valid() ||
(member_list.get_member_number() & 1) != 0 ||
(replica_num & 1) != 0 ||
replica_num <= 0 ||
replica_num > OB_MAX_MEMBER_NUMBER ||
INVALID_PROPOSAL_ID == proposal_id ||

15
unittest/logservice/test_log_config_mgr.cpp
View File

@ -128,21 +128,24 @@ TEST_F(TestLogConfigMgr, test_set_initial_member_list)
LogConfigVersion config_version;
init_test_log_config_env(addr1, default_config_info, cm);
// arb_member is self
EXPECT_EQ(OB_NOT_SUPPORTED, cm.set_initial_member_list(init_member_list, ObMember(addr1, 0), 3, learner_list, 1, config_version));
EXPECT_EQ(OB_NOT_SUPPORTED, cm.set_initial_member_list(init_member_list, ObMember(addr1, 0), 2, learner_list, 1, config_version));
// arb_member overlaps with member_list
EXPECT_EQ(OB_INVALID_ARGUMENT, cm.set_initial_member_list(init_member_list, ObMember(addr2, 0), 3, learner_list, 1, config_version));
EXPECT_EQ(OB_INVALID_ARGUMENT, cm.set_initial_member_list(init_member_list, ObMember(addr2, 0), 2, learner_list, 1, config_version));
// invalid replica_num
EXPECT_EQ(OB_INVALID_ARGUMENT, cm.set_initial_member_list(init_member_list, ObMember(addr3, 0), 3, learner_list, 1, config_version));
// arb_member overlaps with learners
learner_list.add_learner(ObMember(addr4, 0));
EXPECT_EQ(OB_INVALID_ARGUMENT, cm.set_initial_member_list(init_member_list, ObMember(addr4, 0), 3, learner_list, 1, config_version));
EXPECT_EQ(OB_INVALID_ARGUMENT, cm.set_initial_member_list(init_member_list, ObMember(addr4, 0), 2, learner_list, 1, config_version));
// do not reach majority
EXPECT_EQ(OB_INVALID_ARGUMENT, cm.set_initial_member_list(init_member_list, ObMember(addr5, 0), 4, learner_list, 1, config_version));
// learners overlap with member_list
init_member_list.add_server(addr4);
EXPECT_EQ(OB_INVALID_ARGUMENT, cm.set_initial_member_list(init_member_list, ObMember(addr5, 0), 3, learner_list, 1, config_version));
EXPECT_EQ(OB_INVALID_ARGUMENT, cm.set_initial_member_list(init_member_list, ObMember(addr5, 0), 4, learner_list, 1, config_version));
init_member_list.add_server(addr3);
learner_list.reset();
// do not reach majority
EXPECT_EQ(OB_INVALID_ARGUMENT, cm.set_initial_member_list(init_member_list, ObMember(addr5, 0), 3, learner_list, 1, config_version));
EXPECT_EQ(OB_INVALID_ARGUMENT, cm.set_initial_member_list(init_member_list, ObMember(addr5, 0), 2, learner_list, 1, config_version));
EXPECT_EQ(OB_SUCCESS, cm.set_initial_member_list(init_member_list, ObMember(addr5, 0), 4, learner_list, 1, config_version));
}
}