Ack from me. Not tested. /AndersBj
-----Original Message----- From: [email protected] [mailto:[email protected]] Sent: den 29 januari 2015 06:51 To: Anders Björnerstedt Cc: [email protected] Subject: [PATCH 1 of 1] imm: Return TRY_AGAIN for CcbApply when fevs_replies_pending greater than or equal to IMMSV_DEFAULT_FEVS_MAX_PENDING [#1250] osaf/services/saf/immsv/immnd/immnd_evt.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) If the fevs_replies_pending is greater than or equal to IMMSV_DEFAULT_FEVS_MAX_PENDING, then TRY_AGAIN is returned from immnd_evt_proc_fevs_forward.For saImmOmCcbApply, TRY_AGAIN is converted to ERR_FAILED_OPERATION. Since, the CCB is not yet applied to IMMND, but ERR_FAILED_OPERATION is returned. If the IMMSV_DEFAULT_FEVS_MAX_PENDING is checked at immnd_fevs_local_checks then ERR_NO_RESOURCES will be returned which inturn is converted to TRY_AGAIN in CcbApply API. diff --git a/osaf/services/saf/immsv/immnd/immnd_evt.c b/osaf/services/saf/immsv/immnd/immnd_evt.c --- a/osaf/services/saf/immsv/immnd/immnd_evt.c +++ b/osaf/services/saf/immsv/immnd/immnd_evt.c @@ -3205,7 +3205,8 @@ static SaAisErrorT immnd_fevs_local_chec } /* intentional fallthrough. */ case IMMND_EVT_A2ND_CCB_APPLY: - if(immModel_pbeNotWritable(cb)) { + if(immModel_pbeNotWritable(cb) || (cb->fevs_replies_pending >= IMMSV_DEFAULT_FEVS_MAX_PENDING) + || !immnd_is_immd_up(cb)) { /* NO_RESOURCES is here imm internal proxy for TRY_AGAIN. The library code for saImmOmCcbApply will translate NO_RESOURCES to TRY_AGAIN towards the user. That library code (for ccbApply) @@ -3214,7 +3215,12 @@ static SaAisErrorT immnd_fevs_local_chec towards that particular library code. */ error = SA_AIS_ERR_NO_RESOURCES; - } + if (cb->fevs_replies_pending >= IMMSV_DEFAULT_FEVS_MAX_PENDING) { + TRACE_2("ERR_TRY_AGAIN: Too many pending FEVS message replies (> %u) rejecting request + for CcbApply", IMMSV_DEFAULT_FEVS_MAX_PENDING); + } + } + break; case IMMND_EVT_A2ND_OBJ_SYNC: ------------------------------------------------------------------------------ Dive into the World of Parallel Programming. The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
