Skip to content

Commit 48064f6

Browse files
sprazaspraza
authored
Make some codeprobes rare (#11607)
* Make BlobGranule code probes rare * Make encryption related code probes rare * fixup! Fix formatting
1 parent 9381d35 commit 48064f6

16 files changed

+73
-57
lines changed

‎fdbclient/BackupAgentBase.actor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ ACTOR static Future<Void> decodeBackupLogValue(Arena* arena,
402402
.detail("TenantId", domainId);
403403
if (e.code() == error_code_encrypt_keys_fetch_failed ||
404404
e.code() == error_code_encrypt_key_not_found) {
405-
CODE_PROBE(true, "mutation log restore encrypt keys not found");
405+
CODE_PROBE(true, "mutation log restore encrypt keys not found", probe::decoration::rare);
406406
consumed += BackupAgentBase::logHeaderSize + len1 + len2;
407407
continue;
408408
} else {

‎fdbclient/BlobCipher.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ void BlobCipherKey::initKey(const EncryptCipherDomainId& domainId,
441441
TraceEvent(SevWarnAlways, "MaxBaseCipherKeyLimit")
442442
.detail("MaxAllowed", MAX_BASE_CIPHER_LEN)
443443
.detail("BaseCipherLen", baseCiphLen);
444-
CODE_PROBE(true, "Encryption max base cipher len violation");
444+
CODE_PROBE(true, "Encryption max base cipher len violation", probe::decoration::rare);
445445
throw encrypt_max_base_cipher_len();
446446
}
447447

@@ -1241,7 +1241,7 @@ Reference<EncryptBuf> EncryptBlobCipherAes265Ctr::encrypt(const uint8_t* plainte
12411241
*encryptTime = timer_monotonic() - startTime;
12421242
}
12431243

1244-
CODE_PROBE(true, "BlobCipher data encryption");
1244+
CODE_PROBE(true, "BlobCipher data encryption", probe::decoration::rare);
12451245
CODE_PROBE(header->flags.authTokenAlgo == EncryptAuthTokenMode::ENCRYPT_HEADER_AUTH_TOKEN_MODE_NONE,
12461246
"Encryption authentication disabled");
12471247
CODE_PROBE(header->flags.authTokenAlgo == EncryptAuthTokenAlgo::ENCRYPT_HEADER_AUTH_TOKEN_ALGO_HMAC_SHA,
@@ -1287,7 +1287,7 @@ void EncryptBlobCipherAes265Ctr::encryptInplace(uint8_t* plaintext,
12871287
*encryptTime = timer_monotonic() - startTime;
12881288
}
12891289

1290-
CODE_PROBE(true, "encryptInplace: BlobCipher data encryption");
1290+
CODE_PROBE(true, "encryptInplace: BlobCipher data encryption", probe::decoration::rare);
12911291
CODE_PROBE(header->flags.authTokenAlgo == EncryptAuthTokenMode::ENCRYPT_HEADER_AUTH_TOKEN_MODE_NONE,
12921292
"encryptInplace: Encryption authentication disabled");
12931293
CODE_PROBE(header->flags.authTokenAlgo == EncryptAuthTokenAlgo::ENCRYPT_HEADER_AUTH_TOKEN_ALGO_HMAC_SHA,
@@ -1411,7 +1411,7 @@ void DecryptBlobCipherAes256Ctr::validateEncryptHeaderFlagsV1(const uint32_t hea
14111411
.detail("ExpectedCipherMode", EncryptCipherMode::ENCRYPT_CIPHER_MODE_AES_256_CTR)
14121412
.detail("EncryptHeaderAuthTokenMode", flags.authTokenMode);
14131413

1414-
CODE_PROBE(true, "ConfigurableEncryption: Encryption header metadata mismatch");
1414+
CODE_PROBE(true, "ConfigurableEncryption: Encryption header metadata mismatch", probe::decoration::rare);
14151415

14161416
throw encrypt_header_metadata_mismatch();
14171417
}
@@ -1559,7 +1559,7 @@ void DecryptBlobCipherAes256Ctr::verifyEncryptHeaderMetadata(const BlobCipherEnc
15591559
.detail("ExpectedCipherMode", EncryptCipherMode::ENCRYPT_CIPHER_MODE_AES_256_CTR)
15601560
.detail("EncryptHeaderAuthTokenMode", header.flags.authTokenMode);
15611561

1562-
CODE_PROBE(true, "Encryption header metadata mismatch");
1562+
CODE_PROBE(true, "Encryption header metadata mismatch", probe::decoration::rare);
15631563

15641564
throw encrypt_header_metadata_mismatch();
15651565
}

‎fdbclient/BlobGranuleFiles.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ struct IndexBlockRef {
372372
// Compressing indexBlock will need offset recalculation (circular dependency). IndexBlock size is bounded
373373
// by number of chunks and sizeof(KeyPrefix), 'not' compressing IndexBlock shouldn't cause significant file
374374
// size bloat.
375-
CODE_PROBE(true, "encrypting index block");
375+
CODE_PROBE(true, "encrypting index block", probe::decoration::rare);
376376
ASSERT(cipherKeysCtx.present());
377377
encrypt(cipherKeysCtx.get(), arena);
378378
} else {
@@ -513,7 +513,7 @@ struct IndexBlobGranuleFileChunkRef {
513513
}
514514

515515
if (cipherKeysCtx.present()) {
516-
CODE_PROBE(true, "encrypting granule chunk");
516+
CODE_PROBE(true, "encrypting granule chunk", probe::decoration::rare);
517517
IndexBlobGranuleFileChunkRef::encrypt(cipherKeysCtx.get(), chunkRef, arena);
518518
}
519519

@@ -743,8 +743,8 @@ Value serializeChunkedSnapshot(const Standalone<StringRef>& fileNameRef,
743743
.detail("Compressed", compressFilter.present());
744744
}
745745

746-
CODE_PROBE(compressFilter.present(), "serializing compressed snapshot file");
747-
CODE_PROBE(cipherKeysCtx.present(), "serializing encrypted snapshot file");
746+
CODE_PROBE(compressFilter.present(), "serializing compressed snapshot file", probe::decoration::rare);
747+
CODE_PROBE(cipherKeysCtx.present(), "serializing encrypted snapshot file", probe::decoration::rare);
748748
Standalone<IndexedBlobGranuleFile> file;
749749

750750
file.init(SNAPSHOT_FILE_TYPE, cipherKeysCtx);
@@ -903,7 +903,7 @@ void updateMutationBoundary(Standalone<DeltaBoundaryRef>& boundary, const ValueA
903903
// duplicate same set even if it's the same as the last one, so beginVersion reads still get updates
904904
boundary.values.push_back(boundary.arena(), update);
905905
} else {
906-
CODE_PROBE(true, "multiple boundary updates at same version (set)");
906+
CODE_PROBE(true, "multiple boundary updates at same version (set)", probe::decoration::rare);
907907
// preserve inter-mutation order by replacing this one
908908
boundary.values.back() = update;
909909
}
@@ -914,12 +914,12 @@ void updateMutationBoundary(Standalone<DeltaBoundaryRef>& boundary, const ValueA
914914
// with beginVersion
915915
boundary.values.push_back(boundary.arena(), update);
916916
} else if (!boundary.values.empty() && boundary.values.back().version == update.version) {
917-
CODE_PROBE(true, "multiple boundary updates at same version (clear)");
917+
CODE_PROBE(true, "multiple boundary updates at same version (clear)", probe::decoration::rare);
918918
if (boundary.values.back().isSet()) {
919919
// if the last 2 updates were clear @ v1 and set @ v2, and we now have a clear at v2, just pop off the
920920
// set and leave the previous clear. Otherwise, just set the last set to a clear
921921
if (boundary.values.size() >= 2 && boundary.values[boundary.values.size() - 2].isClear()) {
922-
CODE_PROBE(true, "clear then set/clear at same version optimization");
922+
CODE_PROBE(true, "clear then set/clear at same version optimization", probe::decoration::rare);
923923
boundary.values.pop_back();
924924
} else {
925925
boundary.values.back() = update;
@@ -1008,8 +1008,8 @@ Value serializeChunkedDeltaFile(const Standalone<StringRef>& fileNameRef,
10081008
.detail("Compressed", compressFilter.present());
10091009
}
10101010

1011-
CODE_PROBE(compressFilter.present(), "serializing compressed delta file");
1012-
CODE_PROBE(cipherKeysCtx.present(), "serializing encrypted delta file");
1011+
CODE_PROBE(compressFilter.present(), "serializing compressed delta file", probe::decoration::rare);
1012+
CODE_PROBE(cipherKeysCtx.present(), "serializing encrypted delta file", probe::decoration::rare);
10131013
Standalone<IndexedBlobGranuleFile> file;
10141014

10151015
file.init(DELTA_FILE_TYPE, cipherKeysCtx);

‎fdbclient/FileBackupAgent.actor.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1206,7 +1206,7 @@ ACTOR Future<Standalone<VectorRef<KeyValueRef>>> decodeRangeFileBlock(Reference<
12061206
if (file_version == BACKUP_AGENT_SNAPSHOT_FILE_VERSION) {
12071207
wait(decodeKVPairs(&reader, &results, false, encryptMode, Optional<int64_t>(), tenantCache));
12081208
} else if (file_version == BACKUP_AGENT_ENCRYPTED_SNAPSHOT_FILE_VERSION) {
1209-
CODE_PROBE(true, "decoding encrypted block");
1209+
CODE_PROBE(true, "decoding encrypted block", probe::decoration::rare);
12101210
// read header size
12111211
state uint32_t headerLen = reader.consume<uint32_t>();
12121212
// read the encryption header
@@ -1241,11 +1241,11 @@ ACTOR Future<Standalone<VectorRef<KeyValueRef>>> decodeRangeFileBlock(Reference<
12411241
if (e.code() == error_code_encrypt_keys_fetch_failed || e.code() == error_code_encrypt_key_not_found) {
12421242
ASSERT(!isReservedEncryptDomain(blockDomainId));
12431243
TraceEvent(SevWarnAlways, "SnapshotRestoreEncryptKeyFetchFailed").detail("TenantId", blockDomainId);
1244-
CODE_PROBE(true, "Snapshot restore encrypt keys not found");
1244+
CODE_PROBE(true, "Snapshot restore encrypt keys not found", probe::decoration::rare);
12451245
} else if (e.code() == error_code_tenant_not_found) {
12461246
ASSERT(!isReservedEncryptDomain(blockDomainId));
12471247
TraceEvent(SevWarnAlways, "EncryptedSnapshotRestoreTenantNotFound").detail("TenantId", blockDomainId);
1248-
CODE_PROBE(true, "Encrypted Snapshot restore tenant not found");
1248+
CODE_PROBE(true, "Encrypted Snapshot restore tenant not found", probe::decoration::rare);
12491249
}
12501250
TraceEvent(SevWarn, "FileRestoreDecodeRangeFileBlockFailed")
12511251
.error(e)
@@ -1928,7 +1928,7 @@ struct BackupRangeTaskFunc : BackupTaskFuncBase {
19281928
TraceEvent(SevDebug, "EncryptionMode").detail("EncryptMode", encryptMode.toString());
19291929
// Initialize range file writer and write begin key
19301930
if (encryptMode.mode != EncryptionAtRestMode::DISABLED) {
1931-
CODE_PROBE(true, "using encrypted snapshot file writer");
1931+
CODE_PROBE(true, "using encrypted snapshot file writer", probe::decoration::rare);
19321932
rangeFile = std::make_unique<EncryptedRangeFileWriter>(
19331933
cx, &arena, encryptMode, tenantCache, outFile, blockSize);
19341934
} else {

‎fdbserver/ApplyMetadataMutation.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@ class ApplyMetadataMutationsImpl {
205205
} else {
206206
ASSERT(cipherKeys != nullptr);
207207
Arena arena;
208-
CODE_PROBE(!forResolver, "encrypting metadata mutations");
209-
CODE_PROBE(forResolver, "encrypting resolver mutations");
208+
CODE_PROBE(!forResolver, "encrypting metadata mutations", probe::decoration::rare);
209+
CODE_PROBE(forResolver, "encrypting resolver mutations", probe::decoration::rare);
210210
toCommit->writeTypedMessage(m.encryptMetadata(*cipherKeys, arena, BlobCipherMetrics::TLOG));
211211
}
212212
}

‎fdbserver/BlobGranuleServerCommon.actor.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ ACTOR Future<Void> loadBlobMetadataForTenants(BGTenantMap* self, std::vector<Blo
516516
TraceEvent(SevWarn, "BlobMetadataFetchMissingTenants")
517517
.suppressFor(30.0)
518518
.detail("Count", missingIds.size());
519-
CODE_PROBE(true, "blob metadata fetch missing tenants");
519+
CODE_PROBE(true, "blob metadata fetch missing tenants", probe::decoration::rare);
520520

521521
req.domainIds.clear();
522522
for (auto& id : missingIds) {
@@ -537,7 +537,7 @@ ACTOR Future<Void> loadBlobMetadataForTenants(BGTenantMap* self, std::vector<Blo
537537
if (e.code() == error_code_operation_cancelled) {
538538
throw e;
539539
}
540-
CODE_PROBE(true, "blob metadata fetch error");
540+
CODE_PROBE(true, "blob metadata fetch error", probe::decoration::rare);
541541
TraceEvent(SevWarn, "BlobMetadataFetchError").errorUnsuppressed(e).suppressFor(30.0);
542542
// need to reset request on error
543543
prevEKPID = UID();
@@ -598,7 +598,7 @@ ACTOR Future<Reference<GranuleTenantData>> getDataForGranuleActor(BGTenantMap* s
598598
return tenant;
599599
} else if (!tenant->startedLoadingBStore || (tenant->bstore.isValid() && tenant->bstore->isExpired())) {
600600
tenant->startedLoadingBStore = true;
601-
CODE_PROBE(true, "re-fetching expired blob metadata");
601+
CODE_PROBE(true, "re-fetching expired blob metadata", probe::decoration::rare);
602602

603603
// even if this actor gets cancelled, we marked it as startedLoading, so finish the load in the actor
604604
// collection
@@ -659,7 +659,7 @@ ACTOR Future<Reference<BlobConnectionProvider>> loadBStoreForTenant(BGTenantMap*
659659
wait(delay(0));
660660
return data->bstore;
661661
} else {
662-
CODE_PROBE(true, "bstore for unknown tenant");
662+
CODE_PROBE(true, "bstore for unknown tenant", probe::decoration::rare);
663663
// Assume not loaded yet, just wait a bit. Could do sophisticated mechanism but will redo tenant
664664
// loading to be versioned anyway. 10 retries means it's likely not a transient race with
665665
// loading tenants, and instead a persistent issue.

‎fdbserver/BlobGranuleValidation.actor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ ACTOR Future<Void> clearAndAwaitMerge(Database cx, KeyRange range) {
200200
if (ranges.size() == 1) {
201201
return Void();
202202
}
203-
CODE_PROBE(true, "ClearAndAwaitMerge doing clear");
203+
CODE_PROBE(true, "ClearAndAwaitMerge doing clear", probe::decoration::rare);
204204
reClearCount--;
205205
if (reClearCount <= 0) {
206206
tr.clear(range);
@@ -284,7 +284,7 @@ ACTOR Future<Void> validateGranuleSummaries(Database cx,
284284
}
285285

286286
if (lastSummaryVersion != invalidVersion) {
287-
CODE_PROBE(true, "comparing multiple summaries");
287+
CODE_PROBE(true, "comparing multiple summaries", probe::decoration::rare);
288288
// diff with last summary ranges to ensure versions never decreased for any range
289289
for (auto& it : nextSummary) {
290290
auto lastSummaries = lastSummary.intersectingRanges(it.keyRange);

‎fdbserver/BlobWorker.actor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -5603,7 +5603,7 @@ ACTOR Future<Void> checkUpdateEncryptionAtRestMode(Reference<BlobWorkerData> sel
56035603
} else {
56045604
self->persistedEncryptMode = encryptionAtRestMode;
56055605
if (self->storage) {
5606-
CODE_PROBE(true, "BlobWorker: Persisting encryption at rest mode");
5606+
CODE_PROBE(true, "BlobWorker: Persisting encryption at rest mode", probe::decoration::rare);
56075607
self->storage->set(KeyValueRef(persistEncryptionAtRestModeKey, self->persistedEncryptMode.get().toValue()));
56085608
wait(self->storage->commit());
56095609
TraceEvent("BlobWorkerPersistEncryptionAtRestMode", self->id)
@@ -5702,7 +5702,7 @@ ACTOR Future<UID> restorePersistentState(Reference<BlobWorkerData> self) {
57025702
ASSERT(recoveredID != self->id);
57035703

57045704
if (fEncryptionAtRestMode.get().present()) {
5705-
CODE_PROBE(true, "BlobWorker: Retrieved persisted encryption at rest mode");
5705+
CODE_PROBE(true, "BlobWorker: Retrieved persisted encryption at rest mode", probe::decoration::rare);
57065706
self->persistedEncryptMode =
57075707
Optional<EncryptionAtRestMode>(EncryptionAtRestMode::fromValue(fEncryptionAtRestMode.get()));
57085708
TraceEvent("BlobWorkerPersistEncryptionAtRestModeRead", self->id)

‎fdbserver/ClusterRecovery.actor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,7 @@ ACTOR Future<Void> readTransactionSystemState(Reference<ClusterRecoveryData> sel
10991099
EncryptionAtRestMode encryptMode = wait(self->controllerData->encryptionAtRestMode.getFuture());
11001100
enableEncryptionForTxnStateStore = encryptMode.isEncryptionEnabled();
11011101
}
1102-
CODE_PROBE(enableEncryptionForTxnStateStore, "Enable encryption for txnStateStore");
1102+
CODE_PROBE(enableEncryptionForTxnStateStore, "Enable encryption for txnStateStore", probe::decoration::rare);
11031103
if (self->txnStateStore)
11041104
self->txnStateStore->close();
11051105
self->txnStateLogAdapter = openDiskQueueAdapter(oldLogSystem, myLocality, txsPoppedVersion);

‎fdbserver/CommitProxyServer.actor.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -1044,14 +1044,14 @@ EncryptCipherDomainId getEncryptDetailsFromMutationRef(ProxyCommitData* commitDa
10441044
// 2. Transaction can be a multi-key transaction spawning multiple tenants
10451045
// For now fallback to 'default encryption domain'
10461046

1047-
CODE_PROBE(true, "ClearRange mutation encryption");
1047+
CODE_PROBE(true, "ClearRange mutation encryption", probe::decoration::rare);
10481048
}
10491049

10501050
// Unknown tenant, fallback to fdb default encryption domain
10511051
if (domainId == INVALID_ENCRYPT_DOMAIN_ID) {
10521052
domainId = FDB_DEFAULT_ENCRYPT_DOMAIN_ID;
10531053

1054-
CODE_PROBE(true, "Default domain mutation encryption");
1054+
CODE_PROBE(true, "Default domain mutation encryption", probe::decoration::rare);
10551055
}
10561056

10571057
return domainId;
@@ -1817,7 +1817,7 @@ ACTOR Future<WriteMutationRefVar> writeMutationEncryptedMutation(CommitBatchCont
18171817
ASSERT(decryptedMutation.param1 == mutation->param1);
18181818
ASSERT(decryptedMutation.param2 == mutation->param2);
18191819

1820-
CODE_PROBE(true, "encrypting non-metadata mutations");
1820+
CODE_PROBE(true, "encrypting non-metadata mutations", probe::decoration::rare);
18211821
self->toCommit.writeTypedMessage(encryptedMutation);
18221822
return encryptedMutation;
18231823
}
@@ -1852,7 +1852,7 @@ Future<WriteMutationRefVar> writeMutation(CommitBatchContext* self,
18521852
CODE_PROBE(self->pProxyCommitData->getTenantMode() == TenantMode::REQUIRED, "using required tenant mode");
18531853

18541854
if (encryptedMutationOpt && encryptedMutationOpt->present()) {
1855-
CODE_PROBE(true, "using already encrypted mutation");
1855+
CODE_PROBE(true, "using already encrypted mutation", probe::decoration::rare);
18561856
encryptedMutation = encryptedMutationOpt->get();
18571857
ASSERT(encryptedMutation.isEncrypted());
18581858
// During simulation check whether the encrypted mutation matches the decrpyted mutation
@@ -1862,15 +1862,15 @@ Future<WriteMutationRefVar> writeMutation(CommitBatchContext* self,
18621862
} else {
18631863
if (domainId == INVALID_ENCRYPT_DOMAIN_ID) {
18641864
domainId = getEncryptDetailsFromMutationRef(self->pProxyCommitData, *mutation);
1865-
CODE_PROBE(true, "Raw access mutation encryption");
1865+
CODE_PROBE(true, "Raw access mutation encryption", probe::decoration::rare);
18661866
}
18671867
ASSERT_NE(domainId, INVALID_ENCRYPT_DOMAIN_ID);
18681868
ASSERT(self->cipherKeys.count(domainId) > 0);
18691869
encryptedMutation =
18701870
mutation->encrypt(self->cipherKeys, domainId, *arena, BlobCipherMetrics::TLOG, encryptTime);
18711871
}
18721872
ASSERT(encryptedMutation.isEncrypted());
1873-
CODE_PROBE(true, "encrypting non-metadata mutations");
1873+
CODE_PROBE(true, "encrypting non-metadata mutations", probe::decoration::rare);
18741874
self->toCommit.writeTypedMessage(encryptedMutation);
18751875
return std::variant<MutationRef, VectorRef<MutationRef>>{ encryptedMutation };
18761876
} else {
@@ -1918,7 +1918,7 @@ double pushToBackupMutations(CommitBatchContext* self,
19181918
// Add the mutation to the relevant backup tag
19191919
for (auto backupName : pProxyCommitData->vecBackupKeys[m.param1]) {
19201920
// If encryption is enabled make sure the mutation we are writing is also encrypted
1921-
CODE_PROBE(writtenMutation.isEncrypted(), "using encrypted backup mutation");
1921+
CODE_PROBE(writtenMutation.isEncrypted(), "using encrypted backup mutation", probe::decoration::rare);
19221922
self->logRangeMutations[backupName].push_back_deep(self->logRangeMutationsArena, writtenMutation);
19231923
}
19241924

@@ -1938,7 +1938,7 @@ double pushToBackupMutations(CommitBatchContext* self,
19381938
MutationRef backupMutation(MutationRef::Type::ClearRange, intersectionRange.begin, intersectionRange.end);
19391939

19401940
if (pProxyCommitData->encryptMode.isEncryptionEnabled()) {
1941-
CODE_PROBE(true, "encrypting clear range backup mutation");
1941+
CODE_PROBE(true, "encrypting clear range backup mutation", probe::decoration::rare);
19421942
if (backupMutation.param1 == m.param1 && backupMutation.param2 == m.param2 &&
19431943
encryptedMutation.present()) {
19441944
backupMutation = encryptedMutation.get();
@@ -2318,7 +2318,7 @@ ACTOR Future<Void> postResolution(CommitBatchContext* self) {
23182318
auto& tags = pProxyCommitData->tagsForKey(kv.key);
23192319
self->toCommit.addTags(tags);
23202320
if (self->pProxyCommitData->encryptMode.isEncryptionEnabled()) {
2321-
CODE_PROBE(true, "encrypting idempotency mutation");
2321+
CODE_PROBE(true, "encrypting idempotency mutation", probe::decoration::rare);
23222322
EncryptCipherDomainId domainId =
23232323
getEncryptDetailsFromMutationRef(self->pProxyCommitData, idempotencyIdSet);
23242324
MutationRef encryptedMutation =

‎fdbserver/SimulatedCluster.actor.cpp

+9-4
Original file line numberDiff line numberDiff line change
@@ -1703,7 +1703,7 @@ void SimulationConfig::setEncryptionAtRestMode(const TestConfig& testConfig) {
17031703
deterministicRandom()->random01() < SERVER_KNOBS->DISABLED_ENCRYPTION_PROBABILITY_SIM) {
17041704
EncryptionAtRestMode encryptionMode = EncryptionAtRestMode::DISABLED;
17051705
TraceEvent("SimulatedClusterEncryptionMode").detail("Mode", encryptionMode.toString());
1706-
CODE_PROBE(true, "Enforce to disable encryption in simulation");
1706+
CODE_PROBE(true, "Enforce to disable encryption in simulation", probe::decoration::rare);
17071707
set_config("encryption_at_rest_mode=" + encryptionMode.toString());
17081708
return;
17091709
}
@@ -1757,9 +1757,14 @@ void SimulationConfig::setEncryptionAtRestMode(const TestConfig& testConfig) {
17571757
r -= probability[mode];
17581758
}
17591759
TraceEvent("SimulatedClusterEncryptionMode").detail("Mode", encryptionMode.toString());
1760-
CODE_PROBE(encryptionMode == EncryptionAtRestMode::DISABLED, "Disabled encryption in simulation");
1761-
CODE_PROBE(encryptionMode == EncryptionAtRestMode::CLUSTER_AWARE, "Enabled cluster-aware encryption in simulation");
1762-
CODE_PROBE(encryptionMode == EncryptionAtRestMode::DOMAIN_AWARE, "Enabled domain-aware encryption in simulation");
1760+
CODE_PROBE(
1761+
encryptionMode == EncryptionAtRestMode::DISABLED, "Disabled encryption in simulation", probe::decoration::rare);
1762+
CODE_PROBE(encryptionMode == EncryptionAtRestMode::CLUSTER_AWARE,
1763+
"Enabled cluster-aware encryption in simulation",
1764+
probe::decoration::rare);
1765+
CODE_PROBE(encryptionMode == EncryptionAtRestMode::DOMAIN_AWARE,
1766+
"Enabled domain-aware encryption in simulation",
1767+
probe::decoration::rare);
17631768
set_config("encryption_at_rest_mode=" + encryptionMode.toString());
17641769
}
17651770

0 commit comments

Comments
 (0)