Summary: Fix amf_demo crahes when calling SaAmfHAStateGet [#1437, #1444] Review request for Trac Ticket(s): 1437, 1444 Peer Reviewer(s): AMF devs Pull request to: AMF Maintainers Affected branch(es): default Development branch: default
-------------------------------- 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): --------------------------------------------- NOTE: The patch "sample: Handle HA transition in amf_demo [#1437]" for testing purpose only, not for commit changeset da3bb13e8f801c4a5a1535fbf7b246a7ff157c04 Author: Minh Hon Chau <[email protected]> Date: Wed, 16 Sep 2015 15:11:36 +1000 samples: Fix amf_demo crashes if shutdown SU [#1437] The amf_demo sample crashes if shutdown SU due to NULL csiName, which comes from a TARGET_ALL csi_callback. The #1437 raised for 2 points: .1: Fix amf_demo crahes .2: Verify the ha transition in csi lifecycle This patch is for point .1, which avoid the crash. It leaves a note that real application should make sure its service successfully being moved to QUIESCED after saAmfCSIQuiescingComplete. Another patch has been made for point .2, that actually checks all csi(s) being moved to QUIESCED and also verify the ha transition in csi lifecycle. This patch seems to make amf_demo becoming a test program rather than an abstract sample, so it's only attached to for testing, not for commit. changeset afa759cbb7aff51868ea73230046650e89435307 Author: Minh Hon Chau <[email protected]> Date: Wed, 16 Sep 2015 15:11:40 +1000 sample: Handle HA transition in amf_demo [#1437] changeset 4a42c4627aa0a15b5a5af9d5d7ba6052d670c056 Author: Minh Hon Chau <[email protected]> Date: Wed, 16 Sep 2015 15:11:47 +1000 amfnd: Correct ha_state before returns to comp for saAmfHAStateGet [#1444] Currently amfnd always returns SA_AMF_HA_QUIESCING to component even if component succeeds with saAmfCSIQuiescingComplete() amfnd should return SA_AMF_HA_QUIESCED to component as amfnd had already reported SA_AMF_HA_QUIESCED to amfd. A potential problem is that component could get stuck in waiting for its service being moved to QUIESCED completely before it terminates its own service. Patch figures the actual ha state based on current assign state of csi and ha state of si in the flow of saAmfHAStateGet. Complete diffstat: ------------------ osaf/services/saf/amf/amfnd/comp.cc | 14 +++- samples/amf/sa_aware/amf_demo.c | 190 ++++++++++++++++++++++++++++++++++++----------- tools/cluster_sim_uml/build_uml | 2 +- 3 files changed, 158 insertions(+), 48 deletions(-) Testing Commands: ----------------- - Load amf_demo with 2N SG TC1: shutdown SI TC2: shutdown active SU Testing, Expected Results: -------------------------- amf_demo won't crash, SaAmfHAStateGet() returns QUIESCED in both tests Conditions of Submission: ------------------------- ACK from reviewers Arch Built Started Linux distro ------------------------------------------- mips n n mips64 n n x86 n n x86_64 y y 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. ------------------------------------------------------------------------------ Monitor Your Dynamic Infrastructure at Any Scale With Datadog! Get real-time metrics from all of your servers, apps and tools in one place. SourceForge users - Click here to start your Free Trial of Datadog now! http://pubads.g.doubleclick.net/gampad/clk?id=241902991&iu=/4140 _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
