Summary: amfd : fix default value of saAmfSIPrefActiveAssignments during upgrades [1190]. Review request for Trac Ticket(s): #1190 Peer Reviewer(s): Hans F., Hans N., Nagendra Pull request to: <<LIST THE PERSON WITH PUSH ACCESS HERE>> Affected branch(es): default Development branch: <<IF ANY GIVE THE REPO URL>>
-------------------------------- 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): --------------------------------------------- changeset f9129bf68c9d23ec72c5caea6513a17a48a4492c Author: praveen.malv...@oracle.com Date: Wed, 03 Dec 2014 17:02:08 +0530 amfd : fix default value of saAmfSIPrefActiveAssignments during upgrades [1190] Note:Please apply this patch on top of already floated patch for #1190. A patch is floated on opensaf-devel for fixing the default value of saAmfSIPrefActiveAssignments against #1190. Floated patch had following problems: 1)If a configuration sets saAmfSIPrefActiveAssignments = saAmfSGNumPrefAssignedSUs. In this case SI will be marked Fully Assigned as soon as it is assigned to first SU and other SUs are still in lock-in state. 2)If peer AMFD is with old version than old AMFD will asset in some cases like: a)configuration: 3 SUs in nway active SG with following params saAmfSGNumPrefInserviceSUs=3, saAmfSGNumPrefAssignedSUs=3, and saAmfSIPrefActiveAssignments=1. b)Bring SC-1 with this patch and SC-2 without this patch. Unlock-in and unlock all the SUs. c)controller swap. d) lock SU3. AMFD will crash. si.cc:1260: update_ass_state: Assertion 'saAmfSINumCurrActiveAssignments <= saAmfSIPrefActiveAssignments' failed. This is because SC-1 had check pointed saAmfSINumCurrActiveAssignments =3 which is not accordance with old amfd. 3)If user himself wants to configure saAmfSIPrefActiveAssignments=1. AMF cannot distinguish if value 1 is set by the user or it is the default value given by IMM. This is AMF schema related issue and AMF PR doc needs to be updated for this. Patch fixes the problem by incrementing the AVD_MBCSV_SUB_PART_VERSION and adjusting saAmfSIPrefActiveAssignments using peer amfd version. Since AMFD version is being upgraded, this ticket needs to be pushed as enhancement. Complete diffstat: ------------------ osaf/services/saf/amf/amfd/include/ckpt.h | 3 ++- osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc | 12 ++++++++++++ osaf/services/saf/amf/amfd/si.cc | 9 +++++---- 3 files changed, 19 insertions(+), 5 deletions(-) Testing Commands: ----------------- Configuration: 3 SUs in nway active SG with following params saAmfSGNumPrefInserviceSUs=3, saAmfSGNumPrefAssignedSUs=3, and saAmfSIPrefActiveAssignments=1. steps to test: a)Bring SC-1 with this patch and already floated patch for #1190 and SC-2 without this patch. b)Unlock-in and unlock all the SUs. c)controller swap. d)lock SU3. Testing, Expected Results: -------------------------- No amfd crash is observed. Conditions of Submission: ------------------------- Ack from Hans F.. Arch Built Started Linux distro ------------------------------------------- mips n n mips64 n n x86 y y 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 ~/.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. ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel