sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

ctdb-tests: Use environment variable for specifying socket

Browse Source 
Use environment variables for test-only options.  Don't put them in
the configuration file.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2018-02-21 14:54:36 +11:00 committed by Amitay Isaacs
parent b05dc0bb84
commit 1f4fd30882
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ctdb/tests/simple/scripts/local_daemons.bash
View File

@ -169,7 +169,6 @@ setup_ctdb ()
local node_ip=$(sed -n -e "$(($pnn + 1))p" "$CTDB_NODES")
local conf=$(node_conf "$pnn")
local socket=$(node_socket "$pnn")
local db_dir="${node_dir}/db"
mkdir -p "${db_dir}/persistent"
@ -184,7 +183,6 @@ CTDB_DBDIR="${db_dir}"
CTDB_DBDIR_PERSISTENT="${db_dir}/persistent"
CTDB_DBDIR_STATE="${db_dir}/state"
CTDB_PUBLIC_ADDRESSES="${public_addresses}"
CTDB_SOCKET="${socket}"
CTDB_NOSETSCHED=yes
EOF
@ -200,6 +198,7 @@ start_ctdb_1 ()
local node_dir=$(node_dir "$pnn")
local pidfile=$(node_pidfile "$pnn")
local conf=$(node_conf "$pnn")
local socket=$(node_socket "$pnn")
# If there is any CTDB configuration in the environment then
# append it to the regular configuration in a temporary
@ -217,6 +216,7 @@ start_ctdb_1 ()
CTDB_BASE="$node_dir" \
CTDBD_CONF="$conf" \
CTDB_PIDFILE="$pidfile" \
CTDB_SOCKET="$socket" \
ctdbd_wrapper start
if [ -n "$tmp_conf" ] ; then
@ -240,10 +240,12 @@ stop_ctdb_1 ()
local node_dir=$(node_dir "$pnn")
local pidfile=$(node_pidfile "$pnn")
local conf=$(node_conf "$pnn")
local socket=$(node_socket "$pnn")
CTDB_BASE="$node_dir" \
CTDBD_CONF="$conf" \
CTDB_PIDFILE="$pidfile" \
CTDB_SOCKET="$socket" \
ctdbd_wrapper stop
}