Summary: Reduce IMM reads by AMF node director Review request for Trac Ticket(s): 574 Peer Reviewer(s): Nags, Praveen, Hans Pull request to: <<LIST THE PERSON WITH PUSH ACCESS HERE>> Affected branch(es): 4.3 and later Development branch: 4.3
-------------------------------- Impacted area Impact y/n -------------------------------- Docs n Build system n RPM/packaging n Configuration files n Startup scripts n SAF services n OpenSAF services n Core libraries n Samples n Tests n Other n Comments (indicate scope for each "y" above): --------------------------------------------- Note: some debug logs should be removed before push. changeset c73966ac00802ebeae69ac49001579886bb84fd7 Author: Hans Feldt <hans.fe...@ericsson.com> Date: Fri, 28 Mar 2014 11:11:12 +0100 amf: cleanup dnd edu [#574] Cosmetic cleanup of the dnd edu. Some comments and one (unused) offset was wrong. No functional impact. changeset 4a2263aac1afe1926f10cf5a03d32272f72f4bcd Author: Hans Feldt <hans.fe...@ericsson.com> Date: Fri, 28 Mar 2014 13:58:39 +0100 amfnd: store amfd mds ver [#574] changeset 2af994b14f9ced4a524197be106e0bad39208374 Author: Hans Feldt <hans.fe...@ericsson.com> Date: Fri, 28 Mar 2014 14:00:00 +0100 amf: include and use sirank in SUSI msg [#574] When the AMF node director receives the SUSI ASGN message, it reads SI rank from IMM. If IMM does not respond in a timely manner the amfnd process will be aborted and the node restarted (by the AMF watchdog). By including SI rank (an int) in the SUSI ASGN msg, the read from IMM can be skipped/done conditionally based on the amfd MDS version. changeset 4accc385dfbadf28f40f209e0996aba181449bd9 Author: Hans Feldt <hans.fe...@ericsson.com> Date: Fri, 28 Mar 2014 14:03:05 +0100 amf: include and use comp capability in SUSI msg [#574] When the AMF node director receives the SUSI ASGN message, for each CSI it reads the saAmfCSType attribute from IMM. When the AMF node director receives the SUSI MOD message, for each CSI it reads the saAmfCtCompCapability attribute from the comp and csi associated SaAmfCtCsType instance. In any of these cases if IMM does not respond in a timely manner the amfnd process will be aborted and the node restarted. By including component capability (an int) in the SUSI ASG msg, these reads from IMM can be completely skipped in the node director. In service upgrade: uses version 5 of the protocol changeset 55a98f2d37f9e270ae3e8622c35605260c69bcec Author: Hans Feldt <hans.fe...@ericsson.com> Date: Fri, 28 Mar 2014 14:05:54 +0100 amf: include and use su_failover in REG_SU msg [#574] When the AMF node director receives the REG_SU message, it reads the saAmfSUFailover attribute from IMM. If IMM does not respond in a timely manner the amfnd process will be aborted and the node restarted. By including su_failover (an int) in the REG_SU msg, the read from IMM can be skipped. Complete diffstat: ------------------ osaf/libs/common/avsv/avsv_d2nedu.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------- osaf/libs/common/avsv/include/avsv_d2nmsg.h | 6 ++++- osaf/services/saf/avsv/avd/avd_mds.c | 13 +++++++--- osaf/services/saf/avsv/avd/avd_util.c | 21 ++++++++++++++++ osaf/services/saf/avsv/avd/include/avd_mds.h | 2 +- osaf/services/saf/avsv/avnd/avnd_comp.c | 51 +--------------------------------------- osaf/services/saf/avsv/avnd/avnd_di.c | 1 + osaf/services/saf/avsv/avnd/avnd_mds.c | 23 ++++++++++++++---- osaf/services/saf/avsv/avnd/avnd_sidb.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------- osaf/services/saf/avsv/avnd/avnd_sudb.c | 5 ++++ osaf/services/saf/avsv/avnd/include/avnd_cb.h | 1 + osaf/services/saf/avsv/avnd/include/avnd_comp.h | 2 +- osaf/services/saf/avsv/avnd/include/avnd_evt.h | 1 + osaf/services/saf/avsv/avnd/include/avnd_mds.h | 2 +- osaf/services/saf/avsv/avnd/include/avnd_su.h | 1 + 15 files changed, 213 insertions(+), 140 deletions(-) Testing Commands: ----------------- 1) Start 2 old 4.3 controllers Start 2 new (with patch) payloads Load and start demo application on payloads Failover demo app 2) As 1) but with new 4.3 controllers 3) Start one old 4.3 controller Start one new 4.3 controller Controller switchover Controller failover Testing, Expected Results: -------------------------- Should work Conditions of Submission: ------------------------- Ack from reviewers Arch Built Started Linux distro ------------------------------------------- mips n n mips64 n n x86 n n x86_64 y y uml 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. ------------------------------------------------------------------------------ _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel