Fix: Accept greater leaseId primary unconditionally (#902)

Signed-off-by: dorjesinpo <[email protected]>

Author: dorjesinpo

src/groups/mqb/mqbblp/mqbblp_clusterorchestrator.cpp

@@ -1573,25 +1573,38 @@ void ClusterOrchestrator::processPrimaryStatusAdvisory(
         // 'StorageMgr::processPrimaryStatusAdvisoryDispatched' as well.
 
         if (pinfo.primaryNode()) {
-            if (pinfo.primaryNode() != source) {
+            if (pinfo.primaryLeaseId() > primaryAdv.primaryLeaseId()) {
                 BALL_LOG_ERROR
                     << d_clusterData_p->identity().description()
                     << ": Partition [" << primaryAdv.partitionId()
                     << "]: received primary status advisory: " << primaryAdv
-                    << " from: " << source->nodeDescription()
-                    << ", but current primary is: "
-                    << pinfo.primaryNode()->nodeDescription();
+                    << " from perceived primary: " << source->nodeDescription()
+                    << ", but with a lesser leaseId. Self perceived leaseId: "
+                    << pinfo.primaryLeaseId() << ". Will ignore the advisory.";
                 return;  // RETURN
             }
+            else if (pinfo.primaryLeaseId() < primaryAdv.primaryLeaseId()) {
+                BALL_LOG_WARN
+                    << d_clusterData_p->identity().description()
+                    << ": Partition [" << primaryAdv.partitionId()
+                    << "]: received primary status advisory: " << primaryAdv
+                    << " from perceived primary: " << source->nodeDescription()
+                    << ", with a greater leaseId. Self perceived leaseId: "
+                    << pinfo.primaryLeaseId()
+                    << ". Will follow the advisory unconditionally.";
+            }
+            else if (pinfo.primaryNodeId() != source->nodeId()) {
+                BSLS_ASSERT_SAFE(pinfo.primaryLeaseId() ==
+                                 primaryAdv.primaryLeaseId());
 
-            if (pinfo.primaryLeaseId() != primaryAdv.primaryLeaseId()) {
                 BALL_LOG_ERROR
                     << d_clusterData_p->identity().description()
                     << ": Partition [" << primaryAdv.partitionId()
                     << "]: received primary status advisory: " << primaryAdv
-                    << " from perceived primary: " << source->nodeDescription()
-                    << ", but with different leaseId. Self perceived "
-                    << "leaseId: " << pinfo.primaryLeaseId();
+                    << " from: " << source->nodeDescription()
+                    << ", but current primary is: "
+                    << pinfo.primaryNode()->nodeDescription()
+                    << ". Will ignore the advisory.";
                 return;  // RETURN
             }
         }