diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-11-20 14:39:59 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2014-12-05 21:02:40 +0100 |
| commit | 55df9c86c19e261a2a384ffc4b77c596c84e53a0 (patch) | |
| tree | d620d3b95bfda2174163b152aea3b3084ca07260 /ctdb/tools | |
| parent | 4940f191d37b5deadc8b1edf0cd516674e5d5d64 (diff) | |
| download | samba-55df9c86c19e261a2a384ffc4b77c596c84e53a0.tar.gz | |
ctdb-tools: Update onnode and ctdb-diagnostics to use ctdb -X
Also update onnode unit tests.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/tools')
| -rwxr-xr-x | ctdb/tools/ctdb_diagnostics | 2 | ||||
| -rwxr-xr-x | ctdb/tools/onnode | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ctdb/tools/ctdb_diagnostics b/ctdb/tools/ctdb_diagnostics index 2a51e1bac25..3f2fa630f78 100755 --- a/ctdb/tools/ctdb_diagnostics +++ b/ctdb/tools/ctdb_diagnostics @@ -17,7 +17,7 @@ EOF } -nodes=$(ctdb listnodes -Y | cut -d: -f2) +nodes=$(ctdb listnodes -X | cut -d'|' -f2) bad_nodes="" diff_opts= no_ads=false diff --git a/ctdb/tools/onnode b/ctdb/tools/onnode index 33d0e20779d..96d569a2644 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 |