diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-02-28 15:11:56 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2018-03-01 19:39:15 +0100 |
| commit | 8f9ac941902c587b9920e1ff4be77d6d4e3bbe4b (patch) | |
| tree | 8160640fda72f2a070d77e47095f2974cf088755 /ctdb | |
| parent | 53fea36b6e2dd8b44bbe6e011208cabfd21d1a58 (diff) | |
| download | samba-8f9ac941902c587b9920e1ff4be77d6d4e3bbe4b.tar.gz | |
ctdb-tools: Remove test hooks from onnode
CTDB_NODES_SOCKETS is no longer used. The test code uses ONNODE_SSH
to run a fake ssh client.
Leave indenting sloppy and fix it in the next commit so that this
change is clear.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb')
| -rwxr-xr-x | ctdb/tools/onnode | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/ctdb/tools/onnode b/ctdb/tools/onnode index e015a42c123..773696e9c67 100755 --- a/ctdb/tools/onnode +++ b/ctdb/tools/onnode @@ -220,9 +220,6 @@ get_nodes () { local all_nodes - if [ -n "$CTDB_NODES_SOCKETS" ] ; then - all_nodes="$CTDB_NODES_SOCKETS" - else local f="${CTDB_BASE}/nodes" if [ -n "$CTDB_NODES_FILE" ] ; then f="$CTDB_NODES_FILE" @@ -240,7 +237,6 @@ get_nodes () fi all_nodes=$(sed -e 's@#.*@@g' -e 's@ *@@g' -e 's@^$@#DEAD@' "$f") - fi local n nodes nodes=$(parse_nodespec "$1") || exit $? @@ -285,11 +281,6 @@ push() done } -fakessh () -{ - CTDB_SOCKET="$1" sh -c "$2" -} - stdout_filter () { if [ -n "$prefix" ] ; then @@ -321,10 +312,6 @@ if $push ; then else $current && command="cd $PWD && $command" - if [ -n "$CTDB_NODES_SOCKETS" ] ; then - ONNODE_SSH=fakessh - ONNODE_SSH_OPTS="" - else # Could "2>/dev/null || true" but want to see errors from typos in file. [ -r "${CTDB_BASE}/onnode.conf" ] && . "${CTDB_BASE}/onnode.conf" [ -n "$ONNODE_SSH" ] || ONNODE_SSH=ssh @@ -335,7 +322,6 @@ else else : # rsh? All bets are off! fi - fi fi ###################################################################### |