From 34b8c5eb2b0fb7b1a35fc7633e86a0c85f683f5c Mon Sep 17 00:00:00 2001 From: Sam Gwydir Date: Mon, 14 Nov 2022 10:47:45 -0800 Subject: [PATCH] ENCRYPT_KEY_CACHE_LOGGING_SAMPLE_SIZE -> ENCRYPT_KEY_CACHE_LOGGING_SKETCH_ACCURACY --- fdbclient/BlobCipher.cpp | 10 +++++----- flow/Knobs.cpp | 2 +- flow/include/flow/Knobs.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fdbclient/BlobCipher.cpp b/fdbclient/BlobCipher.cpp index 24bbf3ceb6..1eb338f13c 100644 --- a/fdbclient/BlobCipher.cpp +++ b/fdbclient/BlobCipher.cpp @@ -57,11 +57,11 @@ BlobCipherMetrics::CounterSet::CounterSet(CounterCollection& cc, std::string nam getCipherKeysLatency(name + "GetCipherKeysLatency", UID(), FLOW_KNOBS->ENCRYPT_KEY_CACHE_LOGGING_INTERVAL, - FLOW_KNOBS->ENCRYPT_KEY_CACHE_LOGGING_SAMPLE_SIZE), + FLOW_KNOBS->ENCRYPT_KEY_CACHE_LOGGING_SKETCH_ACCURACY), getLatestCipherKeysLatency(name + "GetLatestCipherKeysLatency", UID(), FLOW_KNOBS->ENCRYPT_KEY_CACHE_LOGGING_INTERVAL, - FLOW_KNOBS->ENCRYPT_KEY_CACHE_LOGGING_SAMPLE_SIZE) {} + FLOW_KNOBS->ENCRYPT_KEY_CACHE_LOGGING_SKETCH_ACCURACY) {} BlobCipherMetrics::BlobCipherMetrics() : cc("BlobCipher"), cipherKeyCacheHit("CipherKeyCacheHit", cc), cipherKeyCacheMiss("CipherKeyCacheMiss", cc), @@ -71,15 +71,15 @@ BlobCipherMetrics::BlobCipherMetrics() getCipherKeysLatency("GetCipherKeysLatency", UID(), FLOW_KNOBS->ENCRYPT_KEY_CACHE_LOGGING_INTERVAL, - FLOW_KNOBS->ENCRYPT_KEY_CACHE_LOGGING_SAMPLE_SIZE), + FLOW_KNOBS->ENCRYPT_KEY_CACHE_LOGGING_SKETCH_ACCURACY), getLatestCipherKeysLatency("GetLatestCipherKeysLatency", UID(), FLOW_KNOBS->ENCRYPT_KEY_CACHE_LOGGING_INTERVAL, - FLOW_KNOBS->ENCRYPT_KEY_CACHE_LOGGING_SAMPLE_SIZE), + FLOW_KNOBS->ENCRYPT_KEY_CACHE_LOGGING_SKETCH_ACCURACY), getBlobMetadataLatency("GetBlobMetadataLatency", UID(), FLOW_KNOBS->ENCRYPT_KEY_CACHE_LOGGING_INTERVAL, - FLOW_KNOBS->ENCRYPT_KEY_CACHE_LOGGING_SAMPLE_SIZE), + FLOW_KNOBS->ENCRYPT_KEY_CACHE_LOGGING_SKETCH_ACCURACY), counterSets({ CounterSet(cc, "TLog"), CounterSet(cc, "KVMemory"), CounterSet(cc, "KVRedwood"), diff --git a/flow/Knobs.cpp b/flow/Knobs.cpp index 08bf96e529..7d6132bc6c 100644 --- a/flow/Knobs.cpp +++ b/flow/Knobs.cpp @@ -302,7 +302,7 @@ void FlowKnobs::initialize(Randomize randomize, IsSimulated isSimulated) { if ( randomize && BUGGIFY) { ENCRYPT_KEY_REFRESH_INTERVAL = deterministicRandom()->randomInt(2, 10); } init( TOKEN_CACHE_SIZE, 100 ); init( ENCRYPT_KEY_CACHE_LOGGING_INTERVAL, 5.0 ); - init( ENCRYPT_KEY_CACHE_LOGGING_SAMPLE_SIZE, 1000 ); + init( ENCRYPT_KEY_CACHE_LOGGING_SKETCH_ACCURACY, 0.01 ); // Refer to EncryptUtil::EncryptAuthTokenAlgo for more details init( ENCRYPT_HEADER_AUTH_TOKEN_ENABLED, true ); if ( randomize && BUGGIFY ) { ENCRYPT_HEADER_AUTH_TOKEN_ENABLED = !ENCRYPT_HEADER_AUTH_TOKEN_ENABLED; } init( ENCRYPT_HEADER_AUTH_TOKEN_ALGO, 1 ); if ( randomize && BUGGIFY ) { ENCRYPT_HEADER_AUTH_TOKEN_ALGO = getRandomAuthTokenAlgo(); } diff --git a/flow/include/flow/Knobs.h b/flow/include/flow/Knobs.h index 0ba1e3b4ff..ee163c1038 100644 --- a/flow/include/flow/Knobs.h +++ b/flow/include/flow/Knobs.h @@ -364,7 +364,7 @@ public: int64_t ENCRYPT_CIPHER_KEY_CACHE_TTL; int64_t ENCRYPT_KEY_REFRESH_INTERVAL; double ENCRYPT_KEY_CACHE_LOGGING_INTERVAL; - double ENCRYPT_KEY_CACHE_LOGGING_SAMPLE_SIZE; + double ENCRYPT_KEY_CACHE_LOGGING_SKETCH_ACCURACY; bool ENCRYPT_HEADER_AUTH_TOKEN_ENABLED; int ENCRYPT_HEADER_AUTH_TOKEN_ALGO;