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

Changing role names and enabling tss by default in consistency check

This commit is contained in:
Josh Slocum 2021-05-25 20:06:32 +00:00
parent 4257ac2b4d
commit d68cb9b048
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fdbserver/SimulatedCluster.actor.cpp
View File

@ -186,7 +186,7 @@ public:
bool configureLocked = false; bool configureLocked = false;
bool startIncompatibleProcess = false; bool startIncompatibleProcess = false;
int logAntiQuorum = -1; int logAntiQuorum = -1;
bool firstTestInRestart = false; bool isFirstTestInRestart = false;
// Storage Engine Types: Verify match with SimulationConfig::generateNormalConfig // Storage Engine Types: Verify match with SimulationConfig::generateNormalConfig
// 0 = "ssd" // 0 = "ssd"
// 1 = "memory" // 1 = "memory"
@ -1171,7 +1171,7 @@ void SimulationConfig::generateNormalConfig(const TestConfig& testConfig) {
} }
int tssCount = 0; int tssCount = 0;
if (!testconfig.simpleConfig && deterministicRandom()->random01() < 0.25) { if (!testConfig.simpleConfig && deterministicRandom()->random01() < 0.25) {
// 1 or 2 tss // 1 or 2 tss
tssCount = deterministicRandom()->randomInt(1, 3); tssCount = deterministicRandom()->randomInt(1, 3);
} }
@ -1189,14 +1189,10 @@ void SimulationConfig::generateNormalConfig(const TestConfig& testConfig) {
db.grvProxyCount = 1; db.grvProxyCount = 1;
db.resolverCount = 1; db.resolverCount = 1;
} }
int replication_type = testConfig.simpleConfig ? 1 : (std::max(testConfig.minimumReplication, datacenters > 4 ? deterministicRandom()->randomInt(1, 3) : std::min(deterministicRandom()->randomInt(0, 6), 3)));
if (testConfig.config.present()) { if (testConfig.config.present()) {
set_config(testConfig.config.get()); set_config(testConfig.config.get());
} else { } else {
int replication_type = testConfig.simpleConfig
? 1
: (std::max(testConfig.minimumReplication,
datacenters > 4 ? deterministicRandom()->randomInt(1, 3)
: std::min(deterministicRandom()->randomInt(0, 6), 3)));
switch (replication_type) { switch (replication_type) {
case 0: { case 0: {
TEST(true); // Simulated cluster using custom redundancy mode TEST(true); // Simulated cluster using custom redundancy mode
@ -1513,7 +1509,7 @@ void SimulationConfig::generateNormalConfig(const TestConfig& testConfig) {
tssCount = tssCount =
std::max(0, std::min(tssCount, (db.usableRegions * (machine_count / datacenters) - replication_type) / 2)); std::max(0, std::min(tssCount, (db.usableRegions * (machine_count / datacenters) - replication_type) / 2));
if (tssCount > 0) { if (!testConfig.config.present() && tssCount > 0) {
std::string confStr = format("tss_count:=%d tss_storage_engine:=%d", tssCount, db.storageServerStoreType); std::string confStr = format("tss_count:=%d tss_storage_engine:=%d", tssCount, db.storageServerStoreType);
set_config(confStr); set_config(confStr);
double tssRandom = deterministicRandom()->random01(); double tssRandom = deterministicRandom()->random01();

4
fdbserver/worker.actor.cpp
View File

@ -2151,7 +2151,7 @@ ACTOR Future<Void> fdbd(Reference<ClusterConnectionFile> connFile,
const Role Role::WORKER("Worker", "WK", false); const Role Role::WORKER("Worker", "WK", false);
const Role Role::STORAGE_SERVER("StorageServer", "SS"); const Role Role::STORAGE_SERVER("StorageServer", "SS");
const Role Role::TESTING_STORAGE_SERVER("TestingStorageServer", "TS"); const Role Role::TESTING_STORAGE_SERVER("TestingStorageServer", "ST");
const Role Role::TRANSACTION_LOG("TLog", "TL"); const Role Role::TRANSACTION_LOG("TLog", "TL");
const Role Role::SHARED_TRANSACTION_LOG("SharedTLog", "SL", false); const Role Role::SHARED_TRANSACTION_LOG("SharedTLog", "SL", false);
const Role Role::COMMIT_PROXY("CommitProxyServer", "CP"); const Role Role::COMMIT_PROXY("CommitProxyServer", "CP");
@ -2159,7 +2159,7 @@ const Role Role::GRV_PROXY("GrvProxyServer", "GP");
const Role Role::MASTER("MasterServer", "MS"); const Role Role::MASTER("MasterServer", "MS");
const Role Role::RESOLVER("Resolver", "RV"); const Role Role::RESOLVER("Resolver", "RV");
const Role Role::CLUSTER_CONTROLLER("ClusterController", "CC"); const Role Role::CLUSTER_CONTROLLER("ClusterController", "CC");
const Role Role::TESTER("TestClient", "TC"); const Role Role::TESTER("Tester", "TS");
const Role Role::LOG_ROUTER("LogRouter", "LR"); const Role Role::LOG_ROUTER("LogRouter", "LR");
const Role Role::DATA_DISTRIBUTOR("DataDistributor", "DD"); const Role Role::DATA_DISTRIBUTOR("DataDistributor", "DD");
const Role Role::RATEKEEPER("Ratekeeper", "RK"); const Role Role::RATEKEEPER("Ratekeeper", "RK");

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

@ -97,7 +97,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
ConsistencyCheckWorkload(WorkloadContext const& wcx) : TestWorkload(wcx) { ConsistencyCheckWorkload(WorkloadContext const& wcx) : TestWorkload(wcx) {
performQuiescentChecks = getOption(options, LiteralStringRef("performQuiescentChecks"), false); performQuiescentChecks = getOption(options, LiteralStringRef("performQuiescentChecks"), false);
performCacheCheck = getOption(options, LiteralStringRef("performCacheCheck"), false); performCacheCheck = getOption(options, LiteralStringRef("performCacheCheck"), false);
performTSSCheck = getOption(options, LiteralStringRef("performTSSCheck"), false); performTSSCheck = getOption(options, LiteralStringRef("performTSSCheck"), true);
quiescentWaitTimeout = getOption(options, LiteralStringRef("quiescentWaitTimeout"), 600.0); quiescentWaitTimeout = getOption(options, LiteralStringRef("quiescentWaitTimeout"), 600.0);
distributed = getOption(options, LiteralStringRef("distributed"), true); distributed = getOption(options, LiteralStringRef("distributed"), true);
shardSampleFactor = std::max(getOption(options, LiteralStringRef("shardSampleFactor"), 1), 1); shardSampleFactor = std::max(getOption(options, LiteralStringRef("shardSampleFactor"), 1), 1);

1
flow/ProtocolVersion.h
View File

@ -138,7 +138,6 @@ public: // introduced features
PROTOCOL_VERSION_FEATURE(0x0FDB00B070010000LL, StableInterfaces); PROTOCOL_VERSION_FEATURE(0x0FDB00B070010000LL, StableInterfaces);
PROTOCOL_VERSION_FEATURE(0x0FDB00B070010001LL, TagThrottleValueReason); PROTOCOL_VERSION_FEATURE(0x0FDB00B070010001LL, TagThrottleValueReason);
PROTOCOL_VERSION_FEATURE(0x0FDB00B070010001LL, SpanContext); PROTOCOL_VERSION_FEATURE(0x0FDB00B070010001LL, SpanContext);
// TODO is this right?
PROTOCOL_VERSION_FEATURE(0x0FDB00B070010001LL, TSS); PROTOCOL_VERSION_FEATURE(0x0FDB00B070010001LL, TSS);
}; };