From cd2176ac153077472ae7aadad08dbd0f4eb0adc3 Mon Sep 17 00:00:00 2001 From: "A.J. Beamon" Date: Mon, 4 May 2020 10:37:53 -0700 Subject: [PATCH] Adjust some knobs --- fdbclient/Knobs.cpp | 4 ++-- fdbclient/NativeAPI.actor.cpp | 2 +- fdbserver/Knobs.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fdbclient/Knobs.cpp b/fdbclient/Knobs.cpp index 07fad38d6b..d585fb96f9 100644 --- a/fdbclient/Knobs.cpp +++ b/fdbclient/Knobs.cpp @@ -222,9 +222,9 @@ void ClientKnobs::initialize(bool randomize) { init( TRACE_LOG_FILE_IDENTIFIER_MAX_LENGTH, 50 ); // transaction tags - init( MAX_TAGS_PER_TRANSACTION, 100 ); - init( MAX_TRANSACTION_TAG_LENGTH, 100 ); init( READ_TAG_SAMPLE_RATE, 0.01 ); // Communicated to clients from cluster + init( MAX_TAGS_PER_TRANSACTION, 5 ); + init( MAX_TRANSACTION_TAG_LENGTH, 16 ); init( TAG_THROTTLE_SMOOTHING_WINDOW, 2.0 ); init( TAG_THROTTLE_RECHECK_INTERVAL, 5.0 ); if( randomize && BUGGIFY ) TAG_THROTTLE_RECHECK_INTERVAL = 0.0; init( TAG_THROTTLE_EXPIRATION_INTERVAL, 60.0 ); if( randomize && BUGGIFY ) TAG_THROTTLE_EXPIRATION_INTERVAL = 1.0; diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp index 1786deba9c..c121ebb983 100644 --- a/fdbclient/NativeAPI.actor.cpp +++ b/fdbclient/NativeAPI.actor.cpp @@ -2122,7 +2122,7 @@ bool DatabaseContext::debugUseTags = true; const std::vector DatabaseContext::debugTransactionTagChoices = { "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t" }; void debugAddTags(Transaction *tr) { - int numTags = deterministicRandom()->randomInt(0, 11); + int numTags = deterministicRandom()->randomInt(0, SERVER_KNOBS->MAX_TAGS_PER_TRANSACTION+1); for(int i = 0; i < numTags; ++i) { TransactionTag tag; if(deterministicRandom()->random01() < 0.7) { diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp index 36bd6e163d..bf9000adc1 100644 --- a/fdbserver/Knobs.cpp +++ b/fdbserver/Knobs.cpp @@ -489,7 +489,7 @@ void ServerKnobs::initialize(bool randomize, ClientKnobs* clientKnobs, bool isSi init( STORAGE_SERVER_LIST_FETCH_TIMEOUT, 20.0 ); init( MAX_AUTO_THROTTLED_TRANSACTION_TAGS, 5 ); if(randomize && BUGGIFY) MAX_AUTO_THROTTLED_TRANSACTION_TAGS = 1; - init( MAX_MANUAL_THROTTLED_TRANSACTION_TAGS, 100 ); if(randomize && BUGGIFY) MAX_MANUAL_THROTTLED_TRANSACTION_TAGS = 1; + init( MAX_MANUAL_THROTTLED_TRANSACTION_TAGS, 40 ); if(randomize && BUGGIFY) MAX_MANUAL_THROTTLED_TRANSACTION_TAGS = 1; init( MIN_TAG_COST, 1000 ); if(randomize && BUGGIFY) MIN_TAG_COST = 0.0; init( AUTO_THROTTLE_TARGET_TAG_BUSYNESS, 0.1 ); if(randomize && BUGGIFY) AUTO_THROTTLE_TARGET_TAG_BUSYNESS = 0.0; init( AUTO_TAG_THROTTLE_RAMP_UP_TIME, 120.0 ); if(randomize && BUGGIFY) AUTO_TAG_THROTTLE_RAMP_UP_TIME = 5.0;