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

rename preferLowerDiskUtil

This commit is contained in:
Xiaoxi Wang 2022-05-22 23:32:13 -07:00
parent 4f28af1ab7
commit 909a7a92a1
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fdbserver/DDTeamCollection.actor.cpp
View File

@ -42,7 +42,7 @@ auto get(MapContainer& m, K const& k) -> decltype(m.at(k)) {
FDB_DEFINE_BOOLEAN_PARAM(WantNewServers); FDB_DEFINE_BOOLEAN_PARAM(WantNewServers);
FDB_DEFINE_BOOLEAN_PARAM(WantTrueBest); FDB_DEFINE_BOOLEAN_PARAM(WantTrueBest);
FDB_DEFINE_BOOLEAN_PARAM(PreferLowerUtilization); FDB_DEFINE_BOOLEAN_PARAM(PreferLowerDiskUtil);
FDB_DEFINE_BOOLEAN_PARAM(TeamMustHaveShards); FDB_DEFINE_BOOLEAN_PARAM(TeamMustHaveShards);
FDB_DEFINE_BOOLEAN_PARAM(ForReadBalance); FDB_DEFINE_BOOLEAN_PARAM(ForReadBalance);
FDB_DEFINE_BOOLEAN_PARAM(PreferLowerReadUtil); FDB_DEFINE_BOOLEAN_PARAM(PreferLowerReadUtil);
@ -245,7 +245,7 @@ public:
if (req.wantsTrueBest) { if (req.wantsTrueBest) {
ASSERT(!bestOption.present()); ASSERT(!bestOption.present());
auto& startIndex = auto& startIndex =
req.preferLowerUtilization ? self->lowestUtilizationTeam : self->highestUtilizationTeam; req.preferLowerDiskUtil ? self->lowestUtilizationTeam : self->highestUtilizationTeam;
if (startIndex >= self->teams.size()) { if (startIndex >= self->teams.size()) {
startIndex = 0; startIndex = 0;
} }
@ -254,7 +254,7 @@ public:
for (int i = 0; i < self->teams.size(); i++) { for (int i = 0; i < self->teams.size(); i++) {
int currentIndex = (startIndex + i) % self->teams.size(); int currentIndex = (startIndex + i) % self->teams.size();
if (self->teams[currentIndex]->isHealthy() && if (self->teams[currentIndex]->isHealthy() &&
(!req.preferLowerUtilization || (!req.preferLowerDiskUtil ||
self->teams[currentIndex]->hasHealthyAvailableSpace(self->medianAvailableSpace))) { self->teams[currentIndex]->hasHealthyAvailableSpace(self->medianAvailableSpace))) {
int64_t loadBytes = self->teams[currentIndex]->getLoadBytes(true, req.inflightPenalty); int64_t loadBytes = self->teams[currentIndex]->getLoadBytes(true, req.inflightPenalty);
if ((!req.teamMustHaveShards || if ((!req.teamMustHaveShards ||
@ -286,7 +286,7 @@ public:
// If unhealthy team is majority, we may not find an ok dest in this while loop // If unhealthy team is majority, we may not find an ok dest in this while loop
Reference<TCTeamInfo> dest = deterministicRandom()->randomChoice(self->teams); Reference<TCTeamInfo> dest = deterministicRandom()->randomChoice(self->teams);
bool ok = dest->isHealthy() && (!req.preferLowerUtilization || bool ok = dest->isHealthy() && (!req.preferLowerDiskUtil ||
dest->hasHealthyAvailableSpace(self->medianAvailableSpace)); dest->hasHealthyAvailableSpace(self->medianAvailableSpace));
for (int i = 0; ok && i < randomTeams.size(); i++) { for (int i = 0; ok && i < randomTeams.size(); i++) {
@ -5372,7 +5372,7 @@ public:
std::vector<UID> completeSources{ UID(1, 0), UID(2, 0), UID(3, 0) }; std::vector<UID> completeSources{ UID(1, 0), UID(2, 0), UID(3, 0) };
state GetTeamRequest req( state GetTeamRequest req(
WantNewServers::False, WantTrueBest::True, PreferLowerUtilization::True, TeamMustHaveShards::False); WantNewServers::False, WantTrueBest::True, PreferLowerDiskUtil::True, TeamMustHaveShards::False);
req.completeSources = completeSources; req.completeSources = completeSources;
wait(collection->getTeam(req)); wait(collection->getTeam(req));
@ -5425,7 +5425,7 @@ public:
std::vector<UID> completeSources{ UID(1, 0), UID(2, 0), UID(3, 0), UID(4, 0) }; std::vector<UID> completeSources{ UID(1, 0), UID(2, 0), UID(3, 0), UID(4, 0) };
state GetTeamRequest req( state GetTeamRequest req(
WantNewServers::False, WantTrueBest::True, PreferLowerUtilization::True, TeamMustHaveShards::False); WantNewServers::False, WantTrueBest::True, PreferLowerDiskUtil::True, TeamMustHaveShards::False);
req.completeSources = completeSources; req.completeSources = completeSources;
wait(collection->getTeam(req)); wait(collection->getTeam(req));
@ -5466,7 +5466,7 @@ public:
/* /*
* Among server teams that have healthy space available, pick the team that is * Among server teams that have healthy space available, pick the team that is
* least utilized, if the caller says they preferLowerUtilization. * least utilized, if the caller says they preferLowerDiskUtil.
*/ */
collection->server_info[UID(1, 0)]->setMetrics(mid_avail); collection->server_info[UID(1, 0)]->setMetrics(mid_avail);
@ -5477,7 +5477,7 @@ public:
std::vector<UID> completeSources{ UID(1, 0), UID(2, 0), UID(3, 0) }; std::vector<UID> completeSources{ UID(1, 0), UID(2, 0), UID(3, 0) };
state GetTeamRequest req( state GetTeamRequest req(
WantNewServers::True, WantTrueBest::True, PreferLowerUtilization::True, TeamMustHaveShards::False); WantNewServers::True, WantTrueBest::True, PreferLowerDiskUtil::True, TeamMustHaveShards::False);
req.completeSources = completeSources; req.completeSources = completeSources;
wait(collection->getTeam(req)); wait(collection->getTeam(req));
@ -5523,12 +5523,12 @@ public:
/* /*
* Among server teams that have healthy space available, pick the team that is * Among server teams that have healthy space available, pick the team that is
* most utilized, if the caller says they don't preferLowerUtilization. * most utilized, if the caller says they don't preferLowerDiskUtil.
*/ */
std::vector<UID> completeSources{ UID(1, 0), UID(2, 0), UID(3, 0) }; std::vector<UID> completeSources{ UID(1, 0), UID(2, 0), UID(3, 0) };
state GetTeamRequest req( state GetTeamRequest req(
WantNewServers::True, WantTrueBest::True, PreferLowerUtilization::False, TeamMustHaveShards::False); WantNewServers::True, WantTrueBest::True, PreferLowerDiskUtil::False, TeamMustHaveShards::False);
req.completeSources = completeSources; req.completeSources = completeSources;
wait(collection->getTeam(req)); wait(collection->getTeam(req));
@ -5580,7 +5580,7 @@ public:
std::vector<UID> completeSources{ UID(1, 0), UID(2, 0), UID(3, 0) }; std::vector<UID> completeSources{ UID(1, 0), UID(2, 0), UID(3, 0) };
state GetTeamRequest req( state GetTeamRequest req(
WantNewServers::True, WantTrueBest::True, PreferLowerUtilization::True, TeamMustHaveShards::False); WantNewServers::True, WantTrueBest::True, PreferLowerDiskUtil::True, TeamMustHaveShards::False);
req.completeSources = completeSources; req.completeSources = completeSources;
wait(collection->getTeam(req)); wait(collection->getTeam(req));
@ -5637,7 +5637,7 @@ public:
std::vector<UID> completeSources{ UID(1, 0), UID(2, 0), UID(3, 0) }; std::vector<UID> completeSources{ UID(1, 0), UID(2, 0), UID(3, 0) };
state GetTeamRequest req( state GetTeamRequest req(
WantNewServers::True, WantTrueBest::True, PreferLowerUtilization::True, TeamMustHaveShards::False); WantNewServers::True, WantTrueBest::True, PreferLowerDiskUtil::True, TeamMustHaveShards::False);
req.completeSources = completeSources; req.completeSources = completeSources;
wait(collection->getTeam(req)); wait(collection->getTeam(req));
@ -5678,14 +5678,14 @@ public:
auto wantsNewServers = WantNewServers::True; auto wantsNewServers = WantNewServers::True;
auto wantsTrueBest = WantTrueBest::True; auto wantsTrueBest = WantTrueBest::True;
auto preferLowerUtilization = PreferLowerUtilization::True; auto preferLowerDiskUtil = PreferLowerDiskUtil::True;
auto teamMustHaveShards = TeamMustHaveShards::False; auto teamMustHaveShards = TeamMustHaveShards::False;
auto forReadBalance = ForReadBalance::True; auto forReadBalance = ForReadBalance::True;
std::vector<UID> completeSources{ UID(1, 0), UID(2, 0), UID(3, 0) }; std::vector<UID> completeSources{ UID(1, 0), UID(2, 0), UID(3, 0) };
state GetTeamRequest req(wantsNewServers, state GetTeamRequest req(wantsNewServers,
wantsTrueBest, wantsTrueBest,
preferLowerUtilization, preferLowerDiskUtil,
teamMustHaveShards, teamMustHaveShards,
forReadBalance, forReadBalance,
PreferLowerReadUtil::True); PreferLowerReadUtil::True);
@ -5693,7 +5693,7 @@ public:
state GetTeamRequest reqHigh(wantsNewServers, state GetTeamRequest reqHigh(wantsNewServers,
wantsTrueBest, wantsTrueBest,
PreferLowerUtilization::False, PreferLowerDiskUtil::False,
teamMustHaveShards, teamMustHaveShards,
forReadBalance, forReadBalance,
PreferLowerReadUtil::False); PreferLowerReadUtil::False);
@ -5757,7 +5757,7 @@ public:
std::vector<UID> completeSources{ UID(1, 0), UID(2, 0), UID(3, 0) }; std::vector<UID> completeSources{ UID(1, 0), UID(2, 0), UID(3, 0) };
state GetTeamRequest req( state GetTeamRequest req(
WantNewServers::True, WantTrueBest::True, PreferLowerUtilization::True, TeamMustHaveShards::False); WantNewServers::True, WantTrueBest::True, PreferLowerDiskUtil::True, TeamMustHaveShards::False);
req.completeSources = completeSources; req.completeSources = completeSources;
wait(collection->getTeam(req)); wait(collection->getTeam(req));

12
fdbserver/DataDistribution.actor.h
View File

@ -84,7 +84,7 @@ struct IDataDistributionTeam {
FDB_DECLARE_BOOLEAN_PARAM(WantNewServers); FDB_DECLARE_BOOLEAN_PARAM(WantNewServers);
FDB_DECLARE_BOOLEAN_PARAM(WantTrueBest); FDB_DECLARE_BOOLEAN_PARAM(WantTrueBest);
FDB_DECLARE_BOOLEAN_PARAM(PreferLowerUtilization); FDB_DECLARE_BOOLEAN_PARAM(PreferLowerDiskUtil);
FDB_DECLARE_BOOLEAN_PARAM(TeamMustHaveShards); FDB_DECLARE_BOOLEAN_PARAM(TeamMustHaveShards);
FDB_DECLARE_BOOLEAN_PARAM(ForReadBalance); FDB_DECLARE_BOOLEAN_PARAM(ForReadBalance);
FDB_DECLARE_BOOLEAN_PARAM(PreferLowerReadUtil); FDB_DECLARE_BOOLEAN_PARAM(PreferLowerReadUtil);
@ -92,7 +92,7 @@ FDB_DECLARE_BOOLEAN_PARAM(PreferLowerReadUtil);
struct GetTeamRequest { struct GetTeamRequest {
bool wantsNewServers; // In additional to servers in completeSources, try to find teams with new server bool wantsNewServers; // In additional to servers in completeSources, try to find teams with new server
bool wantsTrueBest; bool wantsTrueBest;
bool preferLowerUtilization; // if true, lower utilized team has higher score bool preferLowerDiskUtil; // if true, lower utilized team has higher score
bool teamMustHaveShards; bool teamMustHaveShards;
bool forReadBalance; bool forReadBalance;
bool preferLowerReadUtil; // only make sense when forReadBalance is true bool preferLowerReadUtil; // only make sense when forReadBalance is true
@ -106,12 +106,12 @@ struct GetTeamRequest {
GetTeamRequest() {} GetTeamRequest() {}
GetTeamRequest(WantNewServers wantsNewServers, GetTeamRequest(WantNewServers wantsNewServers,
WantTrueBest wantsTrueBest, WantTrueBest wantsTrueBest,
PreferLowerUtilization preferLowerUtilization, PreferLowerDiskUtil preferLowerDiskUtil,
TeamMustHaveShards teamMustHaveShards, TeamMustHaveShards teamMustHaveShards,
ForReadBalance forReadBalance = ForReadBalance::False, ForReadBalance forReadBalance = ForReadBalance::False,
PreferLowerReadUtil preferLowerReadUtil = PreferLowerReadUtil::False, PreferLowerReadUtil preferLowerReadUtil = PreferLowerReadUtil::False,
double inflightPenalty = 1.0) double inflightPenalty = 1.0)
: wantsNewServers(wantsNewServers), wantsTrueBest(wantsTrueBest), preferLowerUtilization(preferLowerUtilization), : wantsNewServers(wantsNewServers), wantsTrueBest(wantsTrueBest), preferLowerDiskUtil(preferLowerDiskUtil),
teamMustHaveShards(teamMustHaveShards), forReadBalance(forReadBalance), teamMustHaveShards(teamMustHaveShards), forReadBalance(forReadBalance),
preferLowerReadUtil(preferLowerReadUtil), inflightPenalty(inflightPenalty) {} preferLowerReadUtil(preferLowerReadUtil), inflightPenalty(inflightPenalty) {}
@ -128,7 +128,7 @@ struct GetTeamRequest {
std::stringstream ss; std::stringstream ss;
ss << "WantsNewServers:" << wantsNewServers << " WantsTrueBest:" << wantsTrueBest ss << "WantsNewServers:" << wantsNewServers << " WantsTrueBest:" << wantsTrueBest
<< " PreferLowerUtilization:" << preferLowerUtilization << " teamMustHaveShards:" << teamMustHaveShards << " PreferLowerDiskUtil:" << preferLowerDiskUtil << " teamMustHaveShards:" << teamMustHaveShards
<< "forReadBalance" << forReadBalance << " inflightPenalty:" << inflightPenalty << ";"; << "forReadBalance" << forReadBalance << " inflightPenalty:" << inflightPenalty << ";";
ss << "CompleteSources:"; ss << "CompleteSources:";
for (const auto& cs : completeSources) { for (const auto& cs : completeSources) {
@ -143,7 +143,7 @@ private:
// or preferLowerUtil && aLoadBytes > bLoadBytes // or preferLowerUtil && aLoadBytes > bLoadBytes
bool lessCompareByLoad(int64_t aLoadBytes, int64_t bLoadBytes) const { bool lessCompareByLoad(int64_t aLoadBytes, int64_t bLoadBytes) const {
bool lessLoad = aLoadBytes <= bLoadBytes; bool lessLoad = aLoadBytes <= bLoadBytes;
return preferLowerUtilization ? !lessLoad : lessLoad; return preferLowerDiskUtil ? !lessLoad : lessLoad;
} }
// return -1 if a.readload > b.readload // return -1 if a.readload > b.readload