Summary: avsv: avoid reading from IMM
Review request for Trac Ticket(s): 574
Peer Reviewer(s): Praveen, Nags, Hans
Pull request to: <<LIST THE PERSON WITH PUSH ACCESS HERE>>
Affected branch(es): all
Development branch: 4.3, 5110:87f6fa7ae4fe
--------------------------------
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):
---------------------------------------------
Note: some test logs should be removed before push!
changeset 009c595b3d04c31f3cd165bc8837488015deab9b
Author: Hans Feldt <hans.fe...@ericsson.com>
Date: Mon, 07 Apr 2014 06:39:29 +0200
avsv: include and use sirank in SUSI msg [#574]
amfnd process aborted in immutils and node rebooted by amf watchdog
with the
following log: 2013-09-09 11:50:02 osafamfnd SC-2-1 err osafamfnd[5336]:
saImmOmInitialize FAILED, rc = 5
When the AMF node director receives a 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 amfnd MDS version.
changeset 41c3d1aa41d0a6e2818864a8bd43a5152a9c41b9
Author: Hans Feldt <hans.fe...@ericsson.com>
Date: Mon, 07 Apr 2014 06:48:44 +0200
avsv: 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.
changeset d1a8ee59493a2893e1720650e3f5c88a75eb26f4
Author: Hans Feldt <hans.fe...@ericsson.com>
Date: Mon, 07 Apr 2014 06:49:16 +0200
avsv: include su_failover in REG_SU msg [#574]
AMF in 4.3 does not have support for SU-Failover, it was added in 4.4.
So in
4.4 the AMF node director reads su_failover from IMM when processing the
REG_SU message.
While anyway changing the messaging version in 4.3 for other reasons (SI
rank) we add su_failover and can thereby leverage from that in the 4.4
branch.
Complete diffstat:
------------------
osaf/libs/common/avsv/avsv_d2nedu.c | 50
+++++++++++++++++++++++++++++++++++---------------
osaf/libs/common/avsv/include/avsv_d2nmsg.h | 7 ++++---
osaf/services/saf/avsv/avd/avd_mds.c | 11 +++++++----
osaf/services/saf/avsv/avd/avd_util.c | 22 ++++++++++++++++++++++
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_mds.c | 33
++++++++++++++++++++++++++-------
osaf/services/saf/avsv/avnd/avnd_sidb.c | 134
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------
osaf/services/saf/avsv/avnd/avnd_su.c | 59
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
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 | 5 ++++-
12 files changed, 231 insertions(+), 146 deletions(-)
Testing Commands:
-----------------
1) - start one controller of version 4.3.2 and one of 4.3 latest plus patches
- load and start demo app
- SI swap demo app
- SI swap controller SI
2) reboot old controller, reboot new controller
3) - start controller with the same version 4.3 latest plus patches
- same tests as above
Testing, Expected Results:
--------------------------
1) on 4.3 latest expect logs like:
Apr 7 07:22:28 SC-2 local0.notice osafamfnd[440]: NO get_sirank
safSi=AmfDemo,safApp=AmfDemo1
Apr 7 07:22:28 SC-2 local0.notice osafamfnd[440]: NO get_comp_capability:
comptype = 'safVersion=1,safCompType=AmfDemo1' : csi =
'safCsi=AmfDemo,safSi=AmfDemo,safApp=AmfDemo1'
Apr 7 07:22:28 SC-2 local0.notice osafamfnd[440]: NO get_cstype: csi =
'safCsi=AmfDemo,safSi=AmfDemo,safApp=AmfDemo1'
SI swap work.
2) controllers can sync from each other
3) works fine but without logs
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.
------------------------------------------------------------------------------
Put Bad Developers to Shame
Dominate Development with Jenkins Continuous Integration
Continuously Automate Build, Test & Deployment
Start a new project now. Try Jenkins in the cloud.
http://p.sf.net/sfu/13600_Cloudbees_APR
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
