Summary: AMF: Support admin operation continuation after headless [#1725 Part 1] V2 Review request for Trac Ticket(s): 1725 Peer Reviewer(s): AMF devs Pull request to: <<LIST THE PERSON WITH PUSH ACCESS HERE>> 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): --------------------------------------------- This V2 avoid AMFD crash if scAbsence is not configured. V2's diff (from V1) is at avd_process_state_info_queue() changeset 2215120caf950daa78927142aadebc27fda9d8b4 Author: Minh Hon Chau <minh.c...@dektech.com.au> Date: Fri, 05 Aug 2016 07:13:09 +1000 AMFD: Introduce new RTA states for admin operation continuation after headless [#1725 part 1] V2 If there's an admin operation running and at that time cluster goes into headless stage, the normal admin operation sequence is interrupted. Since both SCs are down, the SI assignments at AMFND could be on going or completed during headless period. After headless this admin operation should be continued. This patch series supports the admin operation continuation after headless. To resume the admin operation after headless, the states need to be restored are: SUSI fsm states, SG fsm states, SI Dependency states (not suppported in this patch), and SU operation list in SG at the time cluster goes headless. At this moment, the SG fsm states are set variously in each specific SG models. Also, the rule that a SU to be added in SG's operation list is not consistent. A SU is added to operation list after AMFD sends su_si_assign event on this SU in most of the places. However, there're are some scenarios that a SU is added to the list for other purposes. These difficulties make the state logic deduction hard to implemenent. This patch introduces new RTA states: saAmfSGSuOperationList, saAmfSGFsmState, saAmfSISUFsmState to capture the SG's operation list, SG Fsm state, SUSI fsm state in AMFD's memory to IMM during AMFD's lifetime. If cluster comes back from headless, these RTA will read from IMM to restore states in AMFD's memory. After this patch, if admin operation interrupts to headless stage, and csi callback is responded after headless, the admin operation can continue. The other patch in this series will help admin operation continuation if a csi callback completes during headless. changeset 7a016215ab72d6a8a6e66c2cbd55c8cd3d15c3f9 Author: Minh Hon Chau <minh.c...@dektech.com.au> Date: Fri, 05 Aug 2016 07:13:09 +1000 AMFND: Admin operation continuation if csi callback completes during headless [#1725 part 1] V1 The patch buffers susi_resp_msg during headless stage and resend it to AMFD after headless. Complete diffstat: ------------------ osaf/services/saf/amf/amfd/cluster.cc | 4 + osaf/services/saf/amf/amfd/csi.cc | 38 -------- osaf/services/saf/amf/amfd/imm.cc | 5 +- osaf/services/saf/amf/amfd/include/csi.h | 1 - osaf/services/saf/amf/amfd/include/imm.h | 5 +- osaf/services/saf/amf/amfd/include/sg.h | 6 +- osaf/services/saf/amf/amfd/include/su.h | 3 +- osaf/services/saf/amf/amfd/include/susi.h | 6 +- osaf/services/saf/amf/amfd/include/util.h | 2 + osaf/services/saf/amf/amfd/ndfsm.cc | 11 ++- osaf/services/saf/amf/amfd/role.cc | 6 - osaf/services/saf/amf/amfd/sg.cc | 110 +++++++++++++++++++++++++- osaf/services/saf/amf/amfd/sg_2n_fsm.cc | 8 +- osaf/services/saf/amf/amfd/sg_npm_fsm.cc | 2 +- osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc | 2 +- osaf/services/saf/amf/amfd/sgproc.cc | 140 +++++++++++++++++-------------- osaf/services/saf/amf/amfd/siass.cc | 204 ++++++++++++++++++++++++++++++++-------------- osaf/services/saf/amf/amfd/su.cc | 46 +++++----- osaf/services/saf/amf/amfnd/di.cc | 199 ++++++++++++++++++++++++++++++--------------- osaf/services/saf/amf/amfnd/include/avnd_di.h | 1 + osaf/services/saf/amf/config/amf_classes.xml | 21 ++++ 21 files changed, 545 insertions(+), 275 deletions(-) Testing Commands: ----------------- Test report is attached to ticket #1725 Testing, Expected Results: -------------------------- At least no test failure is introduced compared with version before #1725 P1 in non-headless mode. TC#78, #118, #144 in headless mode are failed, needs more investigation. Conditions of Submission: ------------------------- Ack 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 Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel