Summary: amf: change saAmfResponse to be synchronous in TerminateCallback context Review request for Trac Ticket(s): 570 Peer Reviewer(s): Praveen Pull request to: <<LIST THE PERSON WITH PUSH ACCESS HERE>> Affected branch(es): all Development branch: staging
-------------------------------- 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 f75561a1d9b7167bde9af342d1f6e1d616243713 Author: Hans Feldt <hans.fe...@ericsson.com> Date: Wed, 16 Oct 2013 09:45:27 +0200 amf: change saAmfResponse to be synchronous in TerminateCallback context [#570] If a component crash or exit in context of the terminate callback, AMF will not use the "ava down" event to trigger cleanup and finish component termination. Instead the CallbackTimeout is awaited which can be very long. This is a big problem if this happens during an upgrade, it will cause the upgrade to fail potentially leading to system restore. By making the saAmfResponse call synchronous for the TerminateCallback, the "ava down" event can be used to trigger cleanup of the component. Complete diffstat: ------------------ osaf/libs/agents/saf/amfa/ava_api.c | 23 ++++++++++++++++++++++- osaf/libs/common/amf/include/amf_amfparam.h | 1 + osaf/services/saf/amf/amfnd/cbq.cc | 6 ++++++ osaf/services/saf/amf/amfnd/err.cc | 17 ++++++++++++++--- samples/amf/sa_aware/amf_demo_script | 17 +++++++++-------- 5 files changed, 52 insertions(+), 12 deletions(-) Testing Commands: ----------------- Build and start opensaf (single node is enough) Load config for demo app Unlock-in and lock-in for demo app SU Change the demo app source to exit in term callback before response Unlock-in and lock-in for demo app SU Testing, Expected Results: -------------------------- No hanging lock-in when the comp exits A new log message can be seen: Oct 16 09:36:55 Vostro osafamfnd[7266]: NO 'safComp=AmfDemo,safSu=SU1,safSg=AmfDemo,safApp=AmfDemo1' faulted due to 'avaDown' : Recovery is 'cleanup' Conditions of Submission: ------------------------- Ack from Praveen Arch Built Started Linux distro ------------------------------------------- mips n n mips64 n n x86 n n x86_64 y y Ubuntu13.04 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. ------------------------------------------------------------------------------ October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60135031&iu=/4140/ostg.clktrk _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel