From cf453548333027dc49d240efcfc0e263d2224728 Mon Sep 17 00:00:00 2001 From: Josh Slocum Date: Wed, 12 Jan 2022 08:10:53 -0600 Subject: [PATCH] switched buggified and expected shard size for simulation --- fdbclient/ClientKnobs.cpp | 2 +- fdbclient/ServerKnobs.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fdbclient/ClientKnobs.cpp b/fdbclient/ClientKnobs.cpp index e58cb7b2ee..18b390957f 100644 --- a/fdbclient/ClientKnobs.cpp +++ b/fdbclient/ClientKnobs.cpp @@ -67,7 +67,7 @@ void ClientKnobs::initialize(Randomize randomize) { init( RESOURCE_CONSTRAINED_MAX_BACKOFF, 30.0 ); init( PROXY_COMMIT_OVERHEAD_BYTES, 23 ); //The size of serializing 7 tags (3 primary, 3 remote, 1 log router) + 2 for the tag length init( SHARD_STAT_SMOOTH_AMOUNT, 5.0 ); - init( INIT_MID_SHARD_BYTES, 50000000 ); if( randomize && !BUGGIFY ) INIT_MID_SHARD_BYTES = 40000; else if(randomize && BUGGIFY_WITH_PROB(0.75)) INIT_MID_SHARD_BYTES = 200000; // The same value as SERVER_KNOBS->MIN_SHARD_BYTES + init( INIT_MID_SHARD_BYTES, 50000000 ); if( randomize && BUGGIFY ) INIT_MID_SHARD_BYTES = 40000; else if(randomize && !BUGGIFY) INIT_MID_SHARD_BYTES = 200000; // The same value as SERVER_KNOBS->MIN_SHARD_BYTES init( TRANSACTION_SIZE_LIMIT, 1e7 ); init( KEY_SIZE_LIMIT, 1e4 ); diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp index e316e8548c..bc0f3edd46 100644 --- a/fdbclient/ServerKnobs.cpp +++ b/fdbclient/ServerKnobs.cpp @@ -147,11 +147,11 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi // Data distribution init( RETRY_RELOCATESHARD_DELAY, 0.1 ); init( DATA_DISTRIBUTION_FAILURE_REACTION_TIME, 60.0 ); if( randomize && BUGGIFY ) DATA_DISTRIBUTION_FAILURE_REACTION_TIME = 1.0; - bool smallShards = randomize && !BUGGIFY; - bool buggifyMediumShards = !smallShards && randomize && BUGGIFY_WITH_PROB(0.75); // prefer smaller shards in simulation - init( MIN_SHARD_BYTES, 50000000 ); if( smallShards ) MIN_SHARD_BYTES = 40000; if (buggifyMediumShards) MIN_SHARD_BYTES = 200000; //FIXME: data distribution tracker (specifically StorageMetrics) relies on this number being larger than the maximum size of a key value pair + bool buggifySmallShards = randomize && BUGGIFY; + bool simulationMediumShards = !buggifySmallShards && randomize && !BUGGIFY; // prefer smaller shards in simulation + init( MIN_SHARD_BYTES, 50000000 ); if( buggifySmallShards ) MIN_SHARD_BYTES = 40000; if (simulationMediumShards) MIN_SHARD_BYTES = 200000; //FIXME: data distribution tracker (specifically StorageMetrics) relies on this number being larger than the maximum size of a key value pair init( SHARD_BYTES_RATIO, 4 ); - init( SHARD_BYTES_PER_SQRT_BYTES, 45 ); if( smallShards ) SHARD_BYTES_PER_SQRT_BYTES = 0;//Approximately 10000 bytes per shard + init( SHARD_BYTES_PER_SQRT_BYTES, 45 ); if( buggifySmallShards ) SHARD_BYTES_PER_SQRT_BYTES = 0;//Approximately 10000 bytes per shard init( MAX_SHARD_BYTES, 500000000 ); init( KEY_SERVER_SHARD_BYTES, 500000000 ); init( SHARD_MAX_READ_DENSITY_RATIO, 8.0); if (randomize && BUGGIFY) SHARD_MAX_READ_DENSITY_RATIO = 2.0;