The branch, master has been updated
via 3451a03 ctdb-scripts: Drop CTDBD_CONF internal test variable
via 02a942e ctdb-tests: Drop unused functions
via 1d7f86a ctdb-tests: Construct values for CTDB_BASES by hand
via ebd2589 ctdb-tests: Use CTDB_BASE instead of node_dir
via 85a4375 ctdb-tests: Use onnode to start/stop local daemons
via db7e4aa ctdb-daemon: Drop ctdbd --nlist option
via dedc9ea ctdb-tools: No longer honour CTDB_NODES environment variable
via 6cf861a ctdb-scripts: Drop CTDB_NODES configuration option
via a1eac09 ctdb-tools: Drop testing hook from ctdb tool
via 480c586 ctdb-tests: Simplify nodes file handling in tool tests
via 3a7c49d ctdb-tests: Put configuration, socket and PID file in
CTDB_BASE
via 78248ad ctdb-tests: Improve setting of helper paths
via 1035443 ctdb-tests: Use setup_base() in tool unit tests
via d55e7d8a ctdb-tests: Drop an orphaned comment
via 16a93d7 ctdb-tools: Drop onnode CTDB_NODES_FILE environment variable
via c8c944d ctdb-tests: Use default location for nodes file
via f6d6f22 ctdb-daemon: Drop ctdbd --public-interface option
via b1fcb0a ctdb-scripts: Drop CTDB_PUBLIC_INTERFACE configuration
option
via 482ff4b ctdb-daemon: Drop ctdbd --public-addresses option
via 346c28d ctdb-tests: Remove unused function
get_ctdbd_command_line_option()
via 6ecddd4 ctdb-scripts: Drop CTDB_PUBLIC_ADDRESSES configuration
option
via b6127a6 ctdb-tests: Allow tests access to CTDB_BASE
via a757182 ctdb-scripts: Drop 10.external event script
via a0aa735 ctdb-tests: Use default public addresses file for event
script tests
via 3d85488 ctdb-tests: Use default public addresses file in local
daemon tests
via 1dcc0ad ctdb-daemon: Provide a default location for public
addresses file
via e0ed9b3 ctdb-tests: Don't allow simple tests to use environment for
config
via 4328f4a ctdb-tests: Update some tests to use setup_ctdb() options
via 5615bdf ctdb_tests: Reconfigure the cluster when restarting CTDB
via bdfc8b7 ctdb-tests: Add some options to setup_ctdb()
via 7e08c1d ctdb-tools: Drop ctdb --socket option
via 0045a7c ctdb-tools: Move handling of CTDB_SOCKET to
process_command()
via 4961711 ctdb-daemon: Drop ctdbd --socket option
via 81b57fa ctdb-scripts: Drop CTDB_SOCKET configuration option
via de44df2 ctdb-tools: Drop a couple of unnecessary exports of
CTDB_SOCKET
via 1f4fd30 ctdb-tests: Use environment variable for specifying socket
via b05dc0b ctdb-daemon: Allow CTDB_SOCKET environment variable to be
used
via 70fb005 ctdb-tests: Use CTDB_SOCKET environment variable to specify
socket
via aa961e8 ctdb-tests: Drop ctdbd --event-script-dir option
via 3df3678 ctdb-scripts: Drop CTDB_EVENT_SCRIPT_DIR configuration
option
via 32fade2 ctdb-daemon: Drop ctdbd --pidfile option
via 0ee7b8a ctdb-scripts: Drop CTDB_PIDFILE configuration option
via 689259b ctdb-ib: Drop a bit-rotted test example from the README
from a6054c0 s4: vfs: fruit tests: Add regression test for dealing with
NFS ACE entries.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3451a03611b146c3b7acab93d452a88e85397f12
Author: Martin Schwenke <[email protected]>
Date: Thu Mar 15 15:42:57 2018 +1100
ctdb-scripts: Drop CTDBD_CONF internal test variable
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
Autobuild-User(master): Amitay Isaacs <[email protected]>
Autobuild-Date(master): Mon Mar 19 07:32:22 CET 2018 on sn-devel-144
commit 02a942ea473cd68099e07a04e6f17f4b4d92f620
Author: Martin Schwenke <[email protected]>
Date: Tue Mar 13 16:43:44 2018 +1100
ctdb-tests: Drop unused functions
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 1d7f86a8cdb2c30ac74cdbb01230e3b89e177d48
Author: Martin Schwenke <[email protected]>
Date: Tue Mar 13 16:56:44 2018 +1100
ctdb-tests: Construct values for CTDB_BASES by hand
setup_ctdb_base() and node_dir() duplicate the construction of
CTDB_BASE. Drop the use of node_dir() and construct the values for
CTDB_BASES by hand.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit ebd25890872402bce533469428aa65e08487352c
Author: Martin Schwenke <[email protected]>
Date: Tue Mar 6 12:32:30 2018 +1100
ctdb-tests: Use CTDB_BASE instead of node_dir
Simple test configuration is all relative to CTDB_BASE and node_dir is
redundant. Make this explicit by dropping most uses of node_dir.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 85a4375788d8ef8345ec390807f18299abdadb20
Author: Martin Schwenke <[email protected]>
Date: Tue Mar 6 12:29:52 2018 +1100
ctdb-tests: Use onnode to start/stop local daemons
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit db7e4aa3d8a9eb73774bde28cf37b017555f5019
Author: Martin Schwenke <[email protected]>
Date: Wed Mar 14 15:34:57 2018 +1100
ctdb-daemon: Drop ctdbd --nlist option
Tests now deviate from the compile-time default by setting CTDB_BASE.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit dedc9eab92140d328550fcb76c6504677630e841
Author: Martin Schwenke <[email protected]>
Date: Wed Mar 14 15:31:36 2018 +1100
ctdb-tools: No longer honour CTDB_NODES environment variable
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 6cf861a544e19b6b9df839d470e49baafff1097d
Author: Martin Schwenke <[email protected]>
Date: Wed Mar 14 15:30:37 2018 +1100
ctdb-scripts: Drop CTDB_NODES configuration option
Tests now deviate from the compile-time default by setting CTDB_BASE.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit a1eac09dd36ef5d5f3f861cfb37d96f86eebe5ed
Author: Martin Schwenke <[email protected]>
Date: Wed Mar 14 15:25:34 2018 +1100
ctdb-tools: Drop testing hook from ctdb tool
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 480c586c7dbc5ffef832c6a0be2c4e6b70f98514
Author: Martin Schwenke <[email protected]>
Date: Wed Mar 14 15:10:45 2018 +1100
ctdb-tests: Simplify nodes file handling in tool tests
Instead of using an intermediate environment variable for nodes files,
just create "node" or "nodes.<pnn>" in CTDB_BASE. This makes the
nodes file loading in fake_ctdb slightly repetitive but simplifies the
test scripts a lot. It also remove several instance of the CTDB_NODES
variable from the code base, so it is no longer found by "git grep".
Use an empty nodes file to indicate that fake_ctdbd should fail to
read it.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 3a7c49dfbc9ce579876d5cd680ede1f30c11c950
Author: Martin Schwenke <[email protected]>
Date: Wed Mar 14 15:08:44 2018 +1100
ctdb-tests: Put configuration, socket and PID file in CTDB_BASE
setup_ctdb_base() makes this a convenient temporary directory.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 78248adad61a22cb7bf0c16a67e5479e86179c7c
Author: Martin Schwenke <[email protected]>
Date: Wed Mar 14 15:03:19 2018 +1100
ctdb-tests: Improve setting of helper paths
Make use of variables provided by script_install_paths.sh instead of
reinventing the logic.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 10354438b89f0a3162729f74243fedd859e29436
Author: Martin Schwenke <[email protected]>
Date: Wed Mar 14 15:00:54 2018 +1100
ctdb-tests: Use setup_base() in tool unit tests
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit d55e7d8abcba6ee16f9316431d24e9057f238ed0
Author: Martin Schwenke <[email protected]>
Date: Wed Mar 14 14:00:29 2018 +1100
ctdb-tests: Drop an orphaned comment
The relevant code was removed long ago.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 16a93d7691998654213226d659d968d912e56c58
Author: Martin Schwenke <[email protected]>
Date: Fri Mar 9 16:36:39 2018 +1100
ctdb-tools: Drop onnode CTDB_NODES_FILE environment variable
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit c8c944d6186db11dc6523b2b32d4f70072e5cdfd
Author: Martin Schwenke <[email protected]>
Date: Tue Mar 6 12:05:21 2018 +1100
ctdb-tests: Use default location for nodes file
Create the file and then copy it to CTDB_BASE for each node.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit f6d6f2220b5380532fc554697be832010fb93b53
Author: Martin Schwenke <[email protected]>
Date: Tue Feb 20 19:06:51 2018 +1100
ctdb-daemon: Drop ctdbd --public-interface option
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit b1fcb0a129fa75d8f51a4fe0b6f29bcdc4467707
Author: Martin Schwenke <[email protected]>
Date: Tue Feb 20 18:58:48 2018 +1100
ctdb-scripts: Drop CTDB_PUBLIC_INTERFACE configuration option
The interface must always be specified in the public addresses file.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 482ff4bdd3712ce5ac6423aa9509c364eff5db7a
Author: Martin Schwenke <[email protected]>
Date: Thu Mar 8 15:32:52 2018 +1100
ctdb-daemon: Drop ctdbd --public-addresses option
Use the default location.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 346c28d070fd7df0bbee9c70bbad80d35eae3658
Author: Martin Schwenke <[email protected]>
Date: Thu Mar 8 14:33:08 2018 +1100
ctdb-tests: Remove unused function get_ctdbd_command_line_option()
This was a bad idea.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 6ecddd4f723a034f945ff2bad49376f2dd2c8c62
Author: Martin Schwenke <[email protected]>
Date: Thu Mar 8 15:11:51 2018 +1100
ctdb-scripts: Drop CTDB_PUBLIC_ADDRESSES configuration option
This option adds a lot of unnecessary complexity to scripts.
Configuration should go in $CTDB_BASE, either directly or via a
symlink, so simplify by using the default location.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit b6127a6384de9bddda69a49437d656bb1bcd542a
Author: Martin Schwenke <[email protected]>
Date: Mon Mar 12 08:22:57 2018 +1100
ctdb-tests: Allow tests access to CTDB_BASE
On the node where the tests are run, CTDB_BASE is always set. This
applies to local daemons too. However, when tests are being run
against a real cluster, there may be a need to access configuration
files. However, CTDB_BASE will not be set in this case.
So, provide a function to get CTDB_BASE, if set, or a real cluster
node's configuration directory, if CTDB_BASE is not set.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit a757182134a9a3a40cfad97c1a078369a7b817fc
Author: Martin Schwenke <[email protected]>
Date: Fri Feb 23 20:15:15 2018 +1100
ctdb-scripts: Drop 10.external event script
This was added for a vendor who decided not to use it. It is almost
certainly unused by anyone. If anyone really needs it then it is in
the git history.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit a0aa735de1d2230aedec6ab7710d37290b227cc5
Author: Martin Schwenke <[email protected]>
Date: Thu Mar 8 15:02:38 2018 +1100
ctdb-tests: Use default public addresses file for event script tests
Just use the default location in event script tests.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 3d85488e3a5d4125dfcc7ff121d8c047f4a2d316
Author: Martin Schwenke <[email protected]>
Date: Tue Mar 6 11:59:59 2018 +1100
ctdb-tests: Use default public addresses file in local daemon tests
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 1dcc0adf1a9c0d1b56bf0a4d4c323e5e70c8e2e8
Author: Martin Schwenke <[email protected]>
Date: Tue Mar 6 11:30:07 2018 +1100
ctdb-daemon: Provide a default location for public addresses file
If the specified file or the default does not exist then log a
warning.
This is done in the takeover code to localise the handling of the
public addresses file. Soon the daemon command-line option will go
away and the takeover code will be replaced in the not too distant
future.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit e0ed9b307da996570ba384b0db31291f3d3f0fb9
Author: Martin Schwenke <[email protected]>
Date: Fri Feb 23 14:54:51 2018 +1100
ctdb-tests: Don't allow simple tests to use environment for config
This was a mistake.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 4328f4a59e7e25d01f75bc3fe4e698dfedb8b4ed
Author: Martin Schwenke <[email protected]>
Date: Fri Feb 23 12:30:49 2018 +1100
ctdb-tests: Update some tests to use setup_ctdb() options
Don't use environment variables for test-local configuration
variations.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 5615bdf7ff7af06eb599639c1bef444614e0dd93
Author: Martin Schwenke <[email protected]>
Date: Fri Feb 23 12:21:23 2018 +1100
ctdb_tests: Reconfigure the cluster when restarting CTDB
The previous test might have made configuration changes, so call
setup_ctdb() to cause the configuration to be rewritten. This is only
really useful in local daemons tests.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit bdfc8b7e3efd813ab2e4daa50a2ef9abeb844eef
Author: Martin Schwenke <[email protected]>
Date: Fri Feb 23 12:05:14 2018 +1100
ctdb-tests: Add some options to setup_ctdb()
These provide special-purpose setups for particular testcases.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 7e08c1d24c7a57cf73aa16b4c7b3f394157c9f1a
Author: Martin Schwenke <[email protected]>
Date: Wed Feb 21 21:33:49 2018 +1100
ctdb-tools: Drop ctdb --socket option
Use environment variables for test-only options.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 0045a7cfeeb51e4283bf63bdc6a100e34b95e2a9
Author: Martin Schwenke <[email protected]>
Date: Wed Feb 21 21:31:01 2018 +1100
ctdb-tools: Move handling of CTDB_SOCKET to process_command()
options.socket will go away in future. This moves processing of
CTDB_SOCKET close to where it is used.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 4961711621fd359e8b2135238b2da63243bae0a3
Author: Martin Schwenke <[email protected]>
Date: Wed Feb 21 14:58:04 2018 +1100
ctdb-daemon: Drop ctdbd --socket option
Use environment variables for test-only options.
The setenv() can be dropped because the socket location is either the
compile-time default or the already set environment variable.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 81b57fa544830e78457691609c4c8dc2f6f17bcf
Author: Martin Schwenke <[email protected]>
Date: Wed Feb 21 14:57:07 2018 +1100
ctdb-scripts: Drop CTDB_SOCKET configuration option
Use environment variables for test-only options.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit de44df261b951f500e63c9c5f9c97fbed6467cad
Author: Martin Schwenke <[email protected]>
Date: Wed Feb 21 14:36:52 2018 +1100
ctdb-tools: Drop a couple of unnecessary exports of CTDB_SOCKET
These were necessary because CTDB_SOCKET was not already exported via
test setup.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 1f4fd30882cd57c321a6a12a807433aeda41126a
Author: Martin Schwenke <[email protected]>
Date: Wed Feb 21 14:54:36 2018 +1100
ctdb-tests: Use environment variable for specifying socket
Use environment variables for test-only options. Don't put them in
the configuration file.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit b05dc0bb84281793c025a6ca48b09ef13841d285
Author: Martin Schwenke <[email protected]>
Date: Wed Feb 21 14:46:39 2018 +1100
ctdb-daemon: Allow CTDB_SOCKET environment variable to be used
Use environment variables for test-only options.
Switch to using a local variable. This simplifies both the logic and
the ability to later drop the command-line option.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 70fb005db4c468d2af54fb365d4c18438c89a45d
Author: Martin Schwenke <[email protected]>
Date: Tue Feb 20 22:27:04 2018 +1100
ctdb-tests: Use CTDB_SOCKET environment variable to specify socket
Use environment variables for test-only options.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit aa961e8807658812ec9be7221ef0f0536bd1d24d
Author: Martin Schwenke <[email protected]>
Date: Fri Mar 9 16:27:32 2018 +1100
ctdb-tests: Drop ctdbd --event-script-dir option
Event scripts live in a standard place.
For testing, CTDB_BASE is modified.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 3df36781019e6e1dae942f507fa374a9c57628c1
Author: Martin Schwenke <[email protected]>
Date: Fri Mar 9 16:22:33 2018 +1100
ctdb-scripts: Drop CTDB_EVENT_SCRIPT_DIR configuration option
Event scripts live in a standard place.
For testing, CTDB_BASE is modified.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 32fade2f13af44865d9131644c650a346ecd3473
Author: Martin Schwenke <[email protected]>
Date: Mon Mar 5 21:27:22 2018 +1100
ctdb-daemon: Drop ctdbd --pidfile option
Use environment variables for test-only options.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 0ee7b8a6697d67d35af6d8fad10abb882bc1c121
Author: Martin Schwenke <[email protected]>
Date: Mon Mar 5 21:26:07 2018 +1100
ctdb-scripts: Drop CTDB_PIDFILE configuration option
Use environment variables for test-only options.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 689259be02624b992634aa1ce8addb0ebfc69c51
Author: Martin Schwenke <[email protected]>
Date: Thu Mar 15 16:28:17 2018 +1100
ctdb-ib: Drop a bit-rotted test example from the README
This hasn't worked as advertised for a long time.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ctdb/config/ctdb-crash-cleanup.sh | 8 +-
ctdb/config/ctdb.init | 2 +-
ctdb/config/ctdbd.conf | 6 -
ctdb/config/ctdbd_wrapper | 8 --
ctdb/config/events.d/10.external | 51 ---------
ctdb/config/events.d/10.interface | 17 +--
ctdb/config/events.d/11.natgw | 6 +-
ctdb/config/events.d/13.per_ip_routing | 2 +-
ctdb/config/functions | 4 +-
ctdb/doc/ctdb.1.xml | 14 ---
ctdb/doc/ctdb.7.xml | 45 +++++---
ctdb/doc/ctdbd.1.xml | 105 +-----------------
ctdb/doc/ctdbd.conf.5.xml | 102 +----------------
ctdb/doc/examples/cluster.conf | 4 -
ctdb/doc/examples/external.conf | 107 ------------------
ctdb/doc/examples/lvs.conf | 2 -
ctdb/doc/examples/natgw.conf | 4 -
ctdb/doc/onnode.1.xml | 38 ++-----
ctdb/ib/README.txt | 9 --
ctdb/include/ctdb_private.h | 1 -
ctdb/server/ctdb_daemon.c | 10 +-
ctdb/server/ctdb_takeover.c | 42 +++++--
ctdb/server/ctdbd.c | 60 ++++------
ctdb/tests/complex/18_ctdb_reloadips.sh | 3 +-
ctdb/tests/complex/35_cifs_external_tickle.sh | 102 -----------------
ctdb/tests/eventscripts/10.interface.init.001.sh | 4 +-
.../tests/eventscripts/10.interface.monitor.001.sh | 2 +-
.../tests/eventscripts/10.interface.monitor.007.sh | 13 ---
.../tests/eventscripts/10.interface.monitor.008.sh | 21 ----
.../tests/eventscripts/10.interface.startup.001.sh | 2 +-
ctdb/tests/eventscripts/scripts/local.sh | 17 +--
ctdb/tests/eventscripts/stubs/ctdb | 8 +-
ctdb/tests/onnode/scripts/local.sh | 1 -
ctdb/tests/scripts/integration.bash | 24 +---
ctdb/tests/simple/18_ctdb_reloadips.sh | 3 +-
ctdb/tests/simple/19_ip_takeover_noop.sh | 3 +-
ctdb/tests/simple/28_zero_eventscripts.sh | 5 +-
ctdb/tests/simple/scripts/local_daemons.bash | 122 +++++----------------
ctdb/tests/simple/scripts/ssh_local_daemons.sh | 2 +-
ctdb/tests/src/fake_ctdbd.c | 51 ++++++---
ctdb/tests/takeover_helper/scripts/local.sh | 10 +-
ctdb/tests/tool/ctdb.listnodes.001.sh | 5 +-
ctdb/tests/tool/ctdb.reloadnodes.003.sh | 6 +-
ctdb/tests/tool/scripts/local.sh | 62 +++--------
ctdb/tools/ctdb.c | 44 +++-----
ctdb/tools/ctdb_lvs | 2 -
ctdb/tools/ctdb_natgw | 2 -
ctdb/tools/onnode | 11 +-
48 files changed, 247 insertions(+), 925 deletions(-)
delete mode 100644 ctdb/config/events.d/10.external
delete mode 100644 ctdb/doc/examples/external.conf
delete mode 100755 ctdb/tests/complex/35_cifs_external_tickle.sh
delete mode 100755 ctdb/tests/eventscripts/10.interface.monitor.007.sh
delete mode 100755 ctdb/tests/eventscripts/10.interface.monitor.008.sh
Changeset truncated at 500 lines:
diff --git a/ctdb/config/ctdb-crash-cleanup.sh
b/ctdb/config/ctdb-crash-cleanup.sh
index 22b0ce8..2ab8e52 100755
--- a/ctdb/config/ctdb-crash-cleanup.sh
+++ b/ctdb/config/ctdb-crash-cleanup.sh
@@ -16,11 +16,9 @@ fi
loadconfig ctdb
-[ -n "$CTDB_PUBLIC_ADDRESSES" ] || \
- CTDB_PUBLIC_ADDRESSES="$CTDB_BASE/public_addresses"
-
-[ -f "$CTDB_PUBLIC_ADDRESSES" ] || \
- die "No public addresses file found. Can't clean up."
+if [ ! -f "$CTDB_BASE/public_addresses" ] ; then
+ die "No public addresses file found. Can't clean up."
+fi
drop_all_public_ips 2>&1 | script_log "ctdb-crash-cleanup.sh"
diff --git a/ctdb/config/ctdb.init b/ctdb/config/ctdb.init
index e55c4e6..dcb32e4 100755
--- a/ctdb/config/ctdb.init
+++ b/ctdb/config/ctdb.init
@@ -54,7 +54,7 @@ export CTDB_INIT_STYLE
ctdbd="${CTDBD:-/usr/sbin/ctdbd}"
ctdbd_wrapper="${CTDBD_WRAPPER:-/usr/sbin/ctdbd_wrapper}"
-pidfile="${CTDB_PIDFILE:-/var/run/ctdb/ctdbd.pid}"
+pidfile="/var/run/ctdb/ctdbd.pid"
############################################################
diff --git a/ctdb/config/ctdbd.conf b/ctdb/config/ctdbd.conf
index 2d525c5..2399a8e 100644
--- a/ctdb/config/ctdbd.conf
+++ b/ctdb/config/ctdbd.conf
@@ -8,12 +8,6 @@
# what you are doing.
# CTDB_RECOVERY_LOCK=/some/place/on/shared/storage
-# List of nodes in the cluster. Default is below.
-# CTDB_NODES=/etc/ctdb/nodes
-
-# List of public addresses for providing NAS services. No default.
-# CTDB_PUBLIC_ADDRESSES=/etc/ctdb/public_addresses
-
# What services should CTDB manage? Default is none.
# CTDB_MANAGES_SAMBA=yes
# CTDB_MANAGES_WINBIND=yes
diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper
index d56fbef..c239e3d 100755
--- a/ctdb/config/ctdbd_wrapper
+++ b/ctdb/config/ctdbd_wrapper
@@ -21,8 +21,6 @@ fi
. "${CTDB_BASE}/functions"
loadconfig "ctdb"
-[ -n "$CTDB_SOCKET" ] && export CTDB_SOCKET
-
ctdbd="${CTDBD:-/usr/local/sbin/ctdbd}"
############################################################
@@ -94,17 +92,11 @@ build_ctdb_options ()
maybe_set "--reclock" "$CTDB_RECOVERY_LOCK"
# build up ctdb_options variable from optional parameters
- maybe_set "--pidfile" "$CTDB_PIDFILE"
maybe_set "--logging" "$CTDB_LOGGING"
- maybe_set "--nlist" "$CTDB_NODES"
- maybe_set "--socket" "$CTDB_SOCKET"
maybe_set "--listen" "$CTDB_NODE_ADDRESS"
- maybe_set "--public-addresses" "$CTDB_PUBLIC_ADDRESSES"
- maybe_set "--public-interface" "$CTDB_PUBLIC_INTERFACE"
maybe_set "--dbdir" "$CTDB_DBDIR"
maybe_set "--dbdir-persistent" "$CTDB_DBDIR_PERSISTENT"
maybe_set "--dbdir-state" "$CTDB_DBDIR_STATE"
- maybe_set "--event-script-dir" "$CTDB_EVENT_SCRIPT_DIR"
maybe_set "--transport" "$CTDB_TRANSPORT"
maybe_set "-d" "$CTDB_DEBUGLEVEL"
maybe_set "--notification-script" "$CTDB_NOTIFY_SCRIPT"
diff --git a/ctdb/config/events.d/10.external b/ctdb/config/events.d/10.external
deleted file mode 100644
index 884357b..0000000
--- a/ctdb/config/events.d/10.external
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-# Eventscript for CTDB to cope with externally managed public IP addresses
-
-# If DisableIPFailover is set:
-#
-# * 10.interface must be disabled.
-# * For connection tracking/killing to work this script must be enabled.
-
-[ -n "$CTDB_BASE" ] || \
- CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; dirname "$PWD")
-
-. "${CTDB_BASE}/functions"
-
-loadconfig
-
-if [ -z "$CTDB_PUBLIC_ADDRESSES" ] ; then
- exit 0
-fi
-
-if [ ! -f "$CTDB_PUBLIC_ADDRESSES" ] ; then
- if [ "$1" = "init" ]; then
- echo "No public addresses file found. Nothing to do for
10.interfaces.external"
- fi
- exit 0
-fi
-
-takeover_assigned_ips ()
-{
- _pnn=$(ctdb_get_pnn)
-
- $CTDB -X ip |
- awk -F'|' '{print $2}' |
- while read ip ; do
- _ip_details=$(ip_maskbits_iface "$ip")
- if [ -n "$_ip_details" ] ; then
- echo "Assigning $ip to this node (${_pnn})"
- $CTDB moveip "$ip" "$_pnn"
- fi
- done
-}
-
-ctdb_check_args "$@"
-
-case "$1" in
- startup)
- takeover_assigned_ips
- ;;
-esac
-
-exit 0
diff --git a/ctdb/config/events.d/10.interface
b/ctdb/config/events.d/10.interface
index f2d44da..f05559b 100755
--- a/ctdb/config/events.d/10.interface
+++ b/ctdb/config/events.d/10.interface
@@ -12,16 +12,14 @@
loadconfig
-[ -z "$CTDB_PUBLIC_ADDRESSES" ] && {
- CTDB_PUBLIC_ADDRESSES="${CTDB_BASE}/public_addresses"
-}
+ctdb_public_addresses="${CTDB_BASE}/public_addresses"
-[ ! -f "$CTDB_PUBLIC_ADDRESSES" ] && {
- if [ "$1" = "init" ]; then
- echo "No public addresses file found. Nothing to do for
10.interfaces"
+if [ ! -f "$ctdb_public_addresses" ]; then
+ if [ "$1" = "init" ] ; then
+ echo "No public addresses file found"
fi
exit 0
-}
+fi
# This sets $all_interfaces as a side-effect.
get_all_interfaces ()
@@ -29,10 +27,7 @@ get_all_interfaces ()
# Get all the interfaces listed in the public_addresses file
all_interfaces=$(sed -e "s/^[^\t ]*[\t ]*//" \
-e "s/,/ /g" \
- -e "s/[\t ]*$//" "$CTDB_PUBLIC_ADDRESSES")
-
- # Add some special interfaces if they're defined
- [ "$CTDB_PUBLIC_INTERFACE" ] && all_interfaces="$CTDB_PUBLIC_INTERFACE
$all_interfaces"
+ -e "s/[\t ]*$//" "$ctdb_public_addresses")
# Get the interfaces for which CTDB has public IPs configured.
# That is, for all but the 1st line, get the 1st field.
diff --git a/ctdb/config/events.d/11.natgw b/ctdb/config/events.d/11.natgw
index b256d37..f2e17a7 100755
--- a/ctdb/config/events.d/11.natgw
+++ b/ctdb/config/events.d/11.natgw
@@ -197,9 +197,9 @@ startup)
# Error if CTDB_NATGW_PUBLIC_IP is listed in public addresses
ip_pat=$(echo "$CTDB_NATGW_PUBLIC_IP" | sed -e 's@\.@\\.@g')
- if grep -q "^${ip_pat}[[:space:]]" \
- "${CTDB_PUBLIC_ADDRESSES:-${CTDB_BASE}/public_addresses}" ; then
- die "ERROR: CTDB_NATGW_PUBLIC_IP same as a public address"
+ ctdb_public_addresses="${CTDB_BASE}/public_addresses"
+ if grep -q "^${ip_pat}[[:space:]]" "$ctdb_public_addresses" ; then
+ die "ERROR: CTDB_NATGW_PUBLIC_IP same as a public address"
fi
# do not send out arp requests from loopback addresses
diff --git a/ctdb/config/events.d/13.per_ip_routing
b/ctdb/config/events.d/13.per_ip_routing
index c213583..2e080a1 100755
--- a/ctdb/config/events.d/13.per_ip_routing
+++ b/ctdb/config/events.d/13.per_ip_routing
@@ -207,7 +207,7 @@ get_config_for_ip ()
if [ "$_ip" = "$_i" ] ; then
printf "%s" "$_ip "; ipv4_host_addr_to_net "$_ip" "$_maskbits"
fi
- done <"${CTDB_PUBLIC_ADDRESSES:-${CTDB_BASE}/public_addresses}"
+ done <"${CTDB_BASE}/public_addresses"
else
while read _i _rest ; do
if [ "$_ip" = "$_i" ] ; then
diff --git a/ctdb/config/functions b/ctdb/config/functions
index b3b348a..84b6829 100755
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -83,7 +83,7 @@ _loadconfig() {
fi
if [ "$1" = "ctdb" ] ; then
- _config="${CTDBD_CONF:-${CTDB_BASE}/ctdbd.conf}"
+ _config="${CTDB_BASE}/ctdbd.conf"
if [ -r "$_config" ] ; then
. "$_config"
fi
@@ -592,7 +592,7 @@ drop_all_public_ips ()
# shellcheck disable=SC2034
while read _ip _x ; do
drop_ip "$_ip"
- done <"${CTDB_PUBLIC_ADDRESSES:-${CTDB_BASE}/public_addresses}"
+ done <"${CTDB_BASE}/public_addresses"
}
flush_route_cache ()
diff --git a/ctdb/doc/ctdb.1.xml b/ctdb/doc/ctdb.1.xml
index 3103d62..7539221 100644
--- a/ctdb/doc/ctdb.1.xml
+++ b/ctdb/doc/ctdb.1.xml
@@ -210,17 +210,6 @@
</para>
</listitem>
</varlistentry>
-
- <varlistentry><term>--socket=<parameter>FILENAME</parameter></term>
- <listitem>
- <para>
- Specify that FILENAME is the name of the Unix domain
- socket to use when connecting to the local CTDB
- daemon. The default is
- <filename>/usr/local/var/run/ctdb/ctdbd.socket</filename>.
- </para>
- </listitem>
- </varlistentry>
</variablelist>
</refsect1>
@@ -672,7 +661,6 @@ Interface[2]: Name:eth5 Link:up References:2 (active)
01.reclock OK 0.013 Sat Dec 17 19:39:11 2016
05.system OK 0.029 Sat Dec 17 19:39:11 2016
06.nfs OK 0.014 Sat Dec 17 19:39:11 2016
-10.external DISABLED
10.interface OK 0.037 Sat Dec 17 19:39:11 2016
11.natgw OK 0.011 Sat Dec 17 19:39:11 2016
11.routing OK 0.007 Sat Dec 17 19:39:11 2016
@@ -705,7 +693,6 @@ Interface[2]: Name:eth5 Link:up References:2 (active)
01.reclock
05.system
06.nfs
-10.external DISABLED
10.interface
11.natgw
11.routing
@@ -767,7 +754,6 @@ Interface[2]: Name:eth5 Link:up References:2 (active)
01.reclock OK 0.010 Sat Dec 17 19:40:46 2016
05.system OK 0.030 Sat Dec 17 19:40:46 2016
06.nfs OK 0.014 Sat Dec 17 19:40:46 2016
-10.external DISABLED
10.interface OK 0.041 Sat Dec 17 19:40:46 2016
11.natgw OK 0.008 Sat Dec 17 19:40:46 2016
11.routing OK 0.007 Sat Dec 17 19:40:46 2016
diff --git a/ctdb/doc/ctdb.7.xml b/ctdb/doc/ctdb.7.xml
index 5f5332e..079b34d 100644
--- a/ctdb/doc/ctdb.7.xml
+++ b/ctdb/doc/ctdb.7.xml
@@ -174,16 +174,21 @@
the cluster and is the address that CTDB daemons will use to
communicate with the CTDB daemons on other nodes.
</para>
+
<para>
- Private addresses are listed in the file specified by the
- <varname>CTDB_NODES</varname> configuration variable (see
- <citerefentry><refentrytitle>ctdbd.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>, default
- <filename>/usr/local/etc/ctdb/nodes</filename>). This file contains
the
- list of private addresses for all nodes in the cluster, one
- per line. This file must be the same on all nodes in the
- cluster.
+ Private addresses are listed in the file
+ <filename>/usr/local/etc/ctdb/nodes</filename>). This file
+ contains the list of private addresses for all nodes in the
+ cluster, one per line. This file must be the same on all nodes
+ in the cluster.
</para>
+
+ <para>
+ Some users like to put this configuration file in their
+ cluster filesystem. A symbolic link should be used in this
+ case.
+ </para>
+
<para>
Private addresses should not be used by clients to connect to
services provided by the cluster.
@@ -230,17 +235,21 @@
clients, as long as there are nodes available capable of
hosting this address.
</para>
+
<para>
- The public address configuration is stored in a file on each
- node specified by the <varname>CTDB_PUBLIC_ADDRESSES</varname>
- configuration variable (see
- <citerefentry><refentrytitle>ctdbd.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>, recommended
- <filename>/usr/local/etc/ctdb/public_addresses</filename>). This file
- contains a list of the public addresses that the node is
- capable of hosting, one per line. Each entry also contains
- the netmask and the interface to which the address should be
- assigned.
+ The public address configuration is stored in
+ <filename>/usr/local/etc/ctdb/public_addresses</filename> on
+ each node. This file contains a list of the public addresses
+ that the node is capable of hosting, one per line. Each entry
+ also contains the netmask and the interface to which the
+ address should be assigned. If this file is missing then no
+ public addresses are configured.
+ </para>
+
+ <para>
+ Some users who have the same public addresses on all nodes
+ like to put this configuration file in their cluster
+ filesystem. A symbolic link should be used in this case.
</para>
<para>
diff --git a/ctdb/doc/ctdbd.1.xml b/ctdb/doc/ctdbd.1.xml
index 849bd10..4f6d482 100644
--- a/ctdb/doc/ctdbd.1.xml
+++ b/ctdb/doc/ctdbd.1.xml
@@ -107,23 +107,6 @@
</varlistentry>
<varlistentry>
- <term>--event-script-dir=<parameter>DIRECTORY</parameter></term>
- <listitem>
- <para>
- DIRECTORY where the CTDB event scripts are stored. See the
- <citetitle>EVENT SCRIPTS</citetitle> section in
- <citerefentry><refentrytitle>ctdb</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> for more information.
- </para>
- <para>
- Default is <envar>CTDB_BASE</envar>/events.d, so usually
- <filename>/usr/local/etc/ctdb/events.d</filename>, which is part of
- the CTDB installation.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>--listen=<parameter>IPADDR</parameter></term>
<listitem>
<para>
@@ -131,8 +114,10 @@
</para>
<para>
By default ctdbd will select the first address from the
- nodes list that in can bind to. See also
- <citetitle>--nlist</citetitle>.
+ nodes list that in can bind to. See also the
+ <citetitle>Private address</citetitle> section in
+ <citerefentry><refentrytitle>ctdb</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry>.
</para>
<para>
This option is only required when automatic address
@@ -245,22 +230,6 @@
</varlistentry>
<varlistentry>
- <term>--nlist=<parameter>FILENAME</parameter></term>
- <listitem>
- <para>
- FILENAME containing a list of the private IP addresses, one
- per line, for each node in the cluster. This file
- <emphasis>must be the same on each node</emphasis> in the
- cluster.
- </para>
- <para>
- Default is <envar>CTDB_BASE</envar>/nodes, so usually
- <filename>/usr/local/etc/ctdb/nodes</filename>.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>--no-lmaster</term>
<listitem>
<para>
@@ -316,55 +285,6 @@
</varlistentry>
<varlistentry>
- <term>--pidfile=<parameter>FILENAME</parameter></term>
- <listitem>
- <para>
- FILENAME for file containing process ID of main CTDB
- daemon. This file is automatically created and removed by
- CTDB.
- </para>
- <para>
- The default is to not create a PID file.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>--public_addresses=<parameter>FILENAME</parameter></term>
- <listitem>
- <para>
- FILENAME specifying a file containing the public IP
- addresses to use on the cluster when CTDB should use IP
- takeover. This file contains a list of IP addresses,
- netmasks and interfaces. CTDB will distribute these public
- IP addresses appropriately across the available nodes.
- </para>
- <para>
- The IP addresses specified in this file can differ across
- nodes.
- </para>
- <para>
- This is usually the file
- <filename>/usr/local/etc/ctdb/public_addresses</filename>
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>--public-interface=<parameter>INTERFACE</parameter></term>
- <listitem>
- <para>
- Default INTERFACE on which to attach public IP addresses.
- </para>
- <para>
- When using public IP addresses, this is only required if
- interfaces are not explicitly specified in the public
- addresses file.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>--reclock=<parameter>LOCK</parameter></term>
<listitem>
<para>
@@ -498,23 +418,6 @@
</varlistentry>
<varlistentry>
- <term>--socket=<parameter>FILENAME</parameter></term>
- <listitem>
- <para>
- FILENAME specifies the name of the Unix domain socket that
- ctdbd will create. This socket is used by local clients to
- communicate with ctdbd.
- </para>
- <para>
- The default is
<filename>/usr/local/var/run/ctdb/ctdbd.socket</filename>.
- You only need to use this option if you plan to run
- multiple ctdbd daemons on the same physical host, usually
- for testing.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>--script-log-level=<parameter>DEBUGLEVEL</parameter></term>
<listitem>
<para>
diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index 4c013f0..ee9cec8 100644
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -52,41 +52,6 @@
<refsect1>
<title>
- INITSCRIPT CONFIGURATION
- </title>
-
- <para>
- Some options must be available to the initscript so they need to
- be set in the distribution-specific initscript configuration,
- such as <filename>/etc/sysconfig/ctdb</filename> or
- <filename>/etc/default/ctdb</filename>.
- </para>
--
Samba Shared Repository
