From 55df9c86c19e261a2a384ffc4b77c596c84e53a0 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Thu, 20 Nov 2014 14:39:59 +1100 Subject: ctdb-tools: Update onnode and ctdb-diagnostics to use ctdb -X Also update onnode unit tests. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/tools/onnode | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ctdb/tools/onnode') diff --git a/ctdb/tools/onnode b/ctdb/tools/onnode index 33d0e20779..96d569a264 100755 --- a/ctdb/tools/onnode +++ b/ctdb/tools/onnode @@ -145,7 +145,7 @@ get_nodes_with_status () local status="$2" if [ -z "$ctdb_status_output" ] ; then - ctdb_status_output=$(ctdb -Y status 2>&1) + ctdb_status_output=$(ctdb -X status 2>&1) if [ $? -ne 0 ] ; then echo "${prog}: unable to get status of CTDB nodes" >&2 echo "$ctdb_status_output" >&2 @@ -158,7 +158,7 @@ get_nodes_with_status () ( local i - IFS="${IFS}:" + IFS="${IFS}|" while IFS="" read i ; do set -- $i # split line on colons @@ -196,7 +196,7 @@ get_node_with_property () local prop_node="" if [ "${ctdb_props##:${prop}:}" = "$ctdb_props" ] ; then # Not in cache. - prop_node=$(ctdb "$prop" -Y 2>/dev/null) + prop_node=$(ctdb "$prop" -X 2>/dev/null) if [ $? -eq 0 ] ; then if [ "$prop" = "natgwlist" ] ; then prop_node="${prop_node%% *}" # 1st word -- cgit