Summary: smf: Add capability to redo CCBs that fail [#1398] Review request for Ticket(s): 1398 Peer Reviewer(s): hans.nordeb...@ericsson.com Pull request to: *** LIST THE PERSON WITH PUSH ACCESS HERE *** Affected branch(es): develop Development branch: ticket-1398 Base revision: 1ca82324e733acd3a2fc9272253a65df7ed31baa Personal repository: git://git.code.sf.net/u/elunlen/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 NOTE: Patch(es) contain lines longer than 80 characers Comments (indicate scope for each "y" above): --------------------------------------------- *** EXPLAIN/COMMENT THE PATCH SERIES HERE *** INFORMATION: This is the second and final increment for this ticket. Increment 1 implements the IMM CCB handler and refactor handling of parallel locking and exec control handler to use the IMM CCB handler This increment is a refactoring of the "main" ccb handling that is used during a campaign. Note that this handling is using IMM as a database to store campaign states and data. No OI is used so the SA_IMM_CCB_REGISTERED_OI flag is not set. For more information see src/smf/smfd/imm_modify_config/immccb.h revision c033a5cc90dd22e302b385d2eb7925190114d2c1 Author: Lennart Lund <lennart.l...@ericsson.com> Date: Mon, 7 May 2018 15:55:51 +0200 smf: Add capability to redo CCBs that fail [#1398] Refactoring "main" CCB handling. Is mainly affecting SmfImmOperation and doImmOperations in SmfUtils. Some changes done with ticket #2584 are reverted Complete diffstat: ------------------ src/smf/smfd/SmfAdminState.cc | 23 +- src/smf/smfd/SmfAdminState.h | 20 +- src/smf/smfd/SmfCampState.cc | 10 +- src/smf/smfd/SmfCampaignInit.cc | 4 - src/smf/smfd/SmfCampaignWrapup.cc | 22 +- src/smf/smfd/SmfCampaignXmlParser.cc | 713 ++++++++------- src/smf/smfd/SmfImmApplierHdl.cc | 2 +- src/smf/smfd/SmfImmOperation.cc | 985 ++------------------- src/smf/smfd/SmfImmOperation.h | 590 +++++------- src/smf/smfd/SmfRollback.cc | 50 +- src/smf/smfd/SmfRollback.h | 11 + src/smf/smfd/SmfStepState.h | 2 + src/smf/smfd/SmfUpgradeAction.cc | 11 +- src/smf/smfd/SmfUpgradeCampaign.cc | 86 +- src/smf/smfd/SmfUpgradeProcedure.cc | 134 +-- src/smf/smfd/SmfUpgradeStep.cc | 66 +- src/smf/smfd/SmfUpgradeStep.h | 16 +- src/smf/smfd/SmfUtils.cc | 184 ++-- src/smf/smfd/SmfUtils.h | 23 +- .../smfd/imm_modify_config/add_operation_to_ccb.cc | 16 +- src/smf/smfd/imm_modify_config/immccb.cc | 23 +- src/smf/smfd/imm_modify_config/immccb.h | 84 +- src/smf/smfd/imm_modify_demo/ccbdemo_create.cc | 12 +- src/smf/smfd/imm_modify_demo/ccbhdl_test.cc | 52 +- src/smf/smfd/imm_om_ccapi/common/common.h | 7 - src/smf/smfd/imm_om_ccapi/om_handle.cc | 17 - src/smf/smfd/smfd_smfnd.h | 3 +- 27 files changed, 1167 insertions(+), 1999 deletions(-) Testing Commands: ----------------- Run some campaigns. SMF demo could be used. Also the CCB handler can be tested independently of SMF A test program can be found in imm_modify/demo/ccbhdl_test Note: To run the ccbhdl_test. ./configure --enable-tests --enable-immxml In UML: $ ccbhdl_test Testing, Expected Results: -------------------------- SMF shall work as before 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 n n 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 Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel