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

address review comments

This commit is contained in:
Markus Pilman 2022-09-16 14:40:10 -06:00
parent 2d1b58d020
commit 9441795c8e
4 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbserver/include/fdbserver/workloads/workloads.actor.h
View File

@ -100,7 +100,7 @@ struct NoOptions {};
struct FailureInjectionWorkload : TestWorkload {
FailureInjectionWorkload(WorkloadContext const&);
virtual ~FailureInjectionWorkload() {}
virtual bool add(DeterministicRandom& random, WorkloadRequest const work, CompoundWorkload const& workload);
virtual bool add(DeterministicRandom& random, WorkloadRequest const& work, CompoundWorkload const& workload);
virtual void initFailureInjectionMode(DeterministicRandom& random, unsigned count);
Future<Void> setupInjectionWorkload(Database const& cx, Future<Void> done);

54
fdbserver/tester.actor.cpp
View File

@ -303,15 +303,16 @@ Future<Void> CompoundWorkload::setup(Database const& cx) {
}
return waitForAll(res);
}
Future<Void> CompoundWorkload::start(Database const& cx) {
std::vector<Future<Void>> all;
all.reserve(workloads.size());
all.reserve(workloads.size() + failureInjection.size());
auto wCount = std::make_shared<unsigned>(0);
for (int i = 0; i < workloads.size(); i++) {
std::string workloadName = workloads[i]->description();
auto startWorkload = [&](TestWorkload& workload) -> Future<Void> {
auto workloadName = workload.description();
++(*wCount);
TraceEvent("WorkloadRunStatus").detail("Name", workloadName).detail("Count", *wCount).detail("Phase", "Start");
all.push_back(fmap(
return fmap(
[workloadName, wCount](Void value) {
--(*wCount);
TraceEvent("WorkloadRunStatus")
@ -320,31 +321,29 @@ Future<Void> CompoundWorkload::start(Database const& cx) {
.detail("Phase", "End");
return Void();
},
workloads[i]->start(cx)));
workload.start(cx));
};
for (auto& workload : workloads) {
all.push_back(startWorkload(*workload));
}
auto done = waitForAll(all);
if (failureInjection.empty()) {
return done;
for (auto& workload : failureInjection) {
all.push_back(startWorkload(*workload));
}
std::vector<Future<Void>> res;
res.reserve(failureInjection.size());
for (auto& f : failureInjection) {
res.push_back(f->startInjectionWorkload(cx, done));
}
return waitForAll(res);
return waitForAll(all);
}
Future<bool> CompoundWorkload::check(Database const& cx) {
std::vector<Future<bool>> all;
all.reserve(workloads.size());
all.reserve(workloads.size() + failureInjection.size());
auto wCount = std::make_shared<unsigned>(0);
for (int i = 0; i < workloads.size(); i++) {
auto starter = [&](TestWorkload& workload) -> Future<bool> {
++(*wCount);
std::string workloadName = workloads[i]->description();
std::string workloadName = workload.description();
TraceEvent("WorkloadCheckStatus")
.detail("Name", workloadName)
.detail("Count", *wCount)
.detail("Phase", "Start");
all.push_back(fmap(
return fmap(
[workloadName, wCount](bool ret) {
--(*wCount);
TraceEvent("WorkloadCheckStatus")
@ -353,18 +352,15 @@ Future<bool> CompoundWorkload::check(Database const& cx) {
.detail("Phase", "End");
return true;
},
workloads[i]->check(cx)));
workload.check(cx));
};
for (auto& workload : workloads) {
all.push_back(starter(*workload));
}
auto done = allTrue(all);
if (failureInjection.empty()) {
return done;
for (auto& workload : failureInjection) {
all.push_back(starter(*workload));
}
std::vector<Future<bool>> res;
res.reserve(failureInjection.size());
for (auto& f : failureInjection) {
res.push_back(f->checkInjectionWorkload(cx, done));
}
return allTrue(res);
return allTrue(all);
}
ACTOR Future<std::vector<PerfMetric>> getMetricsCompoundWorkload(CompoundWorkload* self) {
@ -426,7 +422,7 @@ void CompoundWorkload::getMetrics(std::vector<PerfMetric>&) {
FailureInjectionWorkload::FailureInjectionWorkload(WorkloadContext const& wcx) : TestWorkload(wcx) {}
bool FailureInjectionWorkload::add(DeterministicRandom& random,
const WorkloadRequest work,
const WorkloadRequest& work,
const CompoundWorkload& workload) {
auto desc = description();
unsigned alreadyAdded = std::count_if(workload.workloads.begin(), workload.workloads.end(), [&desc](auto const& w) {

2
fdbserver/workloads/MachineAttrition.actor.cpp
View File

@ -114,7 +114,7 @@ struct MachineAttritionWorkload : FailureInjectionWorkload {
allowFaultInjection = getOption(options, LiteralStringRef("allowFaultInjection"), allowFaultInjection);
}
bool add(DeterministicRandom& random, WorkloadRequest const work, CompoundWorkload const& workload) override {
bool add(DeterministicRandom& random, WorkloadRequest const& work, CompoundWorkload const& workload) override {
auto desc = this->description();
unsigned alreadyAdded = std::count_if(workload.workloads.begin(),
workload.workloads.end(),

3
fdbserver/workloads/RandomClogging.actor.cpp
View File

@ -43,7 +43,7 @@ struct RandomCloggingWorkload : FailureInjectionWorkload {
swizzleClog = getOption(options, LiteralStringRef("swizzle"), swizzleClog);
}
bool add(DeterministicRandom& random, WorkloadRequest const work, CompoundWorkload const& workload) override {
bool add(DeterministicRandom& random, WorkloadRequest const& work, CompoundWorkload const& workload) override {
auto desc = description();
unsigned alreadyAdded = std::count_if(workload.workloads.begin(),
workload.workloads.end(),
@ -57,6 +57,7 @@ struct RandomCloggingWorkload : FailureInjectionWorkload {
scale = std::max(random.random01(), 0.1);
clogginess = std::max(random.random01(), 0.1);
swizzleClog = random.random01() < 0.3;
iterate = random.random01() < 0.5;
}
return willAdd;
}