Remove unneeded knob change for workloads
This commit is contained in:
parent
beccd6e3c2
commit
e499e3ad70
|
@ -61,9 +61,6 @@ struct AtomicRestoreWorkload : TestWorkload {
|
|||
ACTOR static Future<Void> _start(Database cx, AtomicRestoreWorkload* self) {
|
||||
state FileBackupAgent backupAgent;
|
||||
|
||||
// Disable proxy rejection
|
||||
const_cast<ServerKnobs*>(SERVER_KNOBS)->PROXY_REJECT_BATCH_QUEUED_TOO_LONG = false;
|
||||
|
||||
wait( delay(self->startAfter * deterministicRandom()->random01()) );
|
||||
TraceEvent("AtomicRestore_Start");
|
||||
|
||||
|
@ -108,7 +105,6 @@ struct AtomicRestoreWorkload : TestWorkload {
|
|||
}
|
||||
|
||||
TraceEvent("AtomicRestore_Done");
|
||||
const_cast<ServerKnobs*>(SERVER_KNOBS)->PROXY_REJECT_BATCH_QUEUED_TOO_LONG = true;
|
||||
return Void();
|
||||
}
|
||||
};
|
||||
|
|
|
@ -152,9 +152,6 @@ struct AtomicSwitchoverWorkload : TestWorkload {
|
|||
state DatabaseBackupAgent backupAgent(cx);
|
||||
state DatabaseBackupAgent restoreAgent(self->extraDB);
|
||||
|
||||
// Disable proxy rejection to avoid ApplyMutationsError
|
||||
const_cast<ServerKnobs*>(SERVER_KNOBS)->PROXY_REJECT_BATCH_QUEUED_TOO_LONG = false;
|
||||
|
||||
TraceEvent("AS_Wait1");
|
||||
wait(success( backupAgent.waitBackup(self->extraDB, BackupAgentBase::getDefaultTag(), false) ));
|
||||
TraceEvent("AS_Ready1");
|
||||
|
@ -180,8 +177,6 @@ struct AtomicSwitchoverWorkload : TestWorkload {
|
|||
g_simulator.drAgents = ISimulator::NoBackupAgents;
|
||||
}
|
||||
|
||||
const_cast<ServerKnobs*>(SERVER_KNOBS)->PROXY_REJECT_BATCH_QUEUED_TOO_LONG = true;
|
||||
|
||||
return Void();
|
||||
}
|
||||
};
|
||||
|
|
|
@ -364,7 +364,6 @@ struct BackupAndRestoreCorrectnessWorkload : TestWorkload {
|
|||
state FileBackupAgent backupAgent;
|
||||
state Future<Void> extraBackup;
|
||||
state bool extraTasks = false;
|
||||
const_cast<ServerKnobs*>(SERVER_KNOBS)->PROXY_REJECT_BATCH_QUEUED_TOO_LONG = false;
|
||||
TraceEvent("BARW_Arguments").detail("BackupTag", printable(self->backupTag)).detail("PerformRestore", self->performRestore)
|
||||
.detail("BackupAfter", self->backupAfter).detail("RestoreAfter", self->restoreAfter)
|
||||
.detail("AbortAndRestartAfter", self->abortAndRestartAfter).detail("DifferentialAfter", self->stopDifferentialAfter);
|
||||
|
@ -662,7 +661,6 @@ struct BackupAndRestoreCorrectnessWorkload : TestWorkload {
|
|||
TraceEvent(SevError, "BackupAndRestoreCorrectness").error(e).GetLastError();
|
||||
throw;
|
||||
}
|
||||
const_cast<ServerKnobs*>(SERVER_KNOBS)->PROXY_REJECT_BATCH_QUEUED_TOO_LONG = true;
|
||||
return Void();
|
||||
}
|
||||
};
|
||||
|
|
|
@ -22,8 +22,6 @@
|
|||
#include "fdbclient/ManagementAPI.actor.h"
|
||||
#include "fdbclient/NativeAPI.actor.h"
|
||||
#include "fdbserver/workloads/workloads.actor.h"
|
||||
#include "fdbserver/Knobs.h"
|
||||
|
||||
#include "flow/actorcompiler.h" // This must be the last #include.
|
||||
|
||||
struct BackupToDBAbort : TestWorkload {
|
||||
|
@ -74,9 +72,6 @@ struct BackupToDBAbort : TestWorkload {
|
|||
ACTOR static Future<Void> _start(BackupToDBAbort* self, Database cx) {
|
||||
state DatabaseBackupAgent backupAgent(cx);
|
||||
|
||||
// Disable proxy rejection to avoid ApplyMutationsError
|
||||
const_cast<ServerKnobs*>(SERVER_KNOBS)->PROXY_REJECT_BATCH_QUEUED_TOO_LONG = false;
|
||||
|
||||
TraceEvent("BDBA_Start").detail("Delay", self->abortDelay);
|
||||
wait(delay(self->abortDelay));
|
||||
TraceEvent("BDBA_Wait");
|
||||
|
@ -94,7 +89,6 @@ struct BackupToDBAbort : TestWorkload {
|
|||
g_simulator.drAgents = ISimulator::NoBackupAgents;
|
||||
}
|
||||
|
||||
const_cast<ServerKnobs*>(SERVER_KNOBS)->PROXY_REJECT_BATCH_QUEUED_TOO_LONG = true;
|
||||
return Void();
|
||||
}
|
||||
|
||||
|
|
|
@ -442,9 +442,6 @@ struct BackupToDBCorrectnessWorkload : TestWorkload {
|
|||
TraceEvent("BARW_Arguments").detail("BackupTag", printable(self->backupTag)).detail("BackupAfter", self->backupAfter)
|
||||
.detail("AbortAndRestartAfter", self->abortAndRestartAfter).detail("DifferentialAfter", self->stopDifferentialAfter);
|
||||
|
||||
// Disable proxy rejection to avoid ApplyMutationsError
|
||||
const_cast<ServerKnobs*>(SERVER_KNOBS)->PROXY_REJECT_BATCH_QUEUED_TOO_LONG = false;
|
||||
|
||||
state UID randomID = nondeterministicRandom()->randomUniqueID();
|
||||
|
||||
// Increment the backup agent requets
|
||||
|
@ -578,8 +575,6 @@ struct BackupToDBCorrectnessWorkload : TestWorkload {
|
|||
throw;
|
||||
}
|
||||
|
||||
const_cast<ServerKnobs*>(SERVER_KNOBS)->PROXY_REJECT_BATCH_QUEUED_TOO_LONG = true;
|
||||
|
||||
return Void();
|
||||
}
|
||||
};
|
||||
|
|
|
@ -346,9 +346,6 @@ struct BackupToDBUpgradeWorkload : TestWorkload {
|
|||
state UID logUid;
|
||||
state Version commitVersion;
|
||||
|
||||
// Disable proxy rejection to avoid ApplyMutationsError
|
||||
const_cast<ServerKnobs*>(SERVER_KNOBS)->PROXY_REJECT_BATCH_QUEUED_TOO_LONG = false;
|
||||
|
||||
state Future<Void> stopDifferential = delay(self->stopDifferentialAfter);
|
||||
state Future<Void> waitUpgrade = backupAgent.waitUpgradeToLatestDrVersion(self->extraDB, self->backupTag);
|
||||
wait(success(stopDifferential) && success(waitUpgrade));
|
||||
|
@ -465,8 +462,6 @@ struct BackupToDBUpgradeWorkload : TestWorkload {
|
|||
throw;
|
||||
}
|
||||
|
||||
const_cast<ServerKnobs*>(SERVER_KNOBS)->PROXY_REJECT_BATCH_QUEUED_TOO_LONG = true;
|
||||
|
||||
return Void();
|
||||
}
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue