Summary: IMM: saImmOmCcbValidate must cancel ccb-timer before returning [#1201]
Review request for Trac Ticket(s): 1201
Peer Reviewer(s): Neel
Pull request to:
Affected branch(es): 4.5 default(4.6)
Development branch:
--------------------------------
Impacted area Impact y/n
--------------------------------
Docs n
Build system n
RPM/packaging n
Configuration files n
Startup scripts n
SAF services y
OpenSAF services n
Core libraries n
Samples n
Tests n
Other n
Comments (indicate scope for each "y" above):
---------------------------------------------
changeset 64d212d11dbb21399a7b953f1b9b3d3389d4c7e5
Author: Anders Bjornerstedt <anders.bjornerst...@ericsson.com>
Date: Tue, 04 Nov 2014 14:30:10 +0100
IMM: saImmOmCcbValidate must cancel ccb-timer before returning [#1201]
saImmOmCcbValidate retuurned without canceling the ccb-oi-timer
resulting
in the potential abort of the ccb due to timeout when the om-user is
idling,
between saImmOmCcbValidate and the termination of the ccb. The ccb can
be
terminated by either saImmOmCcbApply or saimmOmCcbAbort. In the timeout
case, the saImmOmCcbApply will return ERR_FAILED_OPERATION signidying
the
ccb was aborted, even if validation succeeded.
This patch fixes so that the timer is canceled before returning to the
om-
user from saImmOmCcbValidate.
Complete diffstat:
------------------
osaf/services/saf/immsv/immnd/ImmModel.cc | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Testing Commands:
-----------------
I tested by hacking immoitest 4 6
Used the following patch:
diff --git a/tests/immsv/implementer/test_SaImmOiCcb.c
b/tests/immsv/implementer/test_SaImmOiCcb.c
--- a/tests/immsv/implementer/test_SaImmOiCcb.c
+++ b/tests/immsv/implementer/test_SaImmOiCcb.c
@@ -300,7 +300,11 @@ static SaAisErrorT om_ccb_exec(unsigned
break;
case 1: safassert(saImmOmCcbValidate(ccbHandle), SA_AIS_OK);
- safassert(saImmOmCcbApply(ccbHandle), SA_AIS_OK);
+ printf("VALIDATED\n");
+ sleep(10);
+ rc = saImmOmCcbApply(ccbHandle);
+ printf("APPLY RETURNED:%u\n", rc);
+ safassert(rc, SA_AIS_OK);
break;
Testing, Expected Results:
--------------------------
Without the fix for #1201 'immoitest 4 6' with the above modification will
result in failure.
Wit the fix for #1201 'immoitest 4 6' with the above modification will succeed.
Conditions of Submission:
-------------------------
Ack from Neel.
Arch Built Started Linux distro
-------------------------------------------
mips n n
mips64 n n
x86 n n
x86_64 n n
powerpc n n
powerpc64 n n
Reviewer Checklist:
-------------------
[Submitters: make sure that your review doesn't trigger any checkmarks!]
Your checkin has not passed review because (see checked entries):
___ Your RR template is generally incomplete; it has too many blank entries
that need proper data filled in.
___ You have failed to nominate the proper persons for review and push.
___ Your patches do not have proper short+long header
___ You have grammar/spelling in your header that is unacceptable.
___ You have exceeded a sensible line length in your headers/comments/text.
___ You have failed to put in a proper Trac Ticket # into your commits.
___ You have incorrectly put/left internal data in your comments/files
(i.e. internal bug tracking tool IDs, product names etc)
___ You have not given any evidence of testing beyond basic build tests.
Demonstrate some level of runtime or other sanity testing.
___ You have ^M present in some of your files. These have to be removed.
___ You have needlessly changed whitespace or added whitespace crimes
like trailing spaces, or spaces before tabs.
___ You have mixed real technical changes with whitespace and other
cosmetic code cleanup changes. These have to be separate commits.
___ You need to refactor your submission into logical chunks; there is
too much content into a single commit.
___ You have extraneous garbage in your review (merge commits etc)
___ You have giant attachments which should never have been sent;
Instead you should place your content in a public tree to be pulled.
___ You have too many commits attached to an e-mail; resend as threaded
commits, or place in a public tree for a pull.
___ You have resent this content multiple times without a clear indication
of what has changed between each re-send.
___ You have failed to adequately and individually address all of the
comments and change requests that were proposed in the initial review.
___ You have a misconfigured ~/.hgrc file (i.e. username, email etc)
___ Your computer have a badly configured date and time; confusing the
the threaded patch review.
___ Your changes affect IPC mechanism, and you don't present any results
for in-service upgradability test.
___ Your changes affect user manual and documentation, your patch series
do not contain the patch that updates the Doxygen manual.
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
