summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Larkin-York <dan.larkin-york@mongodb.com>2022-01-05 23:30:10 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-01-06 00:07:15 +0000
commit746e60c44001d9222a73a4bfd591d8fee8d45879 (patch)
tree060630cb2ac975bfbbeb6af8d191a6337c37934b
parent5ffbe2516fa2899a70b32217f668de2ba4d1c6ac (diff)
downloadmongo-746e60c44001d9222a73a4bfd591d8fee8d45879.tar.gz
SERVER-60959 Remove assumptions about error type when aborting a time-series insert batch
-rw-r--r--src/mongo/db/commands/write_commands.cpp9
-rw-r--r--src/mongo/db/timeseries/bucket_catalog.cpp7
2 files changed, 0 insertions, 16 deletions
diff --git a/src/mongo/db/commands/write_commands.cpp b/src/mongo/db/commands/write_commands.cpp
index 9f743119919..5f84b93af1e 100644
--- a/src/mongo/db/commands/write_commands.cpp
+++ b/src/mongo/db/commands/write_commands.cpp
@@ -782,15 +782,6 @@ public:
bool prepared = bucketCatalog.prepareCommit(batch);
if (!prepared) {
invariant(batch->finished());
- auto batchStatus = batch->getResult().getStatus();
- tassert(5916402,
- str::stream() << "Got unexpected error (" << batchStatus
- << ") preparing time-series bucket to be committed for "
- << ns() << ": " << redact(request().toBSON({})),
- batchStatus == ErrorCodes::TimeseriesBucketCleared ||
- batchStatus.isA<ErrorCategory::Interruption>() ||
- batchStatus.isA<ErrorCategory::StaleShardVersionError>());
-
docsToRetry->push_back(index);
return true;
}
diff --git a/src/mongo/db/timeseries/bucket_catalog.cpp b/src/mongo/db/timeseries/bucket_catalog.cpp
index 07a5d5584a4..0b7feabab1c 100644
--- a/src/mongo/db/timeseries/bucket_catalog.cpp
+++ b/src/mongo/db/timeseries/bucket_catalog.cpp
@@ -427,13 +427,6 @@ void BucketCatalog::abort(std::shared_ptr<WriteBatch> batch,
invariant(batch->_commitRights.load());
if (batch->finished()) {
- auto batchStatus = batch->getResult().getStatus();
- tassert(5916403,
- str::stream() << "Unexpected error when aborting time-series batch: "
- << batchStatus,
- batchStatus == ErrorCodes::TimeseriesBucketCleared ||
- batchStatus.isA<ErrorCategory::Interruption>() ||
- batchStatus.isA<ErrorCategory::StaleShardVersionError>());
return;
}