Ack from me. Best regards, Zoran
-----Original Message----- From: Anders Björnerstedt Sent: Thursday, June 04, 2015 6:22 PM To: [email protected]; Zoran Milinkovic Cc: [email protected] Subject: [PATCH 1 of 1] osaf/services/saf/immsv/immnd/ImmModel.cc | 66 +++++++++++++++--------------- 1 files changed, 33 insertions(+), 33 deletions(-) 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 @@ -4691,7 +4691,7 @@ bool ImmModel::validateNoDanglingRefsMod if(omi->second->mObjFlags & IMM_DELETE_LOCK) { if(omi->second->mCcbId != ccb->mId) { // Will be deleted by another CCB - LOG_ER("ERR_FAILED_OPERATION: NO_DANGLING reference (%s) " + LOG_WA("ERR_FAILED_OPERATION: NO_DANGLING reference (%s) " "refers to object flagged for delete by another Ccb: %u, (this Ccb %u)", av->getValueC_str(), omi->second->mCcbId, ccb->mId); } @@ -4699,7 +4699,7 @@ bool ImmModel::validateNoDanglingRefsMod return false; } if((omi->second->mObjFlags & IMM_CREATE_LOCK) && (omi->second->mCcbId != ccb->mId)) { - LOG_ER("ERR_FAILED_OPERATION: NO_DANGLING reference (%s) " + LOG_WA("ERR_FAILED_OPERATION: NO_DANGLING reference (%s) " "refers to object flagged for create by another CCB: %u, (this Ccb %u)", av->getValueC_str(), omi->second->mCcbId , ccb->mId); TRACE_LEAVE(); @@ -4736,7 +4736,7 @@ bool ImmModel::validateNoDanglingRefsDel if(!(ommi->second->mObjFlags & IMM_DELETE_LOCK)) { std::string objName; getObjectName(ommi->second, objName); - LOG_ER("ERR_FAILED_OPERATION: Delete of object %s would violate NO_DANGLING reference " + 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; @@ -4745,7 +4745,7 @@ bool ImmModel::validateNoDanglingRefsDel if(ommi->second->mCcbId != ccb->mId) { std::string objName; getObjectName(ommi->second, objName); - LOG_ER("ERR_FAILED_OPERATION: Delete of object %s would violate NO_DANGLING reference " + LOG_WA("ERR_FAILED_OPERATION: Delete of object %s would violate NO_DANGLING reference " "from object %s, scheduled for delete by another Ccb:%u (this Ccb:%u)", omit->first.c_str(), objName.c_str(), ommi->second->mCcbId, ccb->mId); rc = false; @@ -5824,7 +5824,7 @@ ImmModel::ccbAugmentInit(immsv_oi_ccb_up case IMM_CCB_VALIDATED: case IMM_CCB_PBE_ABORT: case IMM_CCB_CRITICAL: - LOG_ER("Ccb Augment attempted in wrong CCB state"); + LOG_WA("Ccb Augment attempted in wrong CCB state"); err = SA_AIS_ERR_BAD_OPERATION; goto done; @@ -5898,7 +5898,7 @@ ImmModel::ccbAugmentInit(immsv_oi_ccb_up i2 = std::find_if(sOwnerVector.begin(), sOwnerVector.end(), IdIs(ccb->mAdminOwnerId)); if(i2 == sOwnerVector.end()) { - LOG_ER("ERR_BAD_HANDLE: admin owner id %u of ccb %u does not exist", + LOG_WA("ERR_BAD_HANDLE: admin owner id %u of ccb %u does not exist", ccb->mAdminOwnerId, ccbId); err = SA_AIS_ERR_BAD_HANDLE; goto done; @@ -5949,13 +5949,13 @@ ImmModel::ccbAugmentAdmo(SaUint32T admin TRACE_ENTER(); i1 = std::find_if(sCcbVector.begin(), sCcbVector.end(), CcbIdIs(ccbId)); if (i1 == sCcbVector.end()) { - LOG_ER("ccbAugmentAdmo: ccb id %u does not exist", ccbId); + LOG_WA("ccbAugmentAdmo: ccb id %u does not exist", ccbId); goto done; } ccb = *i1; if(ccb->mAugCcbParent == NULL) { - LOG_ER("ccbAugmentAdmo: could not set augment-admo because ccb %u is not in augment", ccbId); + LOG_WA("ccbAugmentAdmo: could not set augment-admo because ccb %u is not in augment", ccbId); goto done; } @@ -6646,7 +6646,7 @@ SaAisErrorT ImmModel::ccbObjectCreate(Im } if(ccb->mState > IMM_CCB_READY) { - LOG_ER("ERR_FAILED_OPERATION: ccb %u is not in an expected state:%u " + LOG_NO("ERR_FAILED_OPERATION: ccb %u is not in an expected state:%u " "rejecting ccbObjectCreate operation ", ccbId, ccb->mState); err = SA_AIS_ERR_FAILED_OPERATION; goto ccbObjectCreateExit; @@ -6778,7 +6778,7 @@ SaAisErrorT ImmModel::ccbObjectCreate(Im i4 = std::find_if(classInfo->mAttrMap.begin(), classInfo->mAttrMap.end(), AttrFlagIncludes(SA_IMM_ATTR_RDN)); if (i4 == classInfo->mAttrMap.end()) { - LOG_ER("ERR_FAILED_OPERATION: No RDN attribute found in class!"); + LOG_WA("ERR_FAILED_OPERATION: No RDN attribute found in class!"); err = SA_AIS_ERR_FAILED_OPERATION; //Should never happen! goto ccbObjectCreateExit; } @@ -6841,7 +6841,7 @@ SaAisErrorT ImmModel::ccbObjectCreate(Im } else if (attrValues->n.attrValueType == SA_IMM_ATTR_SANAMET) { AttrMap::iterator it = classInfo->mAttrMap.find(attrName); if(it == classInfo->mAttrMap.end()) { - LOG_ER("ERR_INVALID_PARAM: Cannot find attribute '%s'", + LOG_WA("ERR_INVALID_PARAM: Cannot find attribute '%s'", attrName.c_str()); err = SA_AIS_ERR_INVALID_PARAM; //Should never happen! goto ccbObjectCreateExit; @@ -7400,12 +7400,12 @@ SaAisErrorT ImmModel::ccbObjectCreate(Im if(sIsLongDnLoaded) { i6 = object->mAttrValueMap.find(immLongDnsAllowed); if(i6 == object->mAttrValueMap.end() || !i6->second) { - LOG_ER("ERR_FAILED_OPERATION: Long DN is used during the loading initial data, " + LOG_WA("ERR_FAILED_OPERATION: Long DN is used during the loading initial data, " "but attribute 'longDnsAllowed' is not defined in class %s", immClassName.c_str()); err = SA_AIS_ERR_FAILED_OPERATION; } else if(!i6->second->getValue_int()) { - LOG_ER("ERR_FAILED_OPERATION: Long DN is used during the loading initial data, " + LOG_WA("ERR_FAILED_OPERATION: Long DN is used during the loading initial data, " "but longDnsAllowed is set to 0"); err = SA_AIS_ERR_FAILED_OPERATION; } @@ -7516,7 +7516,7 @@ SaAisErrorT ImmModel::ccbObjectCreate(Im if(objectName == immObjectDn) { updateImmObject(immClassName); } else { - LOG_ER("IMM OBJECT DN:%s should be:%s", + LOG_WA("IMM OBJECT DN:%s should be:%s", objectName.c_str(), immObjectDn.c_str()); } } @@ -7735,7 +7735,7 @@ ImmModel::ccbObjectModify(const ImmsvOmC } if(ccb->mState > IMM_CCB_READY) { - LOG_ER("ERR_FAILED_OPERATION: ccb %u is not in an expected state: %u " + LOG_WA("ERR_FAILED_OPERATION: ccb %u is not in an expected state: %u " "rejecting ccbObjectModify operation ", ccbId, ccb->mState); err = SA_AIS_ERR_FAILED_OPERATION; goto ccbObjectModifyExit; @@ -8345,7 +8345,7 @@ ImmModel::ccbObjectModify(const ImmsvOmC if(avmi != afim->mAttrValueMap.end()) { osafassert(avmi->second); if(avmi->second->empty()) { - LOG_ER("ERR_BAD_OPERATION: Value of '%s' attribute in object '%s' cannot be empty", + LOG_WA("ERR_BAD_OPERATION: Value of '%s' attribute in object '%s' cannot be empty", OPENSAF_IMM_ACCESS_CONTROL_MODE, objectName.c_str()); err = SA_AIS_ERR_BAD_OPERATION; @@ -8353,7 +8353,7 @@ ImmModel::ccbObjectModify(const ImmsvOmC } else { SaUint32T mode = (SaUint32T)avmi->second->getValue_int(); if(mode > 2) { /* ACCESS_CONTROL_ENFORCING == 2 */ - LOG_ER("ERR_BAD_OPERATION: Value of '%s' attribute in object '%s' is out of range", + LOG_WA("ERR_BAD_OPERATION: Value of '%s' attribute in object '%s' is out of range", OPENSAF_IMM_ACCESS_CONTROL_MODE, objectName.c_str()); err = SA_AIS_ERR_BAD_OPERATION; @@ -8659,7 +8659,7 @@ ImmModel::ccbObjectDelete(const ImmsvOmC } if(ccb->mState > IMM_CCB_READY) { - LOG_ER("ERR_FAILED_OPERATION: ccb %u is not in an expected state:%u " + LOG_WA("ERR_FAILED_OPERATION: ccb %u is not in an expected state:%u " "rejecting ccbObjectDelete operation ", ccbId, ccb->mState); err = SA_AIS_ERR_FAILED_OPERATION; goto ccbObjectDeleteExit; @@ -9403,7 +9403,7 @@ ImmModel::ccbObjDelContinuation(immsv_oi ccb = *i1; if(! (nameCheck(objectName)||nameToInternal(objectName)) ) { - LOG_ER("Not a proper object name: %s", objectName.c_str()); + LOG_WA("Not a proper object name: %s", objectName.c_str()); if(ccb->mVeto == SA_AIS_OK) { ccb->mVeto = SA_AIS_ERR_FAILED_OPERATION; } @@ -9878,7 +9878,7 @@ ImmModel::accessorGet(const ImmsvOmSearc SA_IMM_SEARCH_GET_CONFIG_ATTR); if(notAllowedOptions) { - LOG_ER("ERR_LIBRARY: Invalid search criteria - library problem ?"); + LOG_WA("ERR_LIBRARY: Invalid search criteria - library problem ?"); err = SA_AIS_ERR_LIBRARY; goto accessorExit; } @@ -11051,7 +11051,7 @@ ImmModel::fetchAdmImplContinuation(SaInv return; } if((*implConn) && (*implConn != ci3->second.mConn)) { - LOG_ER("Collision on invocation identity %llu", inv); + LOG_WA("Collision on invocation identity %llu", inv); } TRACE_5("IMPL ADM CONTINUATION %u FOUND FOR %llu", ci3->second.mConn, inv); *implConn = ci3->second.mConn; @@ -11990,7 +11990,7 @@ ImmModel::getOldCriticalCcbs(IdVector& c } if(!implAssoc) { - LOG_ER("CCB %u is blocked in CRITICAL, yet NOT waiting on implementer!!", + LOG_WA("CCB %u is blocked in CRITICAL, yet NOT waiting on implementer!!", ccb->mId); continue; } @@ -12002,7 +12002,7 @@ ImmModel::getOldCriticalCcbs(IdVector& c if(!isPbe) { - LOG_ER("CCB %u is blocked in CRITICAL, waiting on implementer %u/%s.", + LOG_WA("CCB %u is blocked in CRITICAL, waiting on implementer %u/%s.", ccb->mId, implAssoc->mImplementer->mId, implAssoc->mImplementer->mImplementerName.c_str()); continue; @@ -12038,7 +12038,7 @@ ImmModel::getOldCriticalCcbs(IdVector& c /*TODO return true => signalling need to kill pbe*/ continue; } - LOG_ER("Missmatch pbe-Id %u != pbe-restart-id %u", + LOG_WA("Missmatch pbe-Id %u != pbe-restart-id %u", impInfo->mId, ccb->mPbeRestartId); } @@ -13905,7 +13905,7 @@ ImmModel::rtObjectCreate(struct ImmsvOmC && !longDnsPermitted) { AttrMap::iterator it = classInfo->mAttrMap.find(attrName); if(it == classInfo->mAttrMap.end()) { - LOG_ER("ERR_INVALID_PARAM: Cannot find attribute '%s'", + LOG_WA("ERR_INVALID_PARAM: Cannot find attribute '%s'", attrName.c_str()); err = SA_AIS_ERR_INVALID_PARAM; goto rtObjectCreateExit; @@ -14373,7 +14373,7 @@ void ImmModel::pbePrtObjCreateContinuati if(i2 == sPbeRtMutations.end()) { if(error == SA_AIS_OK) { - LOG_ER("PBE PRTO Create continuation missing! invoc:%u", invocation); + LOG_WA("PBE PRTO Create continuation missing! invoc:%u", invocation); } return; } @@ -14525,7 +14525,7 @@ SaInt32T ImmModel::pbePrtObjDeletesConti break; /* out of for() */ } } else if (error != SA_AIS_OK) { - LOG_ER("Error %u returned from slave PBE on PrtoDelete! should never happen", error); + LOG_WA("Error %u returned from slave PBE on PrtoDelete! should never happen", error); /* Possibly return -1 indicating slave PBE has to be shot down. Or make this case *impossible* in the slave logic, i.e. catch this case in the slave.!! Possibly assert the immnd colocated with the slave (no). @@ -14637,7 +14637,7 @@ SaInt32T ImmModel::pbePrtObjDeletesConti } //for if(nrofDeletes == 0) { - LOG_ER("PBE PRTO Deletes continuation missing! invoc:%u", + LOG_WA("PBE PRTO Deletes continuation missing! invoc:%u", invocation); } else if(error == SA_AIS_OK) { TRACE("PBE PRTO Deleted %u RT Objects", nrofDeletes); @@ -14677,7 +14677,7 @@ void ImmModel::pbePrtAttrUpdateContinuat if(i2 == sPbeRtMutations.end()) { if(error == SA_AIS_OK) { - LOG_ER("PBE PRTAttrs Update continuation missing! invoc:%u", + LOG_WA("PBE PRTAttrs Update continuation missing! invoc:%u", invocation); } return; @@ -14825,7 +14825,7 @@ void ImmModel::pbeClassCreateContinuatio } if(i2 == sPbeRtMutations.end()) { - LOG_ER("PBE Class Create continuation missing! invoc:%u", + LOG_WA("PBE Class Create continuation missing! invoc:%u", invocation); return; } @@ -14861,7 +14861,7 @@ void ImmModel::pbeClassDeleteContinuatio } if(i2 == sPbeRtMutations.end()) { - LOG_ER("PBE Class Delete continuation missing! invoc:%u", + LOG_WA("PBE Class Delete continuation missing! invoc:%u", invocation); return; } @@ -15116,7 +15116,7 @@ ImmModel::rtObjectUpdate(const ImmsvOmCc */ pbe = getPbeOi(pbeConnPtr, pbeNodeIdPtr); if(!pbe) { - LOG_ER("ERR_TRY_AGAIN: Persistent back end is down - unexpected here"); + LOG_WA("ERR_TRY_AGAIN: Persistent back end is down - unexpected here"); err = SA_AIS_ERR_TRY_AGAIN; goto rtObjectUpdateExit; /* We have already checked for PbeWritable with success inside @@ -15666,7 +15666,7 @@ ImmModel::rtObjectDelete(const ImmsvOmCc */ pbe = getPbeOi(pbeConnPtr, pbeNodeIdPtr); if(!pbe) { - LOG_ER("ERR_TRY_AGAIN: Persistent back end is down - unexpected here"); + LOG_NO("ERR_TRY_AGAIN: Persistent back end is down - unexpected here"); err = SA_AIS_ERR_TRY_AGAIN; goto rtObjectDeleteExit; /* We have already checked for PbeWritable with success inside ------------------------------------------------------------------------------ _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
