Summary: fix amfnd exit during shutdown phase V2 [#1630]. Review request for Trac Ticket(s): #1630. Peer Reviewer(s): Hans, Gary, Mathi Pull request to: <<LIST THE PERSON WITH PUSH ACCESS HERE>> Affected branch(es): ALL Development branch: <<IF ANY GIVE THE REPO URL>>
-------------------------------- 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): --------------------------------------------- This second version of the patch adds one change in opensafd script in patch 2. With this change, if amfnd gets stuck during the shutdown phase , opensafd script will kill amfnd process after timeout. changeset 85d71903c3696147b0cfed12abd1dfa2be245268 Author: [email protected] Date: Mon, 21 Dec 2015 16:48:51 +0530 amfnd: fix removal of assignments from faulty NPI SU during shutdown phase [#1630] In the reported problem, opensaf shutdown got stuck when one of the components of NPI su faulted. During opnesaf shutdown, amfnd started removing assignment from lower rank SI2 assigned to SU2. During this time, comp of a NPI SU1 having a csi from a higher rank SI1 faulted. AMFND successfully cleaned up the failed component. Now when all the assignments from SU2 got removed, amfnd started removing assignments from SU1. Since SU1 had only one component which was moved to UNINSTANTIATED state after clean up, no further clean up was required. Since no further comp was cleaned up in SU1 got stuck in TERMINATING state. In healthy condition when last CSI is removed from a NPI SU, SU will move to UNINSTANTIATED state. After this if no further lower rank SIs are available for application SUs, amfnd will launch clean up of all the components. But since SU1 got stuck in TERMINATING state AMFND could not launch clean up of all the comps and after 60 sceconds NID rebooted the node. Patch fixes the problem by resuming the SU FSM of failed component and removes further CSIs. If no CSI is available it will mark the SU UNINSTANTIATED and will go with the normal sequence of removal and then clean up of all comps. changeset 90e08bb3bba64fd7a872316284a154ee26f96b6b Author: [email protected] Date: Mon, 21 Dec 2015 16:49:20 +0530 opensafd: kill amfnd if it does not exit in time during opensaf shutdown [#1630] During opensaf shutdown phase, if amfnd does not exit in configure OPENSAF_TERMTIMEOUT, then kill amfnd process after timeout. Complete diffstat: ------------------ osaf/services/infrastructure/nid/scripts/opensafd.in | 4 +++ osaf/services/saf/amf/amfnd/clc.cc | 12 +++++++++ osaf/services/saf/amf/amfnd/sidb.cc | 8 ++++++ osaf/services/saf/amf/amfnd/susm.cc | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+), 0 deletions(-) Testing Commands: ----------------- Patch 1:Tested as per ticket description. Patch 2: Without applying patch 1 run the same case. Testing, Expected Results: -------------------------- Patch 1 and 2 in place: amfnd exits gracefully. Patch 2:n place only: amfnd gets stuck and after 60 seconds, it is killed by opensafd script. Conditions of Submission: ------------------------- Ack from any reviewer. 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. ------------------------------------------------------------------------------ _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
