Summary: AMF: Fix SC failover during headless sync [#2162] Review request for Trac Ticket(s): 2162 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): --------------------------------------------- Two patches fix two problems reported in ticket changeset 447ddae0dcac68230d63cae7b654c3ea81488fb1 Author: Minh Hon Chau <minh.c...@dektech.com.au> Date: Tue, 08 Nov 2016 14:10:45 +1100 AMFD: Fix SC failover during headless sync at INIT_DONE state [#2162] At the state of AVD_INIT_DONE and standby controller has middleware SUs assigned, SC failover will leave transient assignments from headless stage unrecovered. The problem is when standy controller becomes new active one, new AMFD does not continue the headless recovery which is initiated under cluster initiation timeout. The patch continues the cluster initiation phase at new active AMFD after SC failover. changeset 87f4150335a3b4ec956a4e249e2e3475cc828ab3 Author: Minh Hon Chau <minh.c...@dektech.com.au> Date: Tue, 08 Nov 2016 14:10:45 +1100 AMFND: Fix SC failover during headless sync before standby AMFD comes up [#2162] This case of SC failover causes new active AMFD getting stuck in node_up messages Say first active controller is SC1, which goes down during headless sync. Therefore, the amfnd on SC2 receives mds_down of AVD, then both is_avd_down and amfd_sync_required are set to true. When SC2 takes over active role, amfnd on SC2 receives mds_up, but only is_avd_down is set to false and the variable amfd_sync_required remains true. When amfnd-SC2 finishes initiating middleware SU, it needs to send su_oper message to AMFD, but it is failed to send out due to amfd_sync_required. In this scenario of SC failover, amfd_sync_required needs to set to false when amfnd on SC2 receives su_pres message on middleware SUs. That means amfnd on active controller does not need to wait for set_leds message, to be informed that cluster initiation is done, so that amfnd can sen su_oper messages to AMFD. This logic also aligns with normal headless scenario, where amfnd on active controller has amfd_sync_required initially marked as false because no middleware SUs are initiated. When amfd_sync_required is true that means amfnd all middleware SUs are initiated and assigned before headless, thus amfnd needs to wait for cluster initiation after headless. Complete diffstat: ------------------ osaf/services/saf/amf/amfd/cluster.cc | 2 +- osaf/services/saf/amf/amfd/sgproc.cc | 24 ++++++++++++++++++++---- osaf/services/saf/amf/amfnd/di.cc | 7 +++++-- osaf/services/saf/amf/amfnd/susm.cc | 6 ++++++ 4 files changed, 32 insertions(+), 7 deletions(-) Testing Commands: ----------------- <<LIST THE COMMAND LINE TOOLS/STEPS TO TEST YOUR CHANGES>> Testing, Expected Results: -------------------------- <<PASTE COMMAND OUTPUTS / TEST RESULTS>> Conditions of Submission: ------------------------- ack from 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. ------------------------------------------------------------------------------ Developer Access Program for Intel Xeon Phi Processors Access to Intel Xeon Phi processor-based developer platforms. With one year of Intel Parallel Studio XE. Training and support from Colfax. Order your platform today. http://sdm.link/xeonphi _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel