Skip to content

Commit b5f5552

Browse files
committed
remove processQueueAssignmentAdvisory
Signed-off-by: Emelia Lei <[email protected]>
1 parent 4707f5d commit b5f5552

9 files changed

+241
-353
lines changed

Diff for: src/groups/mqb/mqbblp/mqbblp_cluster.cpp

+5-14
Original file line numberDiff line numberDiff line change
@@ -441,10 +441,10 @@ void Cluster::sendAck(bmqt::AckResult::Enum status,
441441
d_throttledFailedAckMessages,
442442
BALL_LOG_INFO << description() << ": failed Ack "
443443
<< "[status: " << status << ", source: '" << source
444-
<< "'" << ", correlationId: " << correlationId
444+
<< "', correlationId: " << correlationId
445445
<< ", GUID: " << messageGUID << ", queue: '"
446-
<< (found ? uri : "** null **") << "' "
447-
<< "(id: " << queueId << ")] " << "to node "
446+
<< (found ? uri : "** null **")
447+
<< "' (id: " << queueId << ")] to node "
448448
<< nodeSession->clusterNode()->nodeDescription(););
449449
}
450450

@@ -453,7 +453,7 @@ void Cluster::sendAck(bmqt::AckResult::Enum status,
453453
<< "[status: " << status << ", source: '" << source << "'"
454454
<< ", correlationId: " << correlationId
455455
<< ", GUID: " << messageGUID << ", queue: '" << uri
456-
<< "' (id: " << queueId << ")] to " << "node "
456+
<< "' (id: " << queueId << ")] to node "
457457
<< nodeSession->clusterNode()->nodeDescription();
458458

459459
// Update stats for the queue (or subStream of the queue)
@@ -492,7 +492,7 @@ void Cluster::sendAck(bmqt::AckResult::Enum status,
492492
d_throttledDroppedAckMessages,
493493
BALL_LOG_ERROR << description() << ": dropping ACK message "
494494
<< "[status: " << status << ", source: '" << source
495-
<< "'" << ", correlationId: " << correlationId
495+
<< "', correlationId: " << correlationId
496496
<< ", GUID: " << messageGUID
497497
<< ", queueId: " << queueId << "] to node "
498498
<< nodeSession->clusterNode()->nodeDescription()
@@ -3076,15 +3076,6 @@ void Cluster::processClusterControlMessage(
30763076
source),
30773077
this);
30783078
} break; // BREAK
3079-
case MsgChoice::SELECTION_ID_QUEUE_ASSIGNMENT_ADVISORY: {
3080-
dispatcher()->execute(
3081-
bdlf::BindUtil::bind(
3082-
&ClusterOrchestrator::processQueueAssignmentAdvisory,
3083-
&d_clusterOrchestrator,
3084-
message,
3085-
source),
3086-
this);
3087-
} break; // BREAK
30883079
case MsgChoice::SELECTION_ID_NODE_STATUS_ADVISORY: {
30893080
dispatcher()->execute(
30903081
bdlf::BindUtil::bind(

Diff for: src/groups/mqb/mqbblp/mqbblp_clusterorchestrator.cpp

-12
Original file line numberDiff line numberDiff line change
@@ -1338,18 +1338,6 @@ void ClusterOrchestrator::processQueueAssignmentRequest(
13381338
d_stateManager_mp->processQueueAssignmentRequest(request, requester);
13391339
}
13401340

1341-
void ClusterOrchestrator::processQueueAssignmentAdvisory(
1342-
const bmqp_ctrlmsg::ControlMessage& message,
1343-
mqbnet::ClusterNode* source)
1344-
{
1345-
// executed by the cluster *DISPATCHER* thread
1346-
1347-
// PRECONDITIONS
1348-
BSLS_ASSERT_SAFE(dispatcher()->inDispatcherThread(d_cluster_p));
1349-
1350-
d_stateManager_mp->processQueueAssignmentAdvisory(message, source);
1351-
}
1352-
13531341
void ClusterOrchestrator::processQueueUnassignedAdvisory(
13541342
const bmqp_ctrlmsg::ControlMessage& msg,
13551343
mqbnet::ClusterNode* source)

Diff for: src/groups/mqb/mqbblp/mqbblp_clusterorchestrator.h

-9
Original file line numberDiff line numberDiff line change
@@ -353,15 +353,6 @@ class ClusterOrchestrator {
353353
processQueueAssignmentRequest(const bmqp_ctrlmsg::ControlMessage& request,
354354
mqbnet::ClusterNode* requester);
355355

356-
/// Process the specified queue assignment advisory `message` from the
357-
/// specified `source`.
358-
///
359-
/// THREAD: This method is invoked in the associated cluster's
360-
/// dispatcher thread.
361-
void
362-
processQueueAssignmentAdvisory(const bmqp_ctrlmsg::ControlMessage& message,
363-
mqbnet::ClusterNode* source);
364-
365356
/// Process the queue unAssigned advisory in the specified `msg`
366357
/// received from the specified `source`.
367358
///

0 commit comments

Comments
 (0)