sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

selftest: export/use CTDB related envvars in order to run the ctdb command

Browse Source 
This makes it easier to test things...

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15523

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Stefan Metzmacher 2023-11-17 11:45:30 +01:00
parent 2e784789d7
commit 38b74d4ca9
3 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
selftest/target/Samba.pm
View File

@ -984,6 +984,25 @@ my @exported_envvars = (
# resolv_wrapper
"RESOLV_WRAPPER_CONF",
"RESOLV_WRAPPER_HOSTS",
# ctdb stuff
"NUM_NODES",
"CTDB_BASE",
"CTDB_SOCKET",
"CTDB_SERVER_NAME",
"CTDB_IFACE_IP",
"CTDB_BASE_NODE0",
"CTDB_SOCKET_NODE0",
"CTDB_SERVER_NAME_NODE0",
"CTDB_IFACE_IP_NODE0",
"CTDB_BASE_NODE1",
"CTDB_SOCKET_NODE1",
"CTDB_SERVER_NAME_NODE1",
"CTDB_IFACE_IP_NODE1",
"CTDB_BASE_NODE2",
"CTDB_SOCKET_NODE2",
"CTDB_SERVER_NAME_NODE2",
"CTDB_IFACE_IP_NODE2",
);
sub exported_envvars_str

22
selftest/target/Samba3.pm
View File

@ -527,8 +527,8 @@ sub setup_clusteredmember
my $pub_iface = $node->{SOCKET_WRAPPER_DEFAULT_IFACE};
my $node_prefix = $node->{NODE_PREFIX};
print "NODE_PREFIX=${node_prefix}\n";
print "SOCKET=${socket}\n";
print "CTDB_BASE=${node_prefix}\n";
print "CTDB_SOCKET=${socket}\n";
my $require_mutexes = "dbwrap_tdb_require_mutexes:* = yes";
if ($ENV{SELFTEST_DONT_REQUIRE_TDB_MUTEX_SUPPORT} // '' eq "1") {
@ -4168,6 +4168,24 @@ sub provision_ctdb($$$$)
$ret{CTDB_NODES} = \@nodes;
$ret{CTDB_NODES_FILE} = $nodes_file;
for (my $i = 0; $i < $num_nodes; $i++) {
my $node = $nodes[$i];
my $socket = $node->{SOCKET_FILE};
my $server_name = $node->{SERVER_NAME};
my $node_prefix = $node->{NODE_PREFIX};
my $ip = $node->{IP};
$ret{"CTDB_BASE_NODE${i}"} = $node_prefix;
$ret{"CTDB_SOCKET_NODE${i}"} = $socket;
$ret{"CTDB_SERVER_NAME_NODE${i}"} = $server_name;
$ret{"CTDB_IFACE_IP_NODE${i}"} = $ip;
}
$ret{CTDB_BASE} = $ret{CTDB_BASE_NODE0};
$ret{CTDB_SOCKET} = $ret{CTDB_SOCKET_NODE0};
$ret{CTDB_SERVER_NAME} = $ret{CTDB_SERVER_NAME_NODE0};
$ret{CTDB_IFACE_IP} = $ret{CTDB_IFACE_IP_NODE0};
return \%ret;
}

2
source3/selftest/tests.py
View File

@ -1677,7 +1677,7 @@ if have_cluster_support:
[os.path.join(samba3srcdir,
"script/tests/test_smbXsrv_client_cross_node.sh"),
configuration,
'ctdb0', 'ctdb1',
'$CTDB_SERVER_NAME_NODE0', '$CTDB_SERVER_NAME_NODE1',
"tmp"])
plantestsuite("samba3.blackbox.registry_share", "clusteredmember",
[os.path.join(samba3srcdir,