osaf/services/saf/immsv/immpbed/immpbe_daemon.cc |  6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


When PBE is running in 1safe2PBE mode, syncing admin op to the second PBE will 
be skipped.

diff --git a/osaf/services/saf/immsv/immpbed/immpbe_daemon.cc 
b/osaf/services/saf/immsv/immpbed/immpbe_daemon.cc
--- a/osaf/services/saf/immsv/immpbed/immpbe_daemon.cc
+++ b/osaf/services/saf/immsv/immpbed/immpbe_daemon.cc
@@ -244,6 +244,12 @@ static bool pbe2_start_prepare_ccb_A_to_
 
        osafassert(sPbe2 && !sPbe2B); /* Must be 2PBE and NOT at slave. */
 
+       if((sNoStdFlags & OPENSAF_IMM_FLAG_2PBE1_ALLOW)) {
+               // 2PBE is in 1safe2PBE state. Sending syncing admin op will be 
skipped
+               TRACE_LEAVE();
+               return true;
+       }
+
        do{
                rc2B = saImmOmAdminOperationInvoke_2(sOwnerHandle, 
&slavePbeRtObjName, 0, OPENSAF_IMM_PBE_CCB_PREPARE,
                        params, &slavePbeRtReply, SA_TIME_ONE_SECOND * 10);

------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to