SERVER-41004 Allow CursorNotFound errors to count as a successful kill in the killSessions command

1 files changed, 8 insertions, 3 deletions

diff --git a/src/mongo/db/kill_sessions_common.h b/src/mongo/db/kill_sessions_common.h
index 2200183fe73..5e749709a1b 100644
--- a/src/mongo/db/kill_sessions_common.h
+++ b/src/mongo/db/kill_sessions_common.h
@@ -92,7 +92,7 @@ public:
      * which this adaptor was constructed.
      */
     template <typename Mgr>
-    void operator()(Mgr& mgr) {
+    void operator()(Mgr& mgr) noexcept {
         LogicalSessionIdSet activeSessions;
         mgr.appendActiveSessions(&activeSessions);
 
@@ -105,8 +105,13 @@ public:
                     try {
                         _eraser(mgr, id);
                         _cursorsKilled++;
-                    } catch (...) {
-                        _failures.push_back(exceptionToStatus());
+                    } catch (const ExceptionFor<ErrorCodes::CursorNotFound>&) {
+                        // Cursor was killed separately after this command was initiated. Still
+                        // count the cursor as killed here, since the user's request is
+                        // technically satisfied.
+                        _cursorsKilled++;
+                    } catch (const DBException& ex) {
+                        _failures.push_back(ex.toStatus());
                     }
                 }
             }