Summary: amfnd: process su instantiation in a separate thread [#517] Review request for Trac Ticket(s): #517 Peer Reviewer(s): Amf Developers Pull request to: <<LIST THE PERSON WITH PUSH ACCESS HERE>> Affected branch(es): All Development branch: Default
-------------------------------- 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 e0e5932d6346092fb5cc215954a0cc3119684a23 Author: Nagendra Kumar<nagendr...@oracle.com> Date: Tue, 10 May 2016 20:59:40 +0530 amfnd: process su instantiation in a separate thread [#517] If immnd is down and Amf decides to instantiate some SU, then there is a deadlock between Amfnd and Imm. Amf calls Imm api to read imm attributes during SU instantiation and stuck because Imm is down. Imm waits for Amfnd to instantiate/restart it. So, both waits for each other. This is a deadlock. So, the fix bypasses main thread for information reading and does process of SU instantiation in a main thread. So, when Imm is down, its instantiation/restart happens in the main thread. If any SU instantiation request comes, then Amfnd routes that request in a separate thread, that threads stuck in Imm api call untill Imm is not restarted and responds to Imm api call. This obviates the deadlock between Amfnd and Imm. Added Files: ------------ osaf/services/saf/amf/amfnd/imm.cc Complete diffstat: ------------------ osaf/services/saf/amf/amfnd/Makefile.am | 3 +- osaf/services/saf/amf/amfnd/amfnd.cc | 4 +- osaf/services/saf/amf/amfnd/clc.cc | 13 +++-- osaf/services/saf/amf/amfnd/clm.cc | 4 +- osaf/services/saf/amf/amfnd/compdb.cc | 46 +++++++++++++++++++-- osaf/services/saf/amf/amfnd/di.cc | 12 ++-- osaf/services/saf/amf/amfnd/err.cc | 12 ++-- osaf/services/saf/amf/amfnd/evt.cc | 9 ++++ osaf/services/saf/amf/amfnd/hcdb.cc | 39 ++++++++++++++++-- osaf/services/saf/amf/amfnd/imm.cc | 140 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ osaf/services/saf/amf/amfnd/include/Makefile.am | 3 +- osaf/services/saf/amf/amfnd/include/avnd_comp.h | 6 +- osaf/services/saf/amf/amfnd/include/avnd_evt.h | 7 +++ osaf/services/saf/amf/amfnd/include/avnd_proxy.h | 4 +- osaf/services/saf/amf/amfnd/include/avnd_su.h | 14 ++---- osaf/services/saf/amf/amfnd/include/imm.h | 2 + osaf/services/saf/amf/amfnd/main.cc | 7 ++- osaf/services/saf/amf/amfnd/su.cc | 6 +- osaf/services/saf/amf/amfnd/sudb.cc | 47 +++++++++++++++++++++++ osaf/services/saf/amf/amfnd/susm.cc | 140 +++++++++++++++++++++++++++++++++++++++++++++----------------------- osaf/services/saf/amf/amfnd/term.cc | 4 +- 21 files changed, 419 insertions(+), 103 deletions(-) Testing Commands: ----------------- 1. Start two controllers. 2. Upload Amf demo config. 3. Add one component using immcfg 4. Keep sleep of 5 sec in immnd stop script. 5. Kill Immnd and issue unlock-in demo su. Testing, Expected Results: -------------------------- Amf demo component should get instantiated and Amfnd and Imm shouldn't wait for each other. Conditions of Submission: ------------------------- Ack 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. ------------------------------------------------------------------------------ Mobile security can be enabling, not merely restricting. Employees who bring their own devices (BYOD) to work are irked by the imposition of MDM restrictions. Mobile Device Manager Plus allows you to control only the apps on BYO-devices by containerizing them, leaving personal data untouched! https://ad.doubleclick.net/ddm/clk/304595813;131938128;j _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel