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

fixing code probe issues

This commit is contained in:
Josh Slocum 2023-04-20 10:41:53 -05:00 committed by Trevor Clinkenbeard
parent e2df6e3302
commit ae862e1b96
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fdbclient/BlobGranuleFiles.cpp
View File

@ -372,7 +372,6 @@ struct IndexBlockRef {
void init(Optional<BlobGranuleCipherKeysCtx> cipherKeysCtx, Arena& arena) {
if (encryptHeaderRef.present()) {
CODE_PROBE(true, "reading encrypted chunked file");
ASSERT(cipherKeysCtx.present());
decrypt(cipherKeysCtx.get(), *this, arena);
@ -576,7 +575,6 @@ struct IndexBlobGranuleFileChunkRef {
dataReader.deserialize(FileIdentifierFor<IndexBlobGranuleFileChunkRef>::value, chunkRef, arena);
if (chunkRef.encryptHeaderRef.present()) {
CODE_PROBE(true, "reading encrypted file chunk");
ASSERT(cipherKeysCtx.present());
chunkRef.chunkBytes = IndexBlobGranuleFileChunkRef::decrypt(cipherKeysCtx.get(), chunkRef, arena);
} else {
@ -584,7 +582,6 @@ struct IndexBlobGranuleFileChunkRef {
}
if (chunkRef.compressionFilter.present()) {
CODE_PROBE(true, "reading compressed file chunk");
chunkRef.chunkBytes = IndexBlobGranuleFileChunkRef::decompress(chunkRef, arena);
} else if (!chunkRef.chunkBytes.present()) {
// 'Encryption' & 'Compression' aren't enabled.

2
fdbserver/SimKmsConnector.actor.cpp
View File

@ -297,7 +297,7 @@ ACTOR Future<Void> blobMetadataLookup(KmsConnectorInterface interf, KmsConnBlobM
swapAndPop(&rep.metadataDetails, deterministicRandom()->randomInt(0, rep.metadataDetails.size()));
}
} else {
req.reply.sendError(operation_failed());
req.reply.sendError(connection_failed());
return Void();
}
}

2
fdbserver/storageserver.actor.cpp
View File

@ -3260,7 +3260,7 @@ ACTOR Future<std::pair<ChangeFeedStreamReply, bool>> getChangeFeedMutations(Stor
// the end
if ((reply.mutations.empty() || reply.mutations.back().version < lastMemoryVersion) &&
remainingLimitBytes <= 0) {
CODE_PROBE(true, "Memory feed adding empty version after memory filtered");
CODE_PROBE(true, "Memory feed adding empty version after memory filtered", probe::decoration::rare);
reply.mutations.push_back(reply.arena, MutationsAndVersionRef(lastMemoryVersion, lastMemoryKnownCommitted));
}
}