Summary: Fix failure of new active SC allocation due to using saAmfClusterStartupTimeout for SU presence state synchronization [#2036] Review request for Trac Ticket(s): 2036 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): --------------------------------------------- <<EXPLAIN/COMMENT THE PATCH SERIES HERE>> changeset 59cae625a00c25ef1a4d31abe7311b13501d05fc Author: minh-chau <minh.c...@dektech.com.au> Date: Fri, 23 Sep 2016 09:48:23 +1000 AMF: Allow sending susi assignment response for ncs su while waiting for set_led [#2036] Roaming SC feature is enabled, in scenario of re-allocation of new SC, after new active amfd process headless synced info, amfd starts sending 2N active assignment to amfnd. amfnd (in newly active SC) could not send su_si response message of 2N Active assignment because amfnd has not received set_led which is a signal to start sending su_si assignment. This problem does not happen if only headless is enabled, because the @amfd_sync_required is initially set as FALSE. Within roaming SC feature, @amfd_sync_required remains TRUE until receiving set_led from amfnd. But set_led is sent to amfnd only if amfd receives su_si response. The eventual result is the cb->init_state always as AVD_CFG_DONE, since amfd will not be able to receive su_si active assignment response of 2N Opensaf SU. Patch allows susi assignment response to be sent to amfd so that the cb->init_state can be moved to AVD_INIT_DONE. changeset b92c5857e2c851852c071d6d2234ca85febb2179 Author: minh-chau <minh.c...@dektech.com.au> Date: Fri, 23 Sep 2016 09:48:23 +1000 AMFD: Fix double start timer of AVD_TMR_CL_INIT [#2036] Since the AVD_TMR_CL_INIT can be started/restarted to wait for all SU presence state synchronization, so m_AVD_CLINIT_TMR_START could not always be called as the first start. As a result, due to @is_active is set to false before start timer, therefore the timer can be restarted without stop in advance. It appears a warning as below Sep 22 22:08:22.640710 osafamfd [477:timer.cc:0066] TEST >> avd_start_tmr: 1 Sep 22 22:08:22.640717 osafamfd [477:sysf_tmr.c:0690] TR IN LEAP_DBG_SINK Sep 22 22:08:22.640758 osafamfd [477:timer.cc:0096] << avd_start_tmr Patch removes setting @is_active to false in m_AVD_CLINIT_TMR_START Complete diffstat: ------------------ osaf/services/saf/amf/amfd/include/timer.h | 1 - osaf/services/saf/amf/amfnd/di.cc | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) Testing Commands: ----------------- - Configure roaming SC with 5 SCs - Bring down both active/standby SC - Quiesced SC is supposed to become new active SC Testing, Expected Results: -------------------------- - Quiesced SC is promoted as new active SC successfully - No error like: "ER wrong state 2" 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. ------------------------------------------------------------------------------ _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel