wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

set better knob for cpu cutoff unit test

This commit is contained in:
Xiaoxi Wang 2023-04-11 10:17:50 -07:00
parent 7ce7e3c99e
commit 737dd09572
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fdbserver/DDTeamCollection.actor.cpp
View File

@ -6274,9 +6274,16 @@ public:
low_s_low_r.load.opsReadPerKSecond = 100 * 1000; low_s_low_r.load.opsReadPerKSecond = 100 * 1000;
HealthMetrics::StorageStats low_cpu, mid_cpu, high_cpu; HealthMetrics::StorageStats low_cpu, mid_cpu, high_cpu;
low_cpu.cpuUsage = 20; // use constant cutoff value
mid_cpu.cpuUsage = 60; bool maxCutoff = deterministicRandom()->coinflip();
high_cpu.cpuUsage = 90; if (!maxCutoff) {
// use pivot value as cutoff
auto ratio = KnobValueRef::create(double{ 0.7 });
IKnobCollection::getMutableGlobalKnobCollection().setKnob("cpu_pivot_ratio", ratio);
}
low_cpu.cpuUsage = SERVER_KNOBS->MAX_DEST_CPU_PERCENT - 60;
mid_cpu.cpuUsage = SERVER_KNOBS->MAX_DEST_CPU_PERCENT - 40;
high_cpu.cpuUsage = maxCutoff ? SERVER_KNOBS->MAX_DEST_CPU_PERCENT + 1 : SERVER_KNOBS->MAX_DEST_CPU_PERCENT - 1;
// high space, low cpu, high read (in pool) // high space, low cpu, high read (in pool)
collection->addTeam(std::set<UID>({ UID(1, 0) }), IsInitialTeam::True); collection->addTeam(std::set<UID>({ UID(1, 0) }), IsInitialTeam::True);
@ -6300,16 +6307,20 @@ public:
wait(collection->getTeam(bestReq)); wait(collection->getTeam(bestReq));
const auto [bestTeam, found1] = bestReq.reply.getFuture().get(); const auto [bestTeam, found1] = bestReq.reply.getFuture().get();
fmt::print("{} {}\n", collection->teamPivots.pivotCPU, collection->teamPivots.lastPivotValuesUpdate, now()); fmt::print("{} {} {}\n",
SERVER_KNOBS->CPU_PIVOT_RATIO,
collection->teamPivots.pivotCPU,
collection->teamPivots.pivotAvailableSpaceRatio);
ASSERT(bestTeam.present()); ASSERT(bestTeam.present());
ASSERT_EQ(bestTeam.get()->getServerIDs(), std::vector<UID>{ UID(2, 0) }); ASSERT_EQ(bestTeam.get()->getServerIDs(), std::vector<UID>{ UID(2, 0) });
wait(collection->getTeam(randomReq)); wait(collection->getTeam(randomReq));
const auto [randomTeam, found2] = randomReq.reply.getFuture().get(); const auto [randomTeam, found2] = randomReq.reply.getFuture().get();
ASSERT(randomTeam.present()); if (randomTeam.present()) {
ASSERT_NE(randomTeam.get()->getServerIDs(), std::vector<UID>{ UID(3, 0) }); CODE_PROBE(true, "Unit Test Random Team Return Candidate.");
ASSERT_NE(randomTeam.get()->getServerIDs(), std::vector<UID>{ UID(4, 0) }); ASSERT_NE(randomTeam.get()->getServerIDs(), std::vector<UID>{ UID(3, 0) });
ASSERT_NE(randomTeam.get()->getServerIDs(), std::vector<UID>{ UID(4, 0) });
}
return Void(); return Void();
} }
}; };

2
fdbserver/include/fdbserver/DDTeamCollection.h
View File

@ -286,7 +286,7 @@ protected:
double pivotAvailableSpaceRatio = 0.0; double pivotAvailableSpaceRatio = 0.0;
double pivotCPU = 0.0; double pivotCPU = 0.0;
double minTeamAvgCPU = -1.0; double minTeamAvgCPU = std::numeric_limits<double>::max();
} teamPivots; } teamPivots;
int lowestUtilizationTeam; int lowestUtilizationTeam;

2
tests/rare/SpecificUnitTests.toml
View File

@ -11,4 +11,4 @@ runSetup=false
[[test.workload]] [[test.workload]]
testName = 'UnitTests' testName = 'UnitTests'
maxTestCases = 1 maxTestCases = 1
testsMatching = '/DataDistribution' testsMatching = 'noSim/'