Increase quiet-database timeout when buggify is on; data-movements in simulation take longer than the timeout allows, and waiting for quiet-database does succeed when given some more time (#7290)
This commit is contained in:
parent
bf69f545d3
commit
990c789a5c
|
@ -39,6 +39,7 @@
|
||||||
#include "fdbclient/ManagementAPI.actor.h"
|
#include "fdbclient/ManagementAPI.actor.h"
|
||||||
#include <boost/lexical_cast.hpp>
|
#include <boost/lexical_cast.hpp>
|
||||||
#include "flow/actorcompiler.h" // This must be the last #include.
|
#include "flow/actorcompiler.h" // This must be the last #include.
|
||||||
|
#include "flow/flow.h"
|
||||||
|
|
||||||
ACTOR Future<std::vector<WorkerDetails>> getWorkers(Reference<AsyncVar<ServerDBInfo> const> dbInfo, int flags = 0) {
|
ACTOR Future<std::vector<WorkerDetails>> getWorkers(Reference<AsyncVar<ServerDBInfo> const> dbInfo, int flags = 0) {
|
||||||
loop {
|
loop {
|
||||||
|
@ -672,14 +673,18 @@ ACTOR Future<Void> reconfigureAfter(Database cx,
|
||||||
|
|
||||||
struct QuietDatabaseChecker {
|
struct QuietDatabaseChecker {
|
||||||
double start = now();
|
double start = now();
|
||||||
constexpr static double maxDDRunTime = 1000.0;
|
double maxDDRunTime;
|
||||||
|
|
||||||
|
QuietDatabaseChecker(double maxDDRunTime) : maxDDRunTime(maxDDRunTime) {}
|
||||||
|
|
||||||
struct Impl {
|
struct Impl {
|
||||||
double start;
|
double start;
|
||||||
std::string const& phase;
|
std::string const& phase;
|
||||||
|
double maxDDRunTime;
|
||||||
std::vector<std::string> failReasons;
|
std::vector<std::string> failReasons;
|
||||||
|
|
||||||
Impl(double start, const std::string& phase) : start(start), phase(phase) {}
|
Impl(double start, const std::string& phase, const double maxDDRunTime)
|
||||||
|
: start(start), phase(phase), maxDDRunTime(maxDDRunTime) {}
|
||||||
|
|
||||||
template <class T, class Comparison = std::less_equal<>>
|
template <class T, class Comparison = std::less_equal<>>
|
||||||
Impl& add(BaseTraceEvent& evt,
|
Impl& add(BaseTraceEvent& evt,
|
||||||
|
@ -719,7 +724,7 @@ struct QuietDatabaseChecker {
|
||||||
};
|
};
|
||||||
|
|
||||||
Impl startIteration(std::string const& phase) const {
|
Impl startIteration(std::string const& phase) const {
|
||||||
Impl res(start, phase);
|
Impl res(start, phase, maxDDRunTime);
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -735,7 +740,7 @@ ACTOR Future<Void> waitForQuietDatabase(Database cx,
|
||||||
int64_t maxDataDistributionQueueSize = 0,
|
int64_t maxDataDistributionQueueSize = 0,
|
||||||
int64_t maxPoppedVersionLag = 30e6,
|
int64_t maxPoppedVersionLag = 30e6,
|
||||||
int64_t maxVersionOffset = 1e6) {
|
int64_t maxVersionOffset = 1e6) {
|
||||||
state QuietDatabaseChecker checker;
|
state QuietDatabaseChecker checker(isBuggifyEnabled(BuggifyType::General) ? 1500.0 : 1000.0);
|
||||||
state Future<Void> reconfig =
|
state Future<Void> reconfig =
|
||||||
reconfigureAfter(cx, 100 + (deterministicRandom()->random01() * 100), dbInfo, "QuietDatabase");
|
reconfigureAfter(cx, 100 + (deterministicRandom()->random01() * 100), dbInfo, "QuietDatabase");
|
||||||
state Future<int64_t> dataInFlight;
|
state Future<int64_t> dataInFlight;
|
||||||
|
|
Loading…
Reference in New Issue