Hi Neel, Reviewed and tested the patch. Ack from me.
Thanks, Hung Nguyen - DEK Technologies -------------------------------------------------------------------------------- From: Neelakanta Reddy [email protected] Sent: Thursday, November 19, 2015 8:13PM To: Zoran Milinkovic, Hung Nguyen [email protected], [email protected] Cc: Opensaf-devel [email protected] Subject: [PATCH 1 of 1] imm:Allow deletion of dangling ref object, when the object is modified by clearing NO_DANGLING attribute in same CCB [#1599] osaf/services/saf/immsv/immnd/ImmModel.cc | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) If the NO_DANGLING reference is modified(removed) in the same CCB, then deletion of the NO_DANGLING object can be allowed because, we are in apply and the CCBcommit will modify sReverseRefsNoDanglingMMap. diff --git a/osaf/services/saf/immsv/immnd/ImmModel.cc b/osaf/services/saf/immsv/immnd/ImmModel.cc --- a/osaf/services/saf/immsv/immnd/ImmModel.cc +++ b/osaf/services/saf/immsv/immnd/ImmModel.cc @@ -5050,11 +5050,29 @@ bool ImmModel::validateNoDanglingRefsDel if(!(ommi->second->mObjFlags & IMM_DELETE_LOCK)) { std::string objName; getObjectName(ommi->second, objName); - LOG_WA("ERR_FAILED_OPERATION: Delete of object %s would violate NO_DANGLING reference " - "from object %s, not scheduled for delete by this Ccb:%u", - omit->first.c_str(), objName.c_str(), ccb->mId); - rc = false; - break; + if((ommi->second->mObjFlags & IMM_NO_DANGLING_FLAG) && + (ommi->second->mCcbId == ccb->mId)){ // IMM_NO_DANGLING_FLAG will be set in CcbModify + /* If the NO_DANGLING reference is modified(removed) in the same CCB, + then deletion of the NO_DANGLING object can be allowed because, we are in apply + and the CCBcommit will modify sReverseRefsNoDanglingMMap*/ + ObjectMutationMap::iterator omit = ccb->mMutations.find(objName); + osafassert(omit != ccb->mMutations.end()); + ObjectInfo * afim = omit->second->mAfterImage; + ObjectNameSet afimRefs; + ObjectNameSet::iterator it; + collectNoDanglingRefs(afim, afimRefs); + if(afimRefs.find(omit->first.c_str()) == afimRefs.end()){ + TRACE("Delete of object %s is removed from NO_DANGLING reference in the same Ccb%u " + "from object %s", omit->first.c_str(), ccb->mId, objName.c_str()); + ++ommi; + continue; + } + } + LOG_WA("ERR_FAILED_OPERATION: Delete of object %s would violate NO_DANGLING reference " + "from object %s, not scheduled for delete by this Ccb:%u", + omit->first.c_str(), objName.c_str(), ccb->mId); + rc = false; + break; } if(ommi->second->mCcbId != ccb->mId) { std::string objName; ------------------------------------------------------------------------------ _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
