Summary: amfd: make auto repair restriction configurable [#2435] Review request for Ticket(s): 2435 Peer Reviewer(s): AMF devs Pull request to: *** LIST THE PERSON WITH PUSH ACCESS HERE *** Affected branch(es): develop Development branch: ticket-2435 Base revision: 66970f59421f9d4338ee6d13134afca9082c1e91 Personal repository: git://git.code.sf.net/u/userid-2226215/review
-------------------------------- 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 *** revision be7b51d723db24721c19b0b4953e794215f86d88 Author: Gary Lee <[email protected]> Date: Fri, 21 Apr 2017 19:36:51 +1000 amfd: make auto repair restriction configurable [#2435] This adds a configuration object for AMF at amfConfig=1,safApp=safAmfService. A configuration attribute 'amfRestrictAutoRepairEnable' is added. This determines if 'suMaintenanceCampaign' should be ignored to maintain legacy AMF behaviour. The default behaviour is not to support auto repair restriction. To enable restriction: immcfg -a amfRestrictAutoRepairEnable=1 amfConfig=1,safApp=safAmfService To disable restriction: immcfg -a amfRestrictAutoRepairEnable=0 amfConfig=1,safApp=safAmfService Added Files: ------------ src/amf/amfd/config.cc src/amf/amfd/config.h Complete diffstat: ------------------ src/amf/Makefile.am | 3 + src/amf/amfd/comp.cc | 2 +- src/amf/amfd/config.cc | 179 +++++++++++++++++++++++++++++++++++++++++ src/amf/amfd/config.h | 21 +++++ src/amf/amfd/imm.cc | 35 ++++++-- src/amf/amfd/ndproc.cc | 4 +- src/amf/amfd/node.cc | 4 +- src/amf/amfd/sgproc.cc | 14 ++-- src/amf/amfd/su.cc | 37 +++++++-- src/amf/amfd/su.h | 3 +- src/amf/common/amf_defs.h | 3 + src/amf/config/amf_classes.xml | 15 ++++ src/amf/config/amf_objects.xml | 7 ++ 13 files changed, 300 insertions(+), 27 deletions(-) Testing Commands: ----------------- Test 1) Turn on tracing for AMFND Ensure ‘restrict auto repair’ is disabled: immcfg -a amfRestrictAutoRepairEnable=0 amfConfig=1,safApp=safAmfService Set campaign on an SU: immcfg -a saAmfSUMaintenanceCampaign="foo" safSu=PL-5,safSg=NoRed,safApp=OpenSAF Enable ‘restrict auto repair': immcfg -a amfRestrictAutoRepairEnable=1 amfConfig=1,safApp=safAmfService Ensure the change is propagated to AMFND on PL-5 by looking for this in the trace: TRACE("suMaintenanceCampaign for '%s' changed to '%s'", su->name.c_str(), su->suMaintenanceCampaign.c_str()); Test 2) 1. Enable 'restrict auto repair' 2. "amf-adm restart <comp>" should work when suMaintenence is set for enclosing SU 3. kill <comp> when suMaintenance is set, auto repair will not occur Testing, Expected Results: -------------------------- *** PASTE COMMAND OUTPUTS / TEST RESULTS *** Conditions of Submission: ------------------------- *** HOW MANY DAYS BEFORE PUSHING, CONSENSUS ETC *** 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 ~/.gitconfig file (i.e. user.name, user.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. ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
