Correction: I SENT it by mistake. Thanks, Zoran
-----Original Message----- From: Zoran Milinkovic Sent: Tuesday, December 29, 2015 1:17 PM To: Zoran Milinkovic; [email protected] Cc: [email protected] Subject: RE: [devel] [PATCH 1 of 1] imm: skip sending admin ops to slave PBE in 1safe2PBE mode [#1652] Ignore this patch. I'll send it by mistake. I'll send the correct patch again. Thanks, Zoran -----Original Message----- From: Zoran Milinkovic [mailto:[email protected]] Sent: Tuesday, December 29, 2015 1:14 PM To: [email protected] Cc: [email protected] Subject: [devel] [PATCH 1 of 1] imm: skip sending admin ops to slave PBE in 1safe2PBE mode [#1652] osaf/services/saf/immsv/immpbed/immpbe_daemon.cc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) When PBE is running in 1safe2PBE mode, syncing admin op to the second PBE will be skipped. Adding OPENSAF_IMM_FLAG_2PBE1_ALLOW check to OPENSAF_IMM_PBE_CLASS_CREATE, OPENSAF_IMM_PBE_CLASS_DELETE and OPENSAF_IMM_PBE_UPDATE_EPOCH will skip sending unnecessary admin op to slave PBE. 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 @@ -443,7 +443,7 @@ static void saImmOiAdminOperationCallbac osafassert(className.size()); if(sPbe2 && !sPbe2B && (sNoStdFlags & OPENSAF_IMM_FLAG_2PBE1_ALLOW)) { - LOG_IN("PBE is in 1safe2PBE state. Ignoring create class towards slave PBE"); + LOG_IN("PBE is in 1safe2PBE state. Ignoring class create towards slave PBE"); } else if(sPbe2 && !sPbe2B) { /* Primary PBE forwards class create to slave PBE. */ SaAisErrorT rc2B = SA_AIS_OK; @@ -659,7 +659,7 @@ static void saImmOiAdminOperationCallbac osafassert(className.size()); if(sPbe2 && !sPbe2B && (sNoStdFlags & OPENSAF_IMM_FLAG_2PBE1_ALLOW)) { - LOG_IN("PBE is in 1safe2PBE state. Ignoring delete class towards slave PBE"); + LOG_IN("PBE is in 1safe2PBE state. Ignoring class delete towards slave PBE"); } else if(sPbe2 && !sPbe2B) { /* Primary PBE forwards class delete to slave PBE. */ SaAisErrorT rc2B = SA_AIS_OK; ------------------------------------------------------------------------------ _______________________________________________ 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
