Summary: smf: Fix failed rollback of DELETE/MODIFY CCB with originally empty
attributes [#2877]
Review request for Ticket(s): 2877
Peer Reviewer(s): Lennart Lund
Pull request to: Lennart Lund
Affected branch(es): develop
Development branch: ticket-2877
Base revision: b43856b6227e989fa6583edfceea10c0849c130d
Personal repository: git://git.code.sf.net/u/nguyenluu/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):
---------------------------------------------
revision 6a3ea7621b35c4562571f8dd6156ad03c1cd8a2e
Author: Nguyen Luu <nguyen.tk....@dektech.com.au>
Date: Wed, 20 Jun 2018 17:30:42 +0700
smf: Fix failed rollback of DELETE/MODIFY CCB with originally empty attributes
[#2877]
Currently, if an upgrade DELETE or MODIFY CCB contains empty-value
attributes, SMF will create rollback data for those attributes with
the hard-coded "<_empty_>" string value. However, this hard-coded
string will actually make the later rollback fail, especially for
numeric-type attributes, when trying to convert "<_empty_>" to the
real numeric type, which is considered an invalid conversion.
This commit fixes that kind of rollback issue by:
- Not re-creating any originally empty-value attributes when rolling
back DELETE CCBs.
- Saving an actual empty string instead of the hard-coded "<_empty_>"
string for later rollback of empty attributes that are going to be
added with values by MODIFY CCBs in the upgrade.
This commit also fixes a few semantic errors in the code, and improve
some log/trace printouts.
Complete diffstat:
------------------
src/smf/smfd/SmfImmOperation.cc | 8 ++++----
src/smf/smfd/SmfImmOperation.h | 3 ++-
src/smf/smfd/SmfRollback.cc | 2 +-
src/smf/smfd/imm_modify_config/add_operation_to_ccb.cc | 13 ++++++++-----
src/smf/smfd/imm_modify_config/attribute.cc | 10 +++++++---
src/smf/smfd/imm_modify_config/immccb.cc | 6 +++---
6 files changed, 25 insertions(+), 17 deletions(-)
Testing Commands:
-----------------
Testing steps as described in the ticket.
Testing, Expected Results:
--------------------------
- The upgrade campaign is successfully rollbacked.
- Any empty attributes that got added with values in the upgrade
are back to empty after the rollback.
Conditions of Submission:
-------------------------
Ack from Lennart.
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
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
