osaf/services/saf/smfsv/config/smfd.conf | 4 +++- osaf/services/saf/smfsv/smfd/smfd_campaign_oi.cc | 10 ---------- 2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/osaf/services/saf/smfsv/config/smfd.conf b/osaf/services/saf/smfsv/config/smfd.conf --- a/osaf/services/saf/smfsv/config/smfd.conf +++ b/osaf/services/saf/smfsv/config/smfd.conf @@ -17,7 +17,9 @@ export SI_SWAP_SI="safSi=SC-2N,safApp=Op export SI_SWAP_MAX_RETRY=200 export CAMP_MAX_RESTART=5 export SMF_IMM_PERSIST_CMD="immdump /etc/opensaf/imm.xml" -export IMMA_SYNCR_TIMEOUT=6000 + +#IMMA_SYNCR_TIMEOUT set to three minutes +export IMMA_SYNCR_TIMEOUT=30000 # Uncomment the next line to enable info level logging #args="--loglevel=info" diff --git a/osaf/services/saf/smfsv/smfd/smfd_campaign_oi.cc b/osaf/services/saf/smfsv/smfd/smfd_campaign_oi.cc --- a/osaf/services/saf/smfsv/smfd/smfd_campaign_oi.cc +++ b/osaf/services/saf/smfsv/smfd/smfd_campaign_oi.cc @@ -744,16 +744,6 @@ uint32_t create_campaign_objects(smfd_cb uint32_t updateImmAttr(const char *dn, SaImmAttrNameT attributeName, SaImmValueTypeT attrValueType, void *value) { SaAisErrorT rc = immutil_update_one_rattr(smfd_cb->campaignOiHandle, dn, attributeName, attrValueType, value); - unsigned int nTries = 0; - // SA_AIS_ERR_TRY_AGAIN already handled by immutil method above. - // SA_AIS_ERR_TIMEOUT handled here. - while (rc == SA_AIS_ERR_TIMEOUT && nTries < 5) { - struct timespec sleepTime = { 1, 0 }; //One second - osaf_nanosleep(&sleepTime); - TRACE("updateImmAttr(): immutil_update_one_rattr FAILED, rc = %d, nTries = %d, trying again", (int)rc, nTries); - rc = immutil_update_one_rattr(smfd_cb->campaignOiHandle, dn, attributeName, attrValueType, value); - nTries++; - } if (rc != SA_AIS_OK) { LOG_ER("updateImmAttr(): immutil_update_one_rattr FAILED, rc = %d, going to assert", (int)rc); osafassert(0); ------------------------------------------------------------------------------ _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel