Fix[mqbc::StorageManager]: Send ACTIVE advisory on PrimaryStateRequest

Signed-off-by: Yuan Jing Vincent Yan <yyan82@bloomberg.net>

Author: kaikulimu

src/groups/mqb/mqbc/mqbc_partitionstatetable.h

@@ -444,6 +444,10 @@ class PartitionStateTableActions {
     do_transitionToActivePrimary(PartitionStateTableEvent::Enum eventType,
                                  const PartitionFSMEventData&   eventData) = 0;
 
+    virtual void
+    do_sendPrimaryStatusAdvisory(PartitionStateTableEvent::Enum eventType,
+                                 const PartitionFSMEventData&   eventData) = 0;
+
     virtual void
     do_reapplyDetectSelfPrimary(PartitionStateTableEvent::Enum eventType,
                                 const PartitionFSMEventData&   eventData) = 0;
@@ -576,7 +580,7 @@ class PartitionStateTableActions {
         const PartitionFSMEventData&   eventData);
 
     void
-    do_storeSelfSeq_storeReplicaSeq_primaryStateResponse_sendDataToReplicas(
+    do_storeSelfSeq_storeReplicaSeq_primaryStateResponse_sendDataToReplicas_sendPrimaryStatusAdvisory(
         PartitionStateTableEvent::Enum eventType,
         const PartitionFSMEventData&   eventData);
 
@@ -952,7 +956,7 @@ class PartitionStateTable
         PST_CFG(
             PRIMARY_HEALED,
             PRIMARY_STATE_RQST,
-            storeSelfSeq_storeReplicaSeq_primaryStateResponse_sendDataToReplicas,
+            storeSelfSeq_storeReplicaSeq_primaryStateResponse_sendDataToReplicas_sendPrimaryStatusAdvisory,
             PRIMARY_HEALED);
         PST_CFG(PRIMARY_HEALED,
                 RST_UNKNOWN,
@@ -1283,16 +1287,11 @@ inline void PartitionStateTableActions::
     do_sendDataToReplicas(eventType, eventData);
 }
 
-inline void PartitionStateTableActions::
-    do_storeSelfSeq_storeReplicaSeq_primaryStateResponse_sendDataToReplicas(
-        PartitionStateTableEvent::Enum eventType,
-        const PartitionFSMEventData&   eventData)
-{
-    do_storeSelfSeq(eventType, eventData);
-    do_storeReplicaSeq(eventType, eventData);
-    do_primaryStateResponse(eventType, eventData);
-    do_sendDataToReplicas(eventType, eventData);
-}
+PST_COMPOSITE_5(storeSelfSeq,
+                storeReplicaSeq,
+                primaryStateResponse,
+                sendDataToReplicas,
+                sendPrimaryStatusAdvisory)
 
 inline void PartitionStateTableActions::do_storeReplicaSeq_sendDataToReplicas(
     PartitionStateTableEvent::Enum eventType,

src/groups/mqb/mqbc/mqbc_storagemanager.cpp

@@ -3703,6 +3703,43 @@ void StorageManager::do_transitionToActivePrimary(
                                         0);  // status
 }
 
+void StorageManager::do_sendPrimaryStatusAdvisory(
+    BSLA_MAYBE_UNUSED PartitionStateTableEvent::Enum eventType,
+    const PartitionFSMEventData&                     eventData)
+{
+    // executed by the *QUEUE DISPATCHER* thread associated with the
+    // partitionId contained in 'eventData'
+
+    const int partitionId = eventData.partitionId();
+    BSLS_ASSERT_SAFE(0 <= partitionId &&
+                     partitionId < static_cast<int>(d_fileStores.size()));
+    BSLS_ASSERT_SAFE(eventData.source());
+
+    const PartitionInfo& pinfo = d_partitionInfoVec[partitionId];
+    BSLS_ASSERT_SAFE(pinfo.primary() ==
+                     d_clusterData_p->membership().selfNode());
+    BSLS_ASSERT_SAFE(pinfo.primaryStatus() ==
+                     bmqp_ctrlmsg::PrimaryStatus::E_ACTIVE);
+
+    bmqp_ctrlmsg::ControlMessage         controlMsg;
+    bmqp_ctrlmsg::PrimaryStatusAdvisory& primaryAdv =
+        controlMsg.choice()
+            .makeClusterMessage()
+            .choice()
+            .makePrimaryStatusAdvisory();
+    primaryAdv.partitionId()    = partitionId;
+    primaryAdv.primaryLeaseId() = pinfo.primaryLeaseId();
+    primaryAdv.status()         = bmqp_ctrlmsg::PrimaryStatus::E_ACTIVE;
+
+    fileStore(partitionId).sendMessage(controlMsg, eventData.source());
+
+    BALL_LOG_INFO << d_clusterData_p->identity().description()
+                  << " Partition [" << partitionId
+                  << "]: sent primary status advisory " << controlMsg
+                  << " to replica node "
+                  << eventData.source()->nodeDescription() << ".";
+}
+
 void StorageManager::do_reapplyDetectSelfPrimary(
     BSLA_MAYBE_UNUSED PartitionStateTableEvent::Enum eventType,
     const PartitionFSMEventData&                     eventData)

src/groups/mqb/mqbc/mqbc_storagemanager.h

@@ -800,6 +800,10 @@ class StorageManager BSLS_KEYWORD_FINAL : public mqbi::StorageManager,
                                       const PartitionFSMEventData&   eventData)
         BSLS_KEYWORD_OVERRIDE;
 
+    void do_sendPrimaryStatusAdvisory(PartitionStateTableEvent::Enum eventType,
+                                      const PartitionFSMEventData&   eventData)
+        BSLS_KEYWORD_OVERRIDE;
+
     void do_reapplyDetectSelfPrimary(PartitionStateTableEvent::Enum eventType,
                                      const PartitionFSMEventData&   eventData)
         BSLS_KEYWORD_OVERRIDE;