SERVER-31873 Make mongos retry findAndModify with txnNumber

1 files changed, 5 insertions, 8 deletions

diff --git a/src/mongo/db/s/collection_range_deleter.cpp b/src/mongo/db/s/collection_range_deleter.cpp
index 66ed5783a95..7bf41703968 100644
--- a/src/mongo/db/s/collection_range_deleter.cpp
+++ b/src/mongo/db/s/collection_range_deleter.cpp
@@ -431,19 +431,16 @@ void CollectionRangeDeleter::_pop(Status result) {
 // DeleteNotification
 
 CollectionRangeDeleter::DeleteNotification::DeleteNotification()
-    : notification(std::make_shared<Notification<Status>>()) {}
+    : _notification(std::make_shared<Notification<Status>>()) {}
 
 CollectionRangeDeleter::DeleteNotification::DeleteNotification(Status status)
-    : notification(std::make_shared<Notification<Status>>()) {
-    notify(status);
-}
+    : _notification(std::make_shared<Notification<Status>>(std::move(status))) {}
 
 Status CollectionRangeDeleter::DeleteNotification::waitStatus(OperationContext* opCtx) {
     try {
-        return notification->get(opCtx);
-    } catch (...) {
-        notification = std::make_shared<Notification<Status>>();
-        notify({ErrorCodes::Interrupted, "Wait for range delete request completion interrupted"});
+        return _notification->get(opCtx);
+    } catch (const DBException& ex) {
+        _notification = std::make_shared<Notification<Status>>(ex.toStatus());
         throw;
     }
 }