Summary: amfd: Allow multiple csi addition in single ccb [#750] Review request for Trac Ticket(s): #750 Peer Reviewer(s): Hans F, Hans N, Praveen Pull request to: Affected branch(es): All Development branch: opensaf-4.3.x
-------------------------------- 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 61ab7a85da3fbb3bb24a32b17151ddcfc7284e15 Author: Nagendra Kumar<nagendr...@oracle.com> Date: Fri, 25 Apr 2014 16:39:38 +0530 amfd: Allow multiple csi addition in single ccb [#750] Problem: Amf rejects csi addition if previous csi addition is in progress. Analysis: Amfd can allow csi addition in sequence but can delay applying subsequent csi addition. Fix: Next csi addition are delayed till the first csi addition procers if finished. Complete diffstat: ------------------ osaf/services/saf/avsv/avd/avd_csi.c | 46 +++++++++++++++++++++++++++++++++------------- osaf/services/saf/avsv/avd/avd_sgproc.c | 17 +++++++++++++++++ osaf/services/saf/avsv/avd/include/avd_csi.h | 1 + 3 files changed, 51 insertions(+), 13 deletions(-) Testing Commands: ----------------- Start amf demo and add multiple csi in one ccb and keep delay in csi response of demo. The following configuration can be applied: <imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema" xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <object class="SaAmfCSI"> <dn>safCsi=AmfDemo1,safSi=AmfDemo,safApp=AmfDemo1</dn> <attr> <name>saAmfCSType</name> <value>safVersion=1,safCSType=AmfDemo1</value> </attr> </object> <object class="SaAmfCSI"> <dn>safCsi=AmfDemo2,safSi=AmfDemo,safApp=AmfDemo1</dn> <attr> <name>saAmfCSType</name> <value>safVersion=1,safCSType=AmfDemo1</value> </attr> </object> <object class="SaAmfCSI"> <dn>safCsi=AmfDemo3,safSi=AmfDemo,safApp=AmfDemo1</dn> <attr> <name>saAmfCSType</name> <value>safVersion=1,safCSType=AmfDemo1</value> </attr> </object> </imm:IMM-contents> Testing, Expected Results: -------------------------- Apr 11 20:01:09 PM_SC-180 osafimmnd[22091]: NO Ccb 3 COMMITTED (immcfg_PM_SC-180_22325) Apr 11 20:01:09 PM_SC-180 osafamfd[22142]: WA CSI create 'safCsi=AmfDemo2,safSi=AmfDemo,safApp=AmfDemo1' delayed: pending as signment for 'safSu=SU1,safSg=AmfDemo,safApp=AmfDemo1' Apr 11 20:01:09 PM_SC-180 osafamfd[22142]: WA CSI create 'safCsi=AmfDemo3,safSi=AmfDemo,safApp=AmfDemo1' delayed: pending as signment for 'safSu=SU1,safSg=AmfDemo,safApp=AmfDemo1' Apr 11 20:01:09 PM_SC-180 osafamfnd[22152]: NO Adding CSI 'safCsi=AmfDemo1,safSi=AmfDemo,safApp=AmfDemo1' Apr 11 20:01:09 PM_SC-180 osafamfnd[22152]: NO Assigning 'safSi=AmfDemo,safApp=AmfDemo1' ACTIVE to 'safSu=SU1,safSg=AmfDemo, safApp=AmfDemo1' Apr 11 20:01:09 PM_SC-180 amf_demo[22304]: CSI Set - add 'safCsi=AmfDemo1,safSi=AmfDemo,safApp=AmfDemo1' HAState Active Apr 11 20:01:15 PM_SC-180 osafamfnd[22152]: NO Assigned 'safSi=AmfDemo,safApp=AmfDemo1' ACTIVE to 'safSu=SU1,safSg=AmfDemo,s afApp=AmfDemo1' Apr 11 20:01:15 PM_SC-180 osafamfnd[22152]: NO Adding CSI 'safCsi=AmfDemo2,safSi=AmfDemo,safApp=AmfDemo1' Apr 11 20:01:15 PM_SC-180 osafamfnd[22152]: NO Assigning 'safSi=AmfDemo,safApp=AmfDemo1' ACTIVE to 'safSu=SU1,safSg=AmfDemo, safApp=AmfDemo1' Apr 11 20:01:15 PM_SC-180 amf_demo[22304]: CSI Set - add 'safCsi=AmfDemo2,safSi=AmfDemo,safApp=AmfDemo1' HAState Active Apr 11 20:01:19 PM_SC-180 osafamfnd[22152]: NO Assigned 'safSi=AmfDemo,safApp=AmfDemo1' ACTIVE to 'safSu=SU1,safSg=AmfDemo,s afApp=AmfDemo1' Apr 11 20:01:19 PM_SC-180 osafamfnd[22152]: NO Adding CSI 'safCsi=AmfDemo3,safSi=AmfDemo,safApp=AmfDemo1' Apr 11 20:01:19 PM_SC-180 osafamfnd[22152]: NO Assigning 'safSi=AmfDemo,safApp=AmfDemo1' ACTIVE to 'safSu=SU1,safSg=AmfDemo, safApp=AmfDemo1' Apr 11 20:01:19 PM_SC-180 amf_demo[22304]: CSI Set - add 'safCsi=AmfDemo3,safSi=AmfDemo,safApp=AmfDemo1' HAState Active Apr 11 20:01:24 PM_SC-180 osafamfnd[22152]: NO Assigned 'safSi=AmfDemo,safApp=AmfDemo1' ACTIVE to 'safSu=SU1,safSg=AmfDemo,s afApp=AmfDemo1' Conditions of Submission: ------------------------- Ack from 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. ------------------------------------------------------------------------------ Start Your Social Network Today - Download eXo Platform Build your Enterprise Intranet with eXo Platform Software Java Based Open Source Intranet - Social, Extensible, Cloud Ready Get Started Now And Turn Your Intranet Into A Collaboration Platform http://p.sf.net/sfu/ExoPlatform _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel