Ack, code review only/Thanks HansN
-----Original Message-----
From: Gary Lee [mailto:gary....@dektech.com.au]
Sent: den 27 september 2017 08:49
To: Hans Nordebäck <hans.nordeb...@ericsson.com>; Minh Hon Chau
<minh.c...@dektech.com.au>; ravisekhar.ko...@oracle.com;
praveen.malv...@oracle.com
Cc: opensaf-devel@lists.sourceforge.net; Gary Lee <gary....@dektech.com.au>
Subject: [PATCH 1/1] amfd: remove node_up variable from AVD_AVND [#2595]
node_up is not checkpointed. Replace with node_state.
---
src/amf/amfd/clm.cc | 6 +++---
src/amf/amfd/ndfsm.cc | 1 -
src/amf/amfd/ndproc.cc | 1 -
src/amf/amfd/node.cc | 1 -
src/amf/amfd/node.h | 1 -
5 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/amf/amfd/clm.cc b/src/amf/amfd/clm.cc index
7340c4bf3..d8342ca88 100644
--- a/src/amf/amfd/clm.cc
+++ b/src/amf/amfd/clm.cc
@@ -247,7 +247,7 @@ static void clm_track_cb(
case SA_CLM_CHANGE_VALIDATE:
if (notifItem->clusterChange == SA_CLM_NODE_LEFT) {
node = avd_node_find_nodeid(notifItem->clusterNode.nodeId);
- if (node == nullptr || node->node_up == false) {
+ if (node == nullptr || node->node_state ==
+ AVD_AVND_STATE_ABSENT) {
LOG_IN("%s: CLM node '%s' is not an AMF cluster member",
__FUNCTION__, node_name.c_str());
goto done;
@@ -263,7 +263,7 @@ static void clm_track_cb(
case SA_CLM_CHANGE_START:
node = avd_node_find_nodeid(notifItem->clusterNode.nodeId);
- if (node == nullptr || node->node_up == false) {
+ if (node == nullptr || node->node_state ==
+ AVD_AVND_STATE_ABSENT) {
LOG_IN("%s: CLM node '%s' is not an AMF cluster member",
__FUNCTION__,
node_name.c_str());
goto done;
@@ -294,7 +294,7 @@ static void clm_track_cb(
LOG_IN("%s: CLM node '%s' is not an AMF cluster member",
__FUNCTION__, node_name.c_str());
goto done;
- } else if (node->node_up == false) {
+ } else if (node->node_state == AVD_AVND_STATE_ABSENT) {
LOG_IN("%s: CLM node '%s' is not an AMF cluster member; MDS down
received",
__FUNCTION__, node_name.c_str());
avd_node_delete_nodeid(node); diff --git a/src/amf/amfd/ndfsm.cc
b/src/amf/amfd/ndfsm.cc index 223f57f20..ca2e3f698 100644
--- a/src/amf/amfd/ndfsm.cc
+++ b/src/amf/amfd/ndfsm.cc
@@ -247,7 +247,6 @@ void record_node_up_msg_info(AVD_AVND *avnd, const
AVD_DND_MSG *n2d_msg) {
osafassert(avnd != nullptr);
avnd->adest = n2d_msg->msg_info.n2d_node_up.adest_address;
- avnd->node_up = true;
if (n2d_msg->msg_info.n2d_node_up.msg_id >= avnd->rcv_msg_id) {
LOG_NO("Received node_up from %x: msg_id %u", diff --git
a/src/amf/amfd/ndproc.cc b/src/amf/amfd/ndproc.cc index 2edb9b16e..0c6316627
100644
--- a/src/amf/amfd/ndproc.cc
+++ b/src/amf/amfd/ndproc.cc
@@ -1221,6 +1221,5 @@ void avd_node_failover(AVD_AVND *node) {
avd_pg_node_csi_del_all(avd_cb, node);
avd_node_down_mw_susi_failover(avd_cb, node);
avd_node_down_appl_susi_failover(avd_cb, node);
- node->node_up = false; // postpone deletion from node_id_db
TRACE_LEAVE();
}
diff --git a/src/amf/amfd/node.cc b/src/amf/amfd/node.cc index
e7eb709f0..0ffcfb782 100644
--- a/src/amf/amfd/node.cc
+++ b/src/amf/amfd/node.cc
@@ -120,7 +120,6 @@ void AVD_AVND::initialize() {
clm_change_start_preceded = {};
recvr_fail_sw = {};
admin_ng = {};
- node_up = false;
}
//
diff --git a/src/amf/amfd/node.h b/src/amf/amfd/node.h index
4cee956cc..e64bf8c93 100644
--- a/src/amf/amfd/node.h
+++ b/src/amf/amfd/node.h
@@ -148,7 +148,6 @@ class AVD_AVND {
bool is_campaign_set_for_all_sus() const;
// Member functions.
void node_sus_termstate_set(bool term_state) const;
- bool node_up; // true if MDS is up, false if MDS is down
private:
void initialize();
--
2.11.0
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
