mirror
/
mongo
mirror of https://github.com/mongodb/mongo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SERVER-112539 Abort time-series write batch on Stale Version errors (#42781) 

GitOrigin-RevId: e7a65c19f2d81c0eb757b54831367dfd188e72b7
This commit is contained in:
Yuhong Zhang 2025-10-21 10:59:13 -04:00 committed by MongoDB Bot
parent ba2a82bc16
commit 99c7a90c36
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mongo/db/timeseries/write_ops/internal/timeseries_write_ops_internal.cpp
View File

@ -533,9 +533,6 @@ void processUnorderedCommitResult(OperationContext* opCtx,
abortBatch(result.error);
abandonSnapshot();
},
[&](const commit_result::NonContinuableError& result) {
handleNonContinuableError(result.error);
},
[&](const commit_result::NonContinuableErrorWithAbortBatch& result) {
handleNonContinuableError(result.error);
abortBatch(result.error);
@ -1112,7 +1109,7 @@ commit_result::Result commitTimeseriesBucketForBatch(
auto& oss{OperationShardingState::get(opCtx)};
oss.setShardingOperationFailedStatus(ex.toStatus());
return commit_result::NonContinuableError{ex.toStatus()};
return commit_result::NonContinuableErrorWithAbortBatch{ex.toStatus()};
}
auto status = prepareCommit(bucketCatalog, batch, collator);

4
src/mongo/db/timeseries/write_ops/internal/timeseries_write_ops_internal.h
View File

@ -52,9 +52,6 @@ struct ContinuableRetryableErrorWithAbortBatch {
struct ContinuableRetryableErrorWithAbortBatchAbandonSnapshot {
Status error;
};
struct NonContinuableError {
Status error;
};
struct NonContinuableErrorWithAbortBatch {
Status error;
};
@ -65,7 +62,6 @@ using Result = std::variant<Success,
ContinuableRetryableError,
ContinuableRetryableErrorWithAbortBatch,
ContinuableRetryableErrorWithAbortBatchAbandonSnapshot,
NonContinuableError,
NonContinuableErrorWithAbortBatch>;
} // namespace commit_result