---
src/amf/amfd/ndfsm.cc | 11 ++++-------
src/amf/amfd/proc.h | 2 +-
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/amf/amfd/ndfsm.cc b/src/amf/amfd/ndfsm.cc
index 434c30ce4..be7db7a3e 100644
--- a/src/amf/amfd/ndfsm.cc
+++ b/src/amf/amfd/ndfsm.cc
@@ -169,7 +169,7 @@ uint32_t avd_count_sync_node_size(AVD_CL_CB *cb) {
uint32_t count = 0;
TRACE_ENTER();
- count = node_name_db->size() - 1;
+ count = node_name_db->size();
TRACE("sync node size:%d", count);
return count;
@@ -180,15 +180,13 @@ uint32_t avd_count_sync_node_size(AVD_CL_CB *cb) {
* Purpose: Helper function count number of nodes that sent node_up msg to
* director
*
- * Input: cb - the AVD control block
- *
* Returns: Number of node
*
* NOTES:
*
*
**************************************************************************/
-uint32_t avd_count_node_up(AVD_CL_CB *cb) {
+uint32_t avd_count_node_up() {
uint32_t received_count = 0;
AVD_AVND *node = nullptr;
@@ -196,8 +194,7 @@ uint32_t avd_count_node_up(AVD_CL_CB *cb) {
for (const auto &value : *node_name_db) {
node = value.second;
- if (node->node_up_msg_count > 0 &&
- node->node_info.nodeId != cb->node_id_avd)
+ if (node->node_up_msg_count > 0)
++received_count;
}
TRACE("Number of node director(s) that director received node_up msg:%u",
@@ -329,7 +326,7 @@ void avd_node_up_evh(AVD_CL_CB *cb, AVD_EVT *evt) {
}
uint32_t rc_node_up;
avnd->node_up_msg_count++;
- rc_node_up = avd_count_node_up(cb);
+ rc_node_up = avd_count_node_up();
if (rc_node_up == sync_nd_size) {
if (cb->node_sync_tmr.is_active) {
avd_stop_tmr(cb, &cb->node_sync_tmr);
diff --git a/src/amf/amfd/proc.h b/src/amf/amfd/proc.h
index 1c3cce9ca..bf8b476ca 100644
--- a/src/amf/amfd/proc.h
+++ b/src/amf/amfd/proc.h
@@ -64,7 +64,7 @@ uint32_t avd_sg_nway_si_assign(AVD_CL_CB *, AVD_SG *);
/* The following are for N-way Active redundancy model */
AVD_SU *avd_sg_nacvred_su_chose_asgn(AVD_CL_CB *cb, AVD_SG *sg);
-uint32_t avd_count_node_up(AVD_CL_CB *cb);
+uint32_t avd_count_node_up();
uint32_t avd_evt_queue_count(AVD_CL_CB *cb);
uint32_t avd_count_sync_node_size(AVD_CL_CB *cb);
void avd_process_state_info_queue(AVD_CL_CB *cb);
--
2.17.1
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
