SERVER-39427 Modify interrupt semantics for opCtx

* rename opCtx->runWithoutInterruption to
  runWithoutInterruptionExceptAtGlobalShutdown

* add a opCtx->setIsExecutingShutdown method which makes the op immune
  to all forms of interruption, including global shutdown

This clarifies what opCtx->runWithoutInterruption actually did and
offers an escape hatch that turns off interruption at process exit for
the thread doing cleanup.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/mongo/s/async_requests_sender.cpp b/src/mongo/s/async_requests_sender.cpp
index 03cb8ad6d54..6296a1254f9 100644
--- a/src/mongo/s/async_requests_sender.cpp
+++ b/src/mongo/s/async_requests_sender.cpp
@@ -88,8 +88,6 @@ AsyncRequestsSender::~AsyncRequestsSender() {
     } catch (const ExceptionFor<ErrorCodes::InterruptedAtShutdown>&) {
         // Ignore interrupted at shutdown.  No need to cleanup if we're going into process-wide
         // shutdown.
-        //
-        // TODO: Figure out how to do actual NonInterruptibility in SERVER-39427
     }
 }
 
@@ -112,7 +110,7 @@ AsyncRequestsSender::Response AsyncRequestsSender::next() {
                 continue;
             }
         } else {
-            _opCtx->runWithoutInterruption([&] { _makeProgress(); });
+            _opCtx->runWithoutInterruptionExceptAtGlobalShutdown([&] { _makeProgress(); });
         }
     }
     return *readyResponse;
diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp
index 8f6de4c64ed..acf643ad1c7 100644
--- a/src/mongo/s/server.cpp
+++ b/src/mongo/s/server.cpp
@@ -199,6 +199,8 @@ void cleanupTask(ServiceContext* serviceContext) {
             opCtx = uniqueTxn.get();
         }
 
+        opCtx->setIsExecutingShutdown();
+
         if (serviceContext) {
             serviceContext->setKillAllOperations();