TMP

Author: kaikulimu

src/groups/mqb/mqbc/mqbc_storagemanager.cpp

@@ -1145,6 +1145,19 @@ void StorageManager::processShutdownEventDispatched(int partitionId)
     mqbs::FileStore* fs = d_fileStores[partitionId].get();
     BSLS_ASSERT_SAFE(fs);
 
+    StorageUtil::processShutdownEventDispatched(
+        d_clusterData_p,
+        &d_partitionInfoVec[partitionId],
+        fs,
+        partitionId);
+
+    // TODO Remove this action from PFSM
+    StorageUtil::clearPrimaryForPartition(fs,
+                                          &d_partitionInfoVec[partitionId],
+                                          "TODO",
+                                          partitionId,
+                                          0 /** TODO The primary node */);
+
     // TODO fs.execute(&clearPrimaryForPartition2 || &shutdownMyBro); Then
     // dispatch e_STOPPED
     EventData eventDataVec;
@@ -1159,12 +1172,6 @@ void StorageManager::processShutdownEventDispatched(int partitionId)
     queueSp->emplace(PartitionFSM::Event::e_STOP_NODE, eventDataVec);
 
     d_partitionFSMVec[partitionId]->popEventAndProcess(queueSp);
-
-    StorageUtil::processShutdownEventDispatched(
-        d_clusterData_p,
-        &d_partitionInfoVec[partitionId],
-        fs,
-        partitionId);
 }
 
 void StorageManager::forceFlushFileStores()
@@ -3926,6 +3933,8 @@ void StorageManager::stop()
                                  eventDataVec);
     }
 
+    // TODO Do any of the calls below suffer from race condition if pinfo ==
+    // d_partitionInfoVec[partitionId] gets cleared early?
     for (int p = 0; p < d_clusterConfig.partitionConfig().numPartitions();
          p++) {
         d_fileStores[p]->execute(