mirror of
https://github.com/samba-team/samba.git
synced 2025-01-12 09:18:10 +03:00
ce8ac88b96
Commit ba69742ccd missed the point of
filtering disconnected nodes while limiting the nodemap to those in
the NAT gateway group. It was really to avoid trying to fetch
capabilities from disconnected nodes. This should be explicitly done
in filter_nodemap_by_capabilities(), otherwise "ctdb natgwlist" simply
fails when there is a disconnected node.
Note that the alternate solution where filter_nodemap_by_flags() is
called before filter_nodemap_by_capabilities() would not be not
correct. Filtering on flags first can produce a "healthier" set of
nodes where none of them have the NAT gateway capability.
Also extend stub for ctdb_ctrl_getcapabilities() to fail when trying
to get capabilities from a disconnected node and add a corresponding
test to confirm that "ctdb natgwlist" is no longer broken.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
38 lines
556 B
Bash
Executable File
38 lines
556 B
Bash
Executable File
#!/bin/sh
|
|
|
|
. "${TEST_SCRIPTS_DIR}/unit.sh"
|
|
|
|
define_test "3 nodes, all in natgw group, 1 disconnected"
|
|
|
|
setup_natgw <<EOF
|
|
192.168.20.41
|
|
192.168.20.42
|
|
192.168.20.43
|
|
EOF
|
|
|
|
required_result 0 <<EOF
|
|
1 192.168.20.42
|
|
Number of nodes:3
|
|
pnn:0 192.168.20.41 DISCONNECTED|INACTIVE
|
|
pnn:1 192.168.20.42 OK (THIS NODE)
|
|
pnn:2 192.168.20.43 OK
|
|
EOF
|
|
|
|
simple_test <<EOF
|
|
NODEMAP
|
|
0 192.168.20.41 0x1
|
|
1 192.168.20.42 0x0 CURRENT RECMASTER
|
|
2 192.168.20.43 0x0
|
|
|
|
VNNMAP
|
|
654321
|
|
0
|
|
1
|
|
2
|
|
|
|
IFACES
|
|
:Name:LinkStatus:References:
|
|
:eth2:1:2:
|
|
:eth1:1:4:
|
|
EOF
|