osaf/services/saf/amf/amfd/su.cc | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
Problem:
When mw su is in locked-in state and opensaf is started, amfnd hangs.
When mw su is unlocked-in, amfnd still doesn't instantiate the mw su.
Analysis:
Amfd doesn't send instantiate message to amfnd because su is not
in enabled state and node is not in present state.
Fix:
Amfd should send instantiate message to amfnd for mw su unlock-in command.
diff --git a/osaf/services/saf/amf/amfd/su.cc b/osaf/services/saf/amf/amfd/su.cc
--- a/osaf/services/saf/amf/amfd/su.cc
+++ b/osaf/services/saf/amf/amfd/su.cc
@@ -1108,10 +1108,17 @@ static void su_admin_op_cb(SaImmOiHandle
goto done;
}
- if ((node->node_state == AVD_AVND_STATE_PRESENT) &&
+ if (((node->node_state == AVD_AVND_STATE_PRESENT) ||
+ (node->node_state ==
AVD_AVND_STATE_NO_CONFIG) ||
+ (node->node_state ==
AVD_AVND_STATE_NCS_INIT)) &&
((node->saAmfNodeAdminState !=
SA_AMF_ADMIN_LOCKED_INSTANTIATION) &&
(su->sg_of_su->saAmfSGAdminState !=
SA_AMF_ADMIN_LOCKED_INSTANTIATION)) &&
- (su->saAmfSUOperState ==
SA_AMF_OPERATIONAL_ENABLED) &&
+ ((su->saAmfSUOperState ==
SA_AMF_OPERATIONAL_ENABLED) ||
+ /* Middleware sus are not enabled until node
joins.
+ During starting of opensaf, if mw su is
+ locked-in and unlock-in command is issued,
+ su should get instantiated. */
+ (su->sg_of_su->sg_ncs_spec == true)) &&
(su->sg_of_su->saAmfSGNumPrefInserviceSUs >
sg_instantiated_su_count(su->sg_of_su))) {
/* When the SU will instantiate then prescence state
change message will come
and so store the callback parameters to send
response later on. */
------------------------------------------------------------------------------
Is your legacy SCM system holding you back? Join Perforce May 7 to find out:
• 3 signs your SCM is hindering your productivity
• Requirements for releasing software faster
• Expert tips and advice for migrating your SCM now
http://p.sf.net/sfu/perforce
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
