From: <nag...@or...> - 2014-06-30 11:08:29
|
Summary: amfd: allow admin commands before cluster timer expiry [#620] Review request for Trac Ticket(s): #620 Peer Reviewer(s): Hans F, Hans N, Praveen 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 ce64d11c94215fc8e3902ae45978614d13b5a277 Author: Nagendra Kumar<nag...@or...> Date: Mon, 30 Jun 2014 16:11:06 +0530 amfd: allow admin commands before cluster timer expiry [#620] SA_AMF_ADMIN_UNLOCK, SA_AMF_ADMIN_LOCK, SA_AMF_ADMIN_UNLOCK_INSTANTIATION and SA_AMF_ADMIN_REPAIRED can be issued on amf entities before cluster timer expiry. The other commands will be returned as try_again during the period. Complete diffstat: ------------------ osaf/services/saf/amf/amfd/imm.cc | 9 ++++++++- osaf/services/saf/amf/amfd/include/util.h | 1 + osaf/services/saf/amf/amfd/node.cc | 26 ++++++++++++++++++++------ osaf/services/saf/amf/amfd/sg.cc | 16 ++++++++++++++++ osaf/services/saf/amf/amfd/si.cc | 10 +++++++++- osaf/services/saf/amf/amfd/su.cc | 23 ++++++++++++++++------- osaf/services/saf/amf/amfd/util.cc | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 122 insertions(+), 15 deletions(-) Testing Commands: ----------------- 1. Admin Op on SI: Before and After Cluster Timer Expiry: Lock and Unlock. Passed. Before and After Cluster Timer Expiry: Shutdown, Si Swap, Repaired. Before it passed with Error TryAgain and after as expected. 2. Admin Op Restart on Comp: Before timer expiry, all command fails with TRY_AGAIN. After timer expiry it succeeded. 3. Admin op on SU: a. Before timer expiry, SA_AMF_ADMIN_RESTART, SA_AMF_ADMIN_EAM_START, SA_AMF_ADMIN_EAM_STOP return TRY_AGAIN and after timer expiry, not supported. b. Before timer expiry, SA_AMF_ADMIN_UNLOCK, SA_AMF_ADMIN_LOCK, SA_AMF_ADMIN_UNLOCK_INSTANTIATION return OK. Unlock-in instantiate application, Lock and Unlock takes effect after timer expiry. c. SA_AMF_ADMIN_LOCK_INSTANTIATION return try_again before timer expiry and it terminates the application after timer expiry. d. SA_AMF_ADMIN_SHUTDOWN return try_again before timer expiry. After timer expiry, it works as expected. e. SA_AMF_ADMIN_SG_ADJUST return try_again before timer expiry. After timer expiry, it return not supported. f. Before timer expiry, make component into inst failed state and use SA_AMF_ADMIN_REPAIRED to repair. It instantiate the component. g. Before timer expiry, make component into term failed state and use SA_AMF_ADMIN_REPAIRED to repair. It instantiate the component. 4. Admin op on SG: a. Before timer expiry, SA_AMF_ADMIN_SG_ADJUST and SA_AMF_ADMIN_EAM_START return TRY_AGAIN and after timer expiry, not supported. b. Before timer expiry, SA_AMF_ADMIN_SHUTDOWN will return TRY_AGAIN and after timer expiry, it will work as expected. c. Before timer expiry, SA_AMF_ADMIN_LOCK_INSTANTIATION return try_again and after timer expiry, it work as expected. d. Before timer expiry, SA_AMF_ADMIN_UNLOCK and SA_AMF_ADMIN_LOCK sets admin state unlock and lock and no assignment. After timer expiry, it takes effect. e. Before timer expiry, SA_AMF_ADMIN_UNLOCK_INSTANTIATION instantiates the component. The same after timer expiry as well. 5. Admin op on Node: a. Before timer expiry, SA_AMF_ADMIN_RESTART, SA_AMF_ADMIN_EAM_START and SA_AMF_ADMIN_REPAIRED return TRY_AGAIN and after timer expiry, not supported. b. Before timer expiry, SA_AMF_ADMIN_SHUTDOWN will return TRY_AGAIN and after timer expiry, it will work as expected. c. Before timer expiry, SA_AMF_ADMIN_LOCK_INSTANTIATION return try_again and after timer expiry, it work as expected. d. Before timer expiry, SA_AMF_ADMIN_UNLOCK and SA_AMF_ADMIN_LOCK sets admin state unlock and lock and no assignment. After timer expiry, it takes effect. e. Before timer expiry, SA_AMF_ADMIN_UNLOCK_INSTANTIATION instantiates the component. The same after timer expiry as well. 6. Admin Op on App and Cluster: Before timer expiry, all command fails with TRY_AGAIN. After timer expiry it return not supported. Testing, Expected Results: -------------------------- As above. Conditions of Submission: ------------------------- Ack from peer reviewers 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. |