Fix: Queue::configure deadlocks with QueueHandle::deconfigure (#900)

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

Author: dorjesinpo

src/groups/mqb/mqbblp/mqbblp_queue.cpp

@@ -62,32 +62,51 @@ namespace mqbblp {
 // class Queue
 // -----------
 
-void Queue::configureDispatched(int*          result,
-                                bsl::ostream* errorDescription,
-                                bool          isReconfigure)
+void Queue::configureDispatchedAndPost(int*              result,
+                                       bsl::ostream*     errorDescription,
+                                       bool              isReconfigure,
+                                       bslmt::Semaphore* sync)
 {
     // executed by the *QUEUE* dispatcher thread
 
     // PRECONDITIONS
     BSLS_ASSERT_SAFE(dispatcher()->inDispatcherThread(this));
-
-    bmqu::MemOutStream throwaway(d_allocator_p);
-    bsl::ostream&      errStream = (errorDescription ? *errorDescription
-                                                     : throwaway);
+    BSLS_ASSERT_SAFE(result);
+    BSLS_ASSERT_SAFE(errorDescription);
+    BSLS_ASSERT_SAFE(sync);
 
     int rc = 0;
     if (d_localQueue_mp) {
-        rc = d_localQueue_mp->configure(errStream, isReconfigure);
+        rc = d_localQueue_mp->configure(*errorDescription, isReconfigure);
     }
     else if (d_remoteQueue_mp) {
-        rc = d_remoteQueue_mp->configure(errStream, isReconfigure);
+        rc = d_remoteQueue_mp->configure(*errorDescription, isReconfigure);
     }
     else {
         BSLS_ASSERT_OPT(false && "Uninitialized queue");
     }
 
-    if (result) {
-        *result = rc;
+    *result = rc;
+    sync->post();
+}
+
+void Queue::configureDispatched(bool isReconfigure)
+{
+    // executed by the *QUEUE* dispatcher thread
+
+    // PRECONDITIONS
+    BSLS_ASSERT_SAFE(dispatcher()->inDispatcherThread(this));
+
+    bmqu::MemOutStream throwaway(d_allocator_p);
+
+    if (d_localQueue_mp) {
+        d_localQueue_mp->configure(throwaway, isReconfigure);
+    }
+    else if (d_remoteQueue_mp) {
+        d_remoteQueue_mp->configure(throwaway, isReconfigure);
+    }
+    else {
+        BSLS_ASSERT_OPT(false && "Uninitialized queue");
     }
 }
 
@@ -584,18 +603,27 @@ int Queue::configure(bsl::ostream* errorDescription_p,
 
     // Enqueue a configure callback in the queue-dispatcher thread.
     int result = 0;
-    dispatcher()->execute(
-        bdlf::BindUtil::bind(&Queue::configureDispatched,
-                             this,
-                             (wait ? &result : NULL),
-                             (wait ? errorDescription_p : NULL),
-                             isReconfigure),
-        this);
-    if (!wait) {
-        return 0;  // RETURN
+
+    if (wait) {
+        bslmt::Semaphore sync;
+        dispatcher()->execute(
+            bdlf::BindUtil::bind(&Queue::configureDispatchedAndPost,
+                                 this,
+                                 &result,
+                                 errorDescription_p,
+                                 isReconfigure,
+                                 &sync),
+            this);
+
+        sync.wait();
+    }
+    else {
+        dispatcher()->execute(bdlf::BindUtil::bind(&Queue::configureDispatched,
+                                                   this,
+                                                   isReconfigure),
+                              this);
     }
 
-    dispatcher()->synchronize(this);
     return result;
 }
 

src/groups/mqb/mqbblp/mqbblp_queue.h

@@ -122,9 +122,11 @@ class Queue BSLS_CPP11_FINAL : public mqbi::Queue {
 
   private:
     // PRIVATE MANIPULATORS
-    void configureDispatched(int*          result,
-                             bsl::ostream* errorDescription,
-                             bool          isReconfigure);
+    void configureDispatchedAndPost(int*              result,
+                                    bsl::ostream*     errorDescription,
+                                    bool              isReconfigure,
+                                    bslmt::Semaphore* sync);
+    void configureDispatched(bool isReconfigure);
 
     void getHandleDispatched(
         const bsl::shared_ptr<mqbi::QueueHandleRequesterContext>&

src/groups/mqb/mqbi/mqbi_cluster.cpp

@@ -63,6 +63,7 @@ const char* ClusterErrorCode::toAscii(ClusterErrorCode::Enum value)
         CASE(NOT_FOLLOWER)
         CASE(NOT_REPLICA)
         CASE(CSL_FAILURE)
+        CASE(STORAGE_FAILURE)
     default: return "(* UNKNOWN *)";
     }