Hi Ale,

ACK, with following ( not tested).

Please take care of alignment.

-AVM


On 8/9/2017 8:14 PM, Alex Jones wrote:
return failure when unable to add new node
---
  src/dtm/dtmnd/dtm_node.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/dtm/dtmnd/dtm_node.c b/src/dtm/dtmnd/dtm_node.c
index 236ae65..4f0b065 100644
--- a/src/dtm/dtmnd/dtm_node.c
+++ b/src/dtm/dtmnd/dtm_node.c
@@ -111,6 +111,8 @@ uint32_t dtm_process_node_info(DTM_INTERNODE_CB *dtms_cb, 
int stream_sock,
                        if (dtm_node_add(node, 0) != NCSCC_RC_SUCCESS) {
                                LOG_ER(
                                    "DTM:  A node already exists in the cluster with 
similar configuration (possible duplicate IP address and/or node id), please correct the 
other joining Node configuration ");
+        rc = NCSCC_RC_FAILURE;
+        goto done;
                        }
} else if (node->node_id == node_id) {
@@ -130,8 +132,9 @@ uint32_t dtm_process_node_info(DTM_INTERNODE_CB *dtms_cb, 
int stream_sock,
} else {
                        LOG_ER(
-                           "DTM: Node already exit in the cluster with smiler 
configuration , correct the other joining Node configuration ");
-                       osafassert(0);
+                                   "DTM:  A node already exists in the cluster with 
similar configuration (possible duplicate IP address and/or node id), please correct the 
other joining Node configuration ");
+      rc = NCSCC_RC_FAILURE;
+      goto done;
                }
TRACE(


------------------------------------------------------------------------------
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

Reply via email to