osaf/services/infrastructure/nid/scripts/configure_tipc.in | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
This will reduce the duplicate discovery time 1.2 seconds The sys log show ,duplicate discovery log event and Opensaf start-up event in sequence Used different temporary unique Tipc id to avoid conflict at concurrent start of Opensaf Node at same time. diff --git a/osaf/services/infrastructure/nid/scripts/configure_tipc.in b/osaf/services/infrastructure/nid/scripts/configure_tipc.in --- a/osaf/services/infrastructure/nid/scripts/configure_tipc.in +++ b/osaf/services/infrastructure/nid/scripts/configure_tipc.in @@ -151,7 +151,7 @@ function tipc_duplicate_node_detect () if [ $# -eq 1 ] ; then ################ Address config and check ######### - ${tipc_config} -a=1.1.$TIPC_MAX_NODES + ${tipc_config} -a=1.1.$(($TIPC_MAX_NODES - $TIPC_NODEID)) ret_z1=$? if [ $ret_z1 -ne 0 ] ; then echo "Unable to Configure TIPC address, Please try again, exiting" @@ -159,7 +159,7 @@ function tipc_duplicate_node_detect () exit 1 fi else - ${tipc_config} -netid=$TIPC_NETID -a=1.1.$TIPC_MAX_NODES + ${tipc_config} -netid=$TIPC_NETID -a=1.1.$(($TIPC_MAX_NODES - $TIPC_NODEID)) ret_z2=$? if [ $ret_z2 -ne 0 ] ; then echo "Unable to Configure TIPC address, Please try again, exiting" @@ -181,6 +181,10 @@ function tipc_duplicate_node_detect () exit 1 fi fi + + tipc_links=` ${tipc_config} -l | grep 1.1.$(($TIPC_MAX_NODES - $TIPC_NODEID)) | sed 's/: up/\/50 /g' ` + for link in $tipc_links; do `${tipc_config} -lt=$link ` ; done + ${tipc_config} -bd=$(echo $ETH_NAME | sed 's/^/eth:/;s/,/,eth:/g') fi $RM_TIPC_MODULE ------------------------------------------------------------------------------ _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel