Hi Zoran, Primary pbe also invokes adm-op towards slave pbe when creating/deleting classes. OPENSAF_IMM_PBE_CLASS_CREATE OPENSAF_IMM_PBE_CLASS_DELETE
I think this patch doesn't cover those cases yet. BR, Hung Nguyen - DEK Technologies -------------------------------------------------------------------------------- From: Zoran Milinkovic [email protected] Sent: Tuesday, December 29, 2015 4:46PM To: Neelakanta Reddy [email protected] Cc: Opensaf-devel [email protected] Subject: [devel] [PATCH 1 of 1] imm: skip sending syncing admin op in 1safe2PBE mode [#1652] 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 ------------------------------------------------------------------------------ _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
