remove processQueueAssignmentAdvisory

Signed-off-by: Emelia Lei <[email protected]>
bloomberg · Feb 6, 2025 · b5f5552 · b5f5552
1 parent 4707f5d
commit b5f5552
Show file tree

Hide file tree

Showing 9 changed files with 241 additions and 353 deletions.
diff --git a/src/groups/mqb/mqbblp/mqbblp_cluster.cpp b/src/groups/mqb/mqbblp/mqbblp_cluster.cpp
@@ -441,10 +441,10 @@ void Cluster::sendAck(bmqt::AckResult::Enum     status,
             d_throttledFailedAckMessages,
             BALL_LOG_INFO << description() << ": failed Ack "
                           << "[status: " << status << ", source: '" << source
-                          << "'" << ", correlationId: " << correlationId
+                          << "', correlationId: " << correlationId
                           << ", GUID: " << messageGUID << ", queue: '"
-                          << (found ? uri : "** null **") << "' "
-                          << "(id: " << queueId << ")] " << "to node "
+                          << (found ? uri : "** null **")
+                          << "' (id: " << queueId << ")] to node "
                           << nodeSession->clusterNode()->nodeDescription(););
     }
 
@@ -453,7 +453,7 @@ void Cluster::sendAck(bmqt::AckResult::Enum     status,
                    << "[status: " << status << ", source: '" << source << "'"
                    << ", correlationId: " << correlationId
                    << ", GUID: " << messageGUID << ", queue: '" << uri
-                   << "' (id: " << queueId << ")] to " << "node "
+                   << "' (id: " << queueId << ")] to node "
                    << nodeSession->clusterNode()->nodeDescription();
 
     // Update stats for the queue (or subStream of the queue)
@@ -492,7 +492,7 @@ void Cluster::sendAck(bmqt::AckResult::Enum     status,
             d_throttledDroppedAckMessages,
             BALL_LOG_ERROR << description() << ": dropping ACK message "
                            << "[status: " << status << ", source: '" << source
-                           << "'" << ", correlationId: " << correlationId
+                           << "', correlationId: " << correlationId
                            << ", GUID: " << messageGUID
                            << ", queueId: " << queueId << "] to node "
                            << nodeSession->clusterNode()->nodeDescription()
@@ -3076,15 +3076,6 @@ void Cluster::processClusterControlMessage(
                                  source),
             this);
     } break;  // BREAK
-    case MsgChoice::SELECTION_ID_QUEUE_ASSIGNMENT_ADVISORY: {
-        dispatcher()->execute(
-            bdlf::BindUtil::bind(
-                &ClusterOrchestrator::processQueueAssignmentAdvisory,
-                &d_clusterOrchestrator,
-                message,
-                source),
-            this);
-    } break;  // BREAK
     case MsgChoice::SELECTION_ID_NODE_STATUS_ADVISORY: {
         dispatcher()->execute(
             bdlf::BindUtil::bind(

diff --git a/src/groups/mqb/mqbblp/mqbblp_clusterorchestrator.cpp b/src/groups/mqb/mqbblp/mqbblp_clusterorchestrator.cpp
@@ -1338,18 +1338,6 @@ void ClusterOrchestrator::processQueueAssignmentRequest(
     d_stateManager_mp->processQueueAssignmentRequest(request, requester);
 }
 
-void ClusterOrchestrator::processQueueAssignmentAdvisory(
-    const bmqp_ctrlmsg::ControlMessage& message,
-    mqbnet::ClusterNode*                source)
-{
-    // executed by the cluster *DISPATCHER* thread
-
-    // PRECONDITIONS
-    BSLS_ASSERT_SAFE(dispatcher()->inDispatcherThread(d_cluster_p));
-
-    d_stateManager_mp->processQueueAssignmentAdvisory(message, source);
-}
-
 void ClusterOrchestrator::processQueueUnassignedAdvisory(
     const bmqp_ctrlmsg::ControlMessage& msg,
     mqbnet::ClusterNode*                source)

diff --git a/src/groups/mqb/mqbblp/mqbblp_clusterorchestrator.h b/src/groups/mqb/mqbblp/mqbblp_clusterorchestrator.h
@@ -353,15 +353,6 @@ class ClusterOrchestrator {
     processQueueAssignmentRequest(const bmqp_ctrlmsg::ControlMessage& request,
                                   mqbnet::ClusterNode* requester);
 
-    /// Process the specified queue assignment advisory `message` from the
-    /// specified `source`.
-    ///
-    /// THREAD: This method is invoked in the associated cluster's
-    ///         dispatcher thread.
-    void
-    processQueueAssignmentAdvisory(const bmqp_ctrlmsg::ControlMessage& message,
-                                   mqbnet::ClusterNode*                source);
-
     /// Process the queue unAssigned advisory in the specified `msg`
     /// received from the specified `source`.
     ///