Cleanup Partition FSM: Trimming unnecessary logic (#905)

Signed-off-by: Yuan Jing Vincent Yan <[email protected]>

Author: kaikulimu

src/groups/mqb/mqbc/mqbc_partitionstatetable.cpp

@@ -125,7 +125,6 @@ PartitionStateTableEvent::toAscii(PartitionStateTableEvent::Enum value)
         CASE(RECOVERY_DATA)
         CASE(LIVE_DATA)
         CASE(QUORUM_REPLICA_DATA_RSPN)
-        CASE(PUT)
         CASE(ISSUE_LIVESTREAM)
         CASE(QUORUM_REPLICA_SEQ)
         CASE(SELF_HIGHEST_SEQ)

src/groups/mqb/mqbc/mqbc_partitionstatetable.h

@@ -130,13 +130,12 @@ struct PartitionStateTableEvent {
         e_RECOVERY_DATA                = 23,
         e_LIVE_DATA                    = 24,
         e_QUORUM_REPLICA_DATA_RSPN     = 25,
-        e_PUT                          = 26,
-        e_ISSUE_LIVESTREAM             = 27,
-        e_QUORUM_REPLICA_SEQ           = 28,
-        e_SELF_HIGHEST_SEQ             = 29,
-        e_REPLICA_HIGHEST_SEQ          = 30,
-        e_WATCH_DOG                    = 31,
-        e_NUM_EVENTS                   = 32
+        e_ISSUE_LIVESTREAM             = 26,
+        e_QUORUM_REPLICA_SEQ           = 27,
+        e_SELF_HIGHEST_SEQ             = 28,
+        e_REPLICA_HIGHEST_SEQ          = 29,
+        e_WATCH_DOG                    = 30,
+        e_NUM_EVENTS                   = 31
     };
 
     // CLASS METHODS
@@ -253,10 +252,6 @@ class PartitionStateTableActions {
 
     virtual void do_processLiveData(const ARGS& args) = 0;
 
-    virtual void do_processPut(const ARGS& args) = 0;
-
-    virtual void do_nackPut(const ARGS& args) = 0;
-
     virtual void do_cleanupMetadata(const ARGS& args) = 0;
 
     virtual void do_startSendDataChunks(const ARGS& args) = 0;
@@ -289,6 +284,8 @@ class PartitionStateTableActions {
 
     virtual void do_reapplyDetectSelfReplica(const ARGS& args) = 0;
 
+    virtual void do_unsupportedPrimaryDowngrade(const ARGS& args) = 0;
+
     void
     do_startWatchDog_storePartitionInfo_openRecoveryFileSet_storeSelfSeq_replicaStateRequest_checkQuorumSeq(
         const ARGS& args);
@@ -336,8 +333,7 @@ class PartitionStateTableActions {
     do_resetReceiveDataCtx_closeRecoveryFileSet_storeSelfSeq_attemptOpenStorage_replicaDataRequestPush_replicaDataRequestDrop_startSendDataChunks_incrementNumRplcaDataRspn_checkQuorumRplcaDataRspn(
         const ARGS& args);
 
-    void
-    do_processPut_stopWatchDog_transitionToActivePrimary(const ARGS& args);
+    void do_stopWatchDog_transitionToActivePrimary(const ARGS& args);
 
     void do_replicaStateResponse_storePrimarySeq(const ARGS& args);
 
@@ -434,7 +430,6 @@ class PartitionStateTable
             DETECT_SELF_REPLICA,
             startWatchDog_storePartitionInfo_openRecoveryFileSet_storeSelfSeq_primaryStateRequest,
             REPLICA_HEALING);
-        PST_CFG(UNKNOWN, PUT, nackPut, UNKNOWN);
         PST_CFG(PRIMARY_HEALING_STG1,
                 DETECT_SELF_REPLICA,
                 cleanupMetadata_clearPartitionInfo_stopWatchDog_reapplyEvent,
@@ -455,7 +450,6 @@ class PartitionStateTable
                 PRIMARY_STATE_RQST,
                 storeReplicaSeq_primaryStateResponse_checkQuorumSeq,
                 PRIMARY_HEALING_STG1);
-        PST_CFG(PRIMARY_HEALING_STG1, PUT, nackPut, PRIMARY_HEALING_STG1);
         PST_CFG(PRIMARY_HEALING_STG1,
                 QUORUM_REPLICA_SEQ,
                 findHighestSeq,
@@ -520,9 +514,8 @@ class PartitionStateTable
                 PRIMARY_HEALING_STG2);
         PST_CFG(PRIMARY_HEALING_STG2,
                 QUORUM_REPLICA_DATA_RSPN,
-                processPut_stopWatchDog_transitionToActivePrimary,
+                stopWatchDog_transitionToActivePrimary,
                 PRIMARY_HEALED);
-        PST_CFG(PRIMARY_HEALING_STG2, PUT, nackPut, PRIMARY_HEALING_STG2);
         PST_CFG(
             PRIMARY_HEALING_STG2,
             RST_UNKNOWN,
@@ -593,7 +586,6 @@ class PartitionStateTable
             failureReplicaDataResponsePush_cleanupMetadata_closeRecoveryFileSet_stopWatchDog_reapplyDetectSelfReplica,
             UNKNOWN);
         PST_CFG(REPLICA_HEALING, LIVE_DATA, bufferLiveData, REPLICA_HEALING);
-        PST_CFG(REPLICA_HEALING, PUT, nackPut, REPLICA_HEALING);
         PST_CFG(
             REPLICA_HEALING,
             RST_UNKNOWN,
@@ -620,7 +612,6 @@ class PartitionStateTable
                 replicaDataResponsePush,
                 REPLICA_HEALED);
         PST_CFG(REPLICA_HEALED, LIVE_DATA, processLiveData, REPLICA_HEALED);
-        PST_CFG(REPLICA_HEALED, PUT, processPut, REPLICA_HEALED);
         PST_CFG(REPLICA_HEALED,
                 ISSUE_LIVESTREAM,
                 cleanupMetadata_reapplyDetectSelfReplica,
@@ -631,7 +622,7 @@ class PartitionStateTable
                 UNKNOWN);
         PST_CFG(PRIMARY_HEALED,
                 DETECT_SELF_REPLICA,
-                cleanupMetadata_clearPartitionInfo_reapplyEvent,
+                unsupportedPrimaryDowngrade,
                 UNKNOWN);
         PST_CFG(
             PRIMARY_HEALED,
@@ -643,7 +634,6 @@ class PartitionStateTable
             PRIMARY_STATE_RQST,
             storeSelfSeq_storeReplicaSeq_primaryStateResponse_replicaDataRequestPush_replicaDataRequestDrop_startSendDataChunks,
             PRIMARY_HEALED);
-        PST_CFG(PRIMARY_HEALED, PUT, processPut, PRIMARY_HEALED);
         PST_CFG(PRIMARY_HEALED,
                 RST_UNKNOWN,
                 cleanupMetadata_clearPartitionInfo,
@@ -846,10 +836,9 @@ void PartitionStateTableActions<ARGS>::
 }
 
 template <typename ARGS>
-void PartitionStateTableActions<ARGS>::
-    do_processPut_stopWatchDog_transitionToActivePrimary(const ARGS& args)
+void PartitionStateTableActions<
+    ARGS>::do_stopWatchDog_transitionToActivePrimary(const ARGS& args)
 {
-    do_processPut(args);
     do_stopWatchDog(args);
     do_transitionToActivePrimary(args);
 }

src/groups/mqb/mqbc/mqbc_storagemanager.cpp

@@ -14,6 +14,7 @@
 // limitations under the License.
 
 // mqbc_storagemanager.cpp                                            -*-C++-*-
+#include "mqbc_partitionstatetable.h"
 #include <ball_log.h>
 #include <bsls_assert.h>
 #include <mqbc_storagemanager.h>
@@ -2626,16 +2627,6 @@ void StorageManager::do_processLiveData(const PartitionFSMArgsSp& args)
                             source);
 }
 
-void StorageManager::do_processPut(const BSLA_UNUSED PartitionFSMArgsSp& args)
-{
-    // TODO: Complete Impl
-}
-
-void StorageManager::do_nackPut(const BSLA_UNUSED PartitionFSMArgsSp& args)
-{
-    // TODO: Complete Impl
-}
-
 void StorageManager::do_cleanupMetadata(const PartitionFSMArgsSp& args)
 {
     // executed by the *QUEUE DISPATCHER* thread associated with the paritionId
@@ -3410,6 +3401,35 @@ void StorageManager::do_reapplyDetectSelfReplica(
                                  eventDataVecOut);
 }
 
+void StorageManager::do_unsupportedPrimaryDowngrade(
+    const PartitionFSMArgsSp& args)
+{
+    // executed by the *QUEUE DISPATCHER* thread associated with the
+    // paritionId contained in 'args'
+
+    // PRECONDITIONS
+    BSLS_ASSERT_SAFE(!args->eventsQueue()->empty());
+
+    const PartitionFSM::EventWithData& eventWithData =
+        args->eventsQueue()->front();
+    const EventData& eventDataVec = eventWithData.second;
+    BSLS_ASSERT_SAFE(eventDataVec.size() == 1);
+    const int partitionId = eventDataVec[0].partitionId();
+    BSLS_ASSERT_SAFE(0 <= partitionId &&
+                     partitionId < static_cast<int>(d_fileStores.size()));
+
+    BSLS_ASSERT_SAFE(d_partitionFSMVec[partitionId]->isSelfPrimary());
+    BSLS_ASSERT_SAFE(eventWithData.first ==
+                     PartitionFSM::Event::e_DETECT_SELF_REPLICA);
+
+    BMQTSK_ALARMLOG_ALARM("CLUSTER")
+        << d_clusterData_p->identity().description() << " Partition ["
+        << partitionId << "]: "
+        << "Downgrade from primary to replica is **UNSUPPORTED**. Terminating "
+        << "broker." << BMQTSK_ALARMLOG_END;
+    mqbu::ExitUtil::terminate(mqbu::ExitCode::e_UNSUPPORTED_SCENARIO);  // EXIT
+}
+
 // PRIVATE ACCESSORS
 bool StorageManager::allPartitionsAvailable() const
 {

src/groups/mqb/mqbc/mqbc_storagemanager.h

@@ -637,10 +637,6 @@ class StorageManager BSLS_KEYWORD_FINAL
     void
     do_processLiveData(const PartitionFSMArgsSp& args) BSLS_KEYWORD_OVERRIDE;
 
-    void do_processPut(const PartitionFSMArgsSp& args) BSLS_KEYWORD_OVERRIDE;
-
-    void do_nackPut(const PartitionFSMArgsSp& args) BSLS_KEYWORD_OVERRIDE;
-
     void
     do_cleanupMetadata(const PartitionFSMArgsSp& args) BSLS_KEYWORD_OVERRIDE;
 
@@ -688,6 +684,9 @@ class StorageManager BSLS_KEYWORD_FINAL
     void do_reapplyDetectSelfReplica(const PartitionFSMArgsSp& args)
         BSLS_KEYWORD_OVERRIDE;
 
+    void do_unsupportedPrimaryDowngrade(const PartitionFSMArgsSp& args)
+        BSLS_KEYWORD_OVERRIDE;
+
     // PRIVATE ACCESSORS
 
     /// Return true if all partitions are fully healed and have an active