Summary: amfd: set node oper state to enable during clm unlock [#1567] Review request for Trac Ticket(s): #1567 Peer Reviewer(s): Praveen, Hans N Pull request to: <<LIST THE PERSON WITH PUSH ACCESS HERE>> Affected branch(es): All 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 d83eebef987b7c9b0301e0ca23eac5da7ed4e67c Author: Nagendra Kumar<[email protected]> Date: Mon, 02 Nov 2015 17:25:02 +0530 amfd: set node oper state to enable during clm unlock [#1567] During Clm unlock, Amf is not marking node oper state to enable, if that node admin state is in locked-in state. Ideally, in cany case, Amf need to mark the state to enable when the node joins the Cluster i.e. clm unlock. The other fix is to check the node oper state while sending SU pres message to Amfnd. Change of 'node->' to 'su->su_on_node->' is a refactoring correction. Complete diffstat: ------------------ osaf/services/saf/amf/amfd/clm.cc | 4 +++- osaf/services/saf/amf/amfd/nodegroup.cc | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) Testing Commands: ----------------- Start two controllers and run the following commands: 1. immcfg -f /tmp/AppConfig-2N.xml amf-adm unlock-in safSu=SU2,safSg=AmfDemo_2N,safApp=AmfDemo1 amf-adm unlock safSu=SU2,safSg=AmfDemo_2N,safApp=AmfDemo1 2. amf-adm lock safNode=SC-2,safCluster=myClmCluster amf-adm lock safAmfNodeGroup=SCs,safAmfCluster=myAmfCluster amf-adm lock-in safAmfNodeGroup=SCs,safAmfCluster=myAmfCluster amf-adm unlock safNode=SC-2,safCluster=myClmCluster 3. amf-adm unlock-in safAmfNodeGroup=SCs,safAmfCluster=myAmfCluster 4. amf-adm unlock safAmfNodeGroup=SCs,safAmfCluster=myAmfCluster Testing, Expected Results: -------------------------- a.) After step 2. Oper state of safAmfNode=SC-2,safAmfCluster=myAmfCluster state is enabled: saAmfNodeOperState SA_UINT32_T 1 (0x1) b.) After step 3, SU on SC-2 are instantiated: Nov 2 17:53:23 PM_SC-2 osafamfnd[13777]: NO 'safSu=SU2,safSg=AmfDemo_2N,safApp=AmfDemo1' Presence State UNINSTANTIATED => INSTANTIATING Nov 2 17:53:23 PM_SC-2 amf_demo[14276]: 'safComp=AmfDemo,safSu=SU2,safSg=AmfDemo_2N,safApp=AmfDemo1' started Nov 2 17:53:23 PM_SC-2 osafamfnd[13777]: NO 'safSu=SU2,safSg=AmfDemo_2N,safApp=AmfDemo1' Presence State INSTANTIATING => INSTANTIATED Nov 2 17:53:23 PM_SC-2 amf_demo[14276]: Registered with AMF c.) After step 4, SU on SC-2 got assignment: Nov 2 17:53:26 PM_SC-2 osafamfnd[13777]: NO Assigning 'safSi=AmfDemo,safApp=AmfDemo1' ACTIVE to 'safSu=SU2,safSg=AmfDemo_2N,safApp=AmfDemo1' Nov 2 17:53:26 PM_SC-2 osafamfnd[13777]: NO Assigning 'safSi=AmfDemo2,safApp=AmfDemo1' ACTIVE to 'safSu=SU2,safSg=AmfDemo_2N,safApp=AmfDemo1' Nov 2 17:53:27 PM_SC-2 amf_demo[14276]: CSI Set - add 'safCsi=AmfDemo1,safSi=AmfDemo,safApp=AmfDemo1' HAState Active Nov 2 17:53:28 PM_SC-2 amf_demo[14276]: CSI Set - add 'safCsi=AmfDemo,safSi=AmfDemo,safApp=AmfDemo1' HAState Active Nov 2 17:53:29 PM_SC-2 amf_demo[14276]: CSI Set - add 'safCsi=AmfDemo,safSi=AmfDemo2,safApp=AmfDemo1' HAState Active Nov 2 17:53:29 PM_SC-2 osafamfnd[13777]: NO Assigned 'safSi=AmfDemo2,safApp=AmfDemo1' ACTIVE to 'safSu=SU2,safSg=AmfDemo_2N,safApp=AmfDemo1' Nov 2 17:53:30 PM_SC-2 amf_demo[14276]: CSI Set - add 'safCsi=AmfDemo2,safSi=AmfDemo,safApp=AmfDemo1' HAState Active Nov 2 17:53:30 PM_SC-2 osafamfnd[13777]: NO Assigned 'safSi=AmfDemo,safApp=AmfDemo1' ACTIVE to 'safSu=SU2,safSg=AmfDemo_2N,safApp=AmfDemo1' 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 [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
