summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Larkin-York <dan.larkin-york@mongodb.com>2021-04-02 19:14:27 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-04-02 19:59:41 +0000
commit83e855895579e6e676603a2855d550a33a4aca46 (patch)
treee111eecf7284444f5916a2bbb120bec053ad3655
parent8ca88e6b66c1b3f53d86c6eea8d093f5a040ae55 (diff)
downloadmongo-83e855895579e6e676603a2855d550a33a4aca46.tar.gz
SERVER-55743 Replace invalid invariant in BucketCatalog::abort
-rw-r--r--src/mongo/db/timeseries/bucket_catalog.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mongo/db/timeseries/bucket_catalog.cpp b/src/mongo/db/timeseries/bucket_catalog.cpp
index ecbd9dd888b..7035cf36beb 100644
--- a/src/mongo/db/timeseries/bucket_catalog.cpp
+++ b/src/mongo/db/timeseries/bucket_catalog.cpp
@@ -285,8 +285,13 @@ void BucketCatalog::finish(std::shared_ptr<WriteBatch> batch, const CommitInfo&
void BucketCatalog::abort(std::shared_ptr<WriteBatch> batch) {
invariant(batch);
- invariant(!batch->finished());
invariant(batch->_commitRights.load());
+
+ if (batch->finished()) {
+ invariant(batch->getResult().getStatus() == ErrorCodes::TimeseriesBucketCleared);
+ return;
+ }
+
Bucket* bucket = batch->bucket();
// Before we access the bucket, make sure it's still there.