apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-06-02 03:12:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

moved ordering of coordinator exclusion to fill all containers

Browse Source
This commit is contained in:
Jon Fu 2019-09-30 15:43:44 -07:00
parent 81ebc7bfc9
commit f721a444ae
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fdbserver/workloads/RemoveServersSafely.actor.cpp
View File

@ -402,7 +402,14 @@ struct RemoveServersSafelyWorkload : TestWorkload {
state std::vector<ISimulator::ProcessInfo*> killProcArray;
state std::vector<AddressExclusion> toKillArray;
state std::vector<AddressExclusion> toKillMarkFailedArray;
state AddressExclusion coordExcl;
// Exclude a coordinator under buggify, but only if fault tolerance is > 0
if (BUGGIFY && g_simulator.desiredCoordinators > 1) {
std::vector<NetworkAddress> coordinators = wait(getCoordinators(cx));
auto& randomCoordinator = deterministicRandom()->randomChoice(coordinators);
coordExcl = AddressExclusion(randomCoordinator.ip, randomCoordinator.port);
toKill.insert(coordExcl);
}
std::copy(toKill.begin(), toKill.end(), std::back_inserter(toKillArray));
killProcArray = self->getProcesses(toKill);
if (markExcludeAsFailed) {
@ -411,11 +418,8 @@ struct RemoveServersSafelyWorkload : TestWorkload {
state bool safe = false;
state std::set<AddressExclusion> failSet =
random_subset(toKillArray, deterministicRandom()->randomInt(0, toKillArray.size() + 1));
// Exclude a coordinator under buggify, but only if fault tolerance is > 0
if (BUGGIFY && g_simulator.desiredCoordinators > 1) {
std::vector<NetworkAddress> coordinators = wait(getCoordinators(cx));
auto& randomCoordinator = deterministicRandom()->randomChoice(coordinators);
failSet.insert(AddressExclusion(randomCoordinator.ip, randomCoordinator.port));
if (coordExcl.isValid()) {
failSet.insert(coordExcl);
}
toKillMarkFailedArray.resize(failSet.size());
std::copy(failSet.begin(), failSet.end(), toKillMarkFailedArray.begin());