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

Fixed more issues in blob granule requests

This commit is contained in:
Josh Slocum 2022-01-07 13:49:02 -06:00
parent 4d2650f4dc
commit 2c62dee5ba
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fdbserver/BlobWorker.actor.cpp
View File

@ -1817,6 +1817,7 @@ ACTOR Future<Void> blobGranuleLoadHistory(Reference<BlobWorkerData> bwData,
namespace { namespace {
bool canReplyWith(Error e) { bool canReplyWith(Error e) {
switch (e.code()) { switch (e.code()) {
case error_code_blob_granule_transaction_too_old:
case error_code_transaction_too_old: case error_code_transaction_too_old:
case error_code_future_version: // not thrown yet case error_code_future_version: // not thrown yet
case error_code_wrong_shard_server: case error_code_wrong_shard_server:
@ -2001,12 +2002,9 @@ ACTOR Future<Void> handleBlobGranuleFileRequest(Reference<BlobWorkerData> bwData
} }
state Reference<GranuleMetadata> metadata = m; state Reference<GranuleMetadata> metadata = m;
// don't do 'if (canBeSet)' choose {
if (metadata->readable.canBeSet()) { when(wait(metadata->readable.getFuture())) {}
wait(metadata->readable.getFuture()); when(wait(metadata->cancelled.getFuture())) { throw wrong_shard_server(); }
}
if (metadata->cancelled.isSet()) {
throw wrong_shard_server();
} }
state KeyRange chunkRange; state KeyRange chunkRange;
@ -2035,9 +2033,7 @@ ACTOR Future<Void> handleBlobGranuleFileRequest(Reference<BlobWorkerData> bwData
if (!cur.isValid()) { if (!cur.isValid()) {
// this request predates blob data // this request predates blob data
// FIXME: probably want a dedicated exception like blob_range_too_old or something throw blob_granule_transaction_too_old();
// instead
throw transaction_too_old();
} }
ASSERT(cur->endVersion > req.readVersion); ASSERT(cur->endVersion > req.readVersion);
@ -2134,7 +2130,7 @@ ACTOR Future<Void> handleBlobGranuleFileRequest(Reference<BlobWorkerData> bwData
i--; i--;
} }
// because of granule history, we should always be able to find the desired snapshot // because of granule history, we should always be able to find the desired snapshot
// version, and have thrown transaction_too_old earlier if not possible. // version, and have thrown blob_granule_transaction_too_old earlier if not possible.
if (i < 0) { if (i < 0) {
fmt::print("req @ {0} >= initial snapshot {1} but can't find snapshot in ({2}) files:\n", fmt::print("req @ {0} >= initial snapshot {1} but can't find snapshot in ({2}) files:\n",
req.readVersion, req.readVersion,