osaf/services/saf/clmsv/clms/clms_evt.c | 2 +-
osaf/services/saf/clmsv/clms/clms_evt.h | 2 +-
osaf/services/saf/clmsv/clms/clms_mds.c | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
This ticket is to support the use case of /etc/init.d/opensafd stop. However
the previous patch was acting upon CLMNA down for removing the node from
cluster.
This will prevent rollback from older releases because CLMNA exits immediately
after
updating the CLM server.
This patch acts upon AMFND down to mark the node as exiting the cluster.
diff --git a/osaf/services/saf/clmsv/clms/clms_evt.c
b/osaf/services/saf/clmsv/clms/clms_evt.c
--- a/osaf/services/saf/clmsv/clms/clms_evt.c
+++ b/osaf/services/saf/clmsv/clms/clms_evt.c
@@ -1279,7 +1279,7 @@ void clms_process_mbx(SYSF_MBX *mbx)
case CLMSV_CLMS_RDA_EVT:
proc_rda_evt(msg);
break;
- case CLMSV_CLMS_CLMNA_DOWN:
+ case CLMSV_AVND_DOWN_EVT:
proc_mds_node_evt(msg);
break;
default:
diff --git a/osaf/services/saf/clmsv/clms/clms_evt.h
b/osaf/services/saf/clmsv/clms/clms_evt.h
--- a/osaf/services/saf/clmsv/clms/clms_evt.h
+++ b/osaf/services/saf/clmsv/clms/clms_evt.h
@@ -27,7 +27,7 @@ typedef enum clmsv_clms_evt_type {
CLMSV_CLMS_MDS_NODE_EVT,
CLMSV_CLMS_RDA_EVT,
CLMSV_CLMS_RT_UPDATE,
- CLMSV_CLMS_CLMNA_DOWN,
+ CLMSV_AVND_DOWN_EVT,
CLMSV_CLMS_EVT_MAX,
} CLMSV_CLMS_EVT_TYPE;
diff --git a/osaf/services/saf/clmsv/clms/clms_mds.c
b/osaf/services/saf/clmsv/clms/clms_mds.c
--- a/osaf/services/saf/clmsv/clms/clms_mds.c
+++ b/osaf/services/saf/clmsv/clms/clms_mds.c
@@ -1108,8 +1108,8 @@ static uint32_t clms_mds_svc_event(struc
evt->type = CLMSV_CLMS_CLMA_DOWN;
evt->info.mds_info.node_id =
info->info.svc_evt.i_node_id;
evt->info.mds_info.mds_dest_id =
info->info.svc_evt.i_dest;
- } else if (info->info.svc_evt.i_svc_id ==
NCSMDS_SVC_ID_CLMNA) {
- evt->type = CLMSV_CLMS_CLMNA_DOWN;
+ } else if (info->info.svc_evt.i_svc_id ==
NCSMDS_SVC_ID_AVND ) {
+ evt->type = CLMSV_AVND_DOWN_EVT;
evt->info.node_mds_info.node_id =
info->info.svc_evt.i_node_id;
evt->info.node_mds_info.nodeup = false;
}
@@ -1244,7 +1244,7 @@ uint32_t clms_mds_init(CLMS_CB * cb)
{
NCSMDS_INFO mds_info;
uint32_t rc;
- MDS_SVC_ID svc[] = { NCSMDS_SVC_ID_CLMA, NCSMDS_SVC_ID_CLMNA };
+ MDS_SVC_ID svc[] = { NCSMDS_SVC_ID_CLMA, NCSMDS_SVC_ID_CLMNA,
NCSMDS_SVC_ID_AVND };
TRACE_ENTER();
@@ -1288,7 +1288,7 @@ uint32_t clms_mds_init(CLMS_CB * cb)
mds_info.i_svc_id = NCSMDS_SVC_ID_CLMS;
mds_info.i_op = MDS_SUBSCRIBE;
mds_info.info.svc_subscribe.i_scope = NCSMDS_SCOPE_NONE;
- mds_info.info.svc_subscribe.i_num_svcs = 2;
+ mds_info.info.svc_subscribe.i_num_svcs = 3;
mds_info.info.svc_subscribe.i_svc_ids = svc;
rc = ncsmds_api(&mds_info);
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
