not switching thread context when closing on shutdown (#675)

Signed-off-by: dorjesinpo <[email protected]>

Author: dorjesinpo

src/groups/mqb/mqbblp/mqbblp_clusterqueuehelper.cpp

@@ -2782,23 +2782,6 @@ void ClusterQueueHelper::releaseQueueDispatched(
     BSLS_ASSERT_SAFE(
         d_cluster_p->dispatcher()->inDispatcherThread(d_cluster_p));
 
-    if (d_supportShutdownV2) {
-        BMQ_LOGTHROTTLE_INFO()
-            << d_cluster_p->description()
-            << ": Shutting down and skipping close queue [: "
-            << handleParameters.uri()
-            << "], queueId: " << handleParameters.qId()
-            << ", handle parameters: " << handleParameters;
-        if (callback) {
-            bmqp_ctrlmsg::Status status;
-            status.category() = bmqp_ctrlmsg::StatusCategory::E_SUCCESS;
-            status.message()  = "Shutting down.";
-            callback(status);
-        }
-
-        return;  // RETURN
-    }
-
     bmqt::Uri           uri(handleParameters.uri());
     QueueContextMapIter queueContextIt = d_queues.find(uri.canonical());
     if (queueContextIt == d_queues.end()) {
@@ -4716,6 +4699,28 @@ void ClusterQueueHelper::configureQueue(
     // PRECONDITIONS
     BSLS_ASSERT_SAFE(d_cluster_p->dispatcher()->inDispatcherThread(queue));
 
+    // Application first calls 'Cluster::initiateShutdown' (which may set
+    // 'd_supportShutdownV2'), followed by 'TransportManager::closeClients'
+    // which may result in 'QueueHandle::drop' leading to this call.
+    if (d_supportShutdownV2) {
+        // Assuming thread-safe 'description()'
+        BMQ_LOGTHROTTLE_INFO()
+            << d_cluster_p->description()
+            << ": Shutting down and skipping close queue [: "
+            << handleParameters.uri()
+            << "], queueId: " << handleParameters.qId()
+            << ", handle parameters: " << handleParameters;
+
+        if (callback) {
+            bmqp_ctrlmsg::Status status;
+            status.category() = bmqp_ctrlmsg::StatusCategory::E_SUCCESS;
+            status.message()  = "Shutting down.";
+            callback(status);
+        }
+
+        return;  // RETURN
+    }
+
     // TBD: Populate the 'bmqp_ctrlmsg::SubQueueIdInfo' of the handleParameters
     //      with subStream-specific (appId, upstreamSubQueueId) if applicable.
     //      Note that handleParameters passed here are from the 'QueueContext'

src/groups/mqb/mqbblp/mqbblp_clusterqueuehelper.h

@@ -462,9 +462,9 @@ class ClusterQueueHelper BSLS_KEYWORD_FINAL
 
     StopContexts d_stopContexts;
 
-    /// When `true`, all cluster nodes support StopRequest V2 and this node
-    /// executes shutdown V2 logic.
-    bool d_supportShutdownV2;
+    /// When `true`, this node is shutting down using shutdown v2 logic.
+    /// This can only be true when all cluster nodes support StopRequest V2.
+    bsls::AtomicBool d_supportShutdownV2;
 
   private:
     // PRIVATE MANIPULATORS