apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-14 18:02:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5020 from dlambrig/issue4984

Browse Source 
Do not allow descriptor to change on upgrade tests
This commit is contained in:
Trevor Clinkenbeard 2021-06-21 09:13:38 -07:00 committed by GitHub
commit 481b785953
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fdbserver/workloads/ConfigureDatabase.actor.cpp
View File

@ -213,12 +213,15 @@ std::string generateRegions() {
struct ConfigureDatabaseWorkload : TestWorkload {
double testDuration;
int additionalDBs;
bool allowDescriptorChange;
vector<Future<Void>> clients;
PerfIntCounter retries;
ConfigureDatabaseWorkload(WorkloadContext const& wcx) : TestWorkload(wcx), retries("Retries") {
testDuration = getOption(options, LiteralStringRef("testDuration"), 200.0);
allowDescriptorChange =
getOption(options, LiteralStringRef("allowDescriptorChange"), SERVER_KNOBS->ENABLE_CROSS_CLUSTER_SUPPORT);
g_simulator.usableRegions = 1;
}
@ -316,10 +319,10 @@ struct ConfigureDatabaseWorkload : TestWorkload {
//TraceEvent("ConfigureTestConfigureEnd").detail("NewConfig", newConfig);
} else if (randomChoice == 4) {
//TraceEvent("ConfigureTestQuorumBegin").detail("NewQuorum", s);
//TraceEvent("ConfigureTestQuorumBegin");
auto ch = autoQuorumChange();
std::string desiredClusterName = "NewName%d";
if (!SERVER_KNOBS->ENABLE_CROSS_CLUSTER_SUPPORT) {
if (!self->allowDescriptorChange) {
// if configuration does not allow changing the descriptor, pass empty string (keep old descriptor)
desiredClusterName = "";
}

1
tests/restarting/from_7.0.0/ConfigureTestRestart-1.txt
View File

@ -3,6 +3,7 @@ clearAfterTest=false
testName=ConfigureDatabase
testDuration=30.0
allowDescriptorChange=false
testName=RandomClogging
testDuration=30.0

1
tests/restarting/from_7.0.0/ConfigureTestRestart-2.txt
View File

@ -3,6 +3,7 @@ runSetup=false
testName=ConfigureDatabase
testDuration=300.0
allowDescriptorChange=false
testName=RandomClogging
testDuration=300.0