Summary: amfd: fix SU presence state transition during restart admin op [#1518]. Review request for Trac Ticket(s): #1518 Peer Reviewer(s): Hans N., Nagendra, Gary, Quyen Dao. Pull request to: <<LIST THE PERSON WITH PUSH ACCESS HERE>> Affected branch(es): Default and 4.7 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): --------------------------------------------- Patch 2 of 2 is meant for default branch only. changeset 63d5901e6bcc9c78dda6fc80b1c1c8745d758ef0 Author: [email protected] Date: Tue, 20 Oct 2015 14:51:34 +0530 amfd: fix SU presence state transition during restart admin op [#1518] Note:Issue is valid for a restartable SU only. When RESTART operation is invoked on a restartable SU, its presence state transtions: INSTANTIATED => RESTARTING => INSTANTIATING => INSTANTIATED. which is incorrect as per AIS-AMF-B.04.01-Table 5 Page 74. At present, when all the components are in RESTARTING state, SU is marked as RESTARTING. As soon as AMF starts instantiating first comp by keeping it in RESTARTING state, AMF is marking SU INSTANTIATING. Here AMF must wait for the instantiation of component and should not mark SU INSTANTIATING. When first comp gets successfully instantiated, AMF imust mark first comp INSTANTIATED and SU will also be marked INSTANTIATED as per AIS- AMF-B.04.01-Table 5 Page 74. Patch fixes the problem by marking the SU INSTANTIATED as soons as first component enters into INSTANTIATED state. During the instantiation of other components, SU will remain in INSTANTIATED state. AMF will reply to IMM for the operation when all the components enters into INSTATANTIATED state. changeset e2269639f848c964fc752c4e2df897d2df90b1b1 Author: [email protected] Date: Tue, 20 Oct 2015 14:51:51 +0530 amfd: add member function for accessing surestart [#1518] This patch adds member functions to access su->surestart.This was a minor comment on #315 (for amfd code) given by Hans N. It will be pushed only in default branch. Complete diffstat: ------------------ osaf/services/saf/amf/amfd/comp.cc | 18 ++++- osaf/services/saf/amf/amfd/include/comp.h | 1 + osaf/services/saf/amf/amfd/include/su.h | 8 ++- osaf/services/saf/amf/amfd/ndproc.cc | 24 +++++--- osaf/services/saf/amf/amfd/sgproc.cc | 6 +- osaf/services/saf/amf/amfd/su.cc | 34 ++++++++++- osaf/services/saf/amf/amfnd/include/avnd_su.h | 2 + osaf/services/saf/amf/amfnd/su.cc | 11 ++++ osaf/services/saf/amf/amfnd/susm.cc | 164 ++++++++++++++++++++++++++++++++++++++++++++--------------- 9 files changed, 200 insertions(+), 68 deletions(-) Testing Commands: ----------------- Tested RESTART admin op a restartable su of all types PI, NPI and Mix type. Testing, Expected Results: -------------------------- INSTANTIATING state of SU is not observed. Conditions of Submission: ------------------------- Ack from anyone before Rc1 tag of 4.7 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
