Summary: osaf: kill NodeDirector processes before re-instantiating to support adminrestart [#1326] Review request for Trac Ticket(s): #1326 Peer Reviewer(s): AndersW, Ramesh, HansN, Nagendra, Praveen 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 y SAF services y OpenSAF services n Core libraries n Samples n Tests n Other n Comments (indicate scope for each "y" above): --------------------------------------------- changeset 99c6d4d650b6c8d3ac67e70064bc7ee7b3032119 Author: Mathivanan N.P.<mathi.naic...@oracle.com> Date: Wed, 29 Apr 2015 13:44:01 +0530 osaf: kill NodeDirector processes before re-instantiating to support admin restart [#1326] amf-adm restart <DN of of OpenSAF node director> can fail in some occassions because at the time of re-instantiation the previously running NodeDirector process did not exit completely. This patch creates a temporary term_state_file from inside the node director callback. The existence of this file will be checked from inside the component's instantation script and subsequently a kill of the process will be attempted before re-spawning that Node Director. Complete diffstat: ------------------ osaf/services/saf/cpsv/cpnd/cpnd_amf.c | 13 ++++++++++++- osaf/services/saf/cpsv/cpnd/scripts/osaf-ckptnd.in | 13 +++++++++++++ osaf/services/saf/glsv/glnd/glnd_amf.c | 12 ++++++++++++ osaf/services/saf/glsv/glnd/scripts/osaf-lcknd.in | 13 +++++++++++++ osaf/services/saf/immsv/immnd/immnd_amf.c | 10 ++++++++++ osaf/services/saf/immsv/immnd/scripts/osaf-immnd.in | 18 ++++++++++++++++++ osaf/services/saf/mqsv/mqnd/mqnd_amf.c | 10 ++++++++++ osaf/services/saf/mqsv/mqnd/scripts/osaf-msgnd.in | 13 +++++++++++++ osaf/services/saf/smfsv/smfnd/scripts/osaf-smfnd.in | 13 +++++++++++++ osaf/services/saf/smfsv/smfnd/smfnd_amf.c | 10 ++++++++++ 10 files changed, 124 insertions(+), 1 deletions(-) Testing Commands: ----------------- amf-adm restart <DN name of the opensaf node director component> should not return any failures (particularly RHEL) Testing, Expected Results: -------------------------- same as above. Conditions of Submission: ------------------------- Ack from AndersW or Ramesh 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. ------------------------------------------------------------------------------ One dashboard for servers and applications across Physical-Virtual-Cloud Widest out-of-the-box monitoring support with 50+ applications Performance metrics, stats and reports that give you Actionable Insights Deep dive visibility with transaction tracing using APM Insight. http://ad.doubleclick.net/ddm/clk/290420510;117567292;y _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel