[SCM] Samba Shared Repository - branch master updated
Amitay Isaacs
amitay at samba.org
Wed Mar 28 05:28:02 UTC 2018
The branch, master has been updated
via 4e0cf2f ctdb-tests: Delete unused fake /etc/sysconfig/ctdb file
via 02fc52d ctdb-scripts: Tunables are now loaded from ctdb.tunables
via 1db96ce ctdb-tests: Rename setup_config() to setup_tunable_config()
via 66cfddc ctdb-tests: Script options into per-script file
via 65ce5e2 ctdb-scripts: Use load_script_options in event scripts
via a2f8730 ctdb-scripts: Add new function load_script_options()
via e0c2b3a ctdb-tests: Use setup_script_options() in 91.lvs tests
via a48bd34 ctdb-tests: Use setup_script_options() in 60.nfs (and 06.nfs) tests
via 96ed6c3 ctdb-tests: Use setup_script_options() in 50.samba tests
via ecda38c ctdb-tests: Use setup_script_options() in 49.winbind tests
via 3944fc4 ctdb-tests: Use setup_script_options() in 41.httpd tests
via 17b8f12 ctdb-tests: Use setup_script_options() in 40.vsftpd tests
via 051458f ctdb-tests: Use setup_script_options() in 31.clamd tests
via a16eb65 ctdb-tests: Use setup_script_options() in 20.multipathd tests
via ef98333 ctdb-tests: Use setup_script_options() in 13.per_ip_routing tests
via 6b88a81 ctdb-tests: Use setup_script_options() in 11.natgw tests
via 87cd76e ctdb-tests: Use setup_script_options() in 10.interface tests
via 45de2b1 ctdb-tests: Use setup_script_options() in 05.system tests
via 3712640 ctdb-tests: New function setup_script_options()
via b499775 ctdb-scripts: Split CTDB configuration loading
via 8b18221 ctdb-docs: Promote CTDB_INIT_STYLE to global options section
via 1c9b6c3 ctdb-scripts: Clean up function detect_init_style()
via 6c5f7c0 ctdb-tests: Remove unused functions and stubs
via 58db0db ctdb-tests: statd-callout script setup modularisation
via 8ee51d2 ctdb-tests: 91.lvs event script setup modularisation
via 042a510 ctdb-tests: 60.nfs (and 06.nfs) event script setup modularisation
via ab5bc19 ctdb-tests: 50.samba event script setup modularisation
via 34eba35 ctdb-tests: 49.winbind event script setup modularisation
via 29eb410 ctdb-tests: 41.httpd event script setup modularisation
via 99c3fd3 ctdb-tests: 40.vsftpd event script setup modularisation
via 3172dc7 ctdb-tests: 31.clamd event script setup modularisation
via 0bc1b4b ctdb-tests: 20.multipathd event script setup modularisation
via 0ca1cfc ctdb-tests: 13.per_ip_routing event script setup modularisation
via a63c456 ctdb-tests: 11.natgw event script setup modularisation
via 8c81fb9 ctdb-tests: 10.interface event script setup modularisation
via d823247 ctdb-tests: 05.system event script setup modularisation
via 7cddc88 ctdb-tests: 01.reclock event script setup modularisation
via db5c604 ctdb-tests: 00.ctdb testing setup modularisation
via 5815c32 ctdb-tests: Define generic setup() function
via 9038759 ctdb-tests: statd-callout.sh simple 80 column fixups
via 44b2998 ctdb-tests: 60.nfs.sh simple 80 column fixups and reordering
via b526968 ctdb-tests: 20.multipathd.sh 80 column fixups
via 4430e22 ctdb-tests: 11.natgw.sh simple 80 column fixups
via bfd2d70 ctdb-tests: 10.interface.sh simple 80 column fixups
via b6cde6f ctdb-tests: 05.system.sh simple 80 column fixups
via 0f78e0b ctdb-tests: Create statd-callout.sh
via 0f080ce ctdb-tests: Create 91.lvs.sh
via 7d91de5 ctdb-tests: Create 60.nfs.sh and 06.nfs.sh
via 32d8483 ctdb-tests: Create 50.samba.sh
via a51e4ea ctdb-tests: Create 49.winbind.sh
via f33f4b3 ctdb-tests: Create 41.httpd.sh
via f306c2d ctdb-tests: Create 40.vsftpd.sh
via 38b54a6 ctdb-tests: Create 20.multipathd.sh
via e489929 ctdb-tests: Create 13.per_ip_routing.sh
via 916b7f9 ctdb-tests: Create 11.natgw.sh
via ee6052e ctdb-tests: Create 10.interface.sh
via f5a7041 ctdb-tests: Create 05.system.sh
via 7b4dd7e ctdb-tests: Create 01.reclock.sh
via bcb6cc2 ctdb-tests: Create 00.ctdb.sh
via bbd9699 ctdb-tests: Allow modularisation of event script testing support
via 26e090d ctdb-tests: Clean up handling of CTDB_SCRIPT_VARDIR
via 1d7d487 ctdb-tests: Clean up fake share handling
via 3c82d3a ctdb-tests: New function setup_numnodes()
via 6eec33c ctdb-tests: Tweak debug function
via e4a4532 ctdb-tests: Make date handling consistent in 00.ctdb tests
via 3571345 ctdb-tests: New support functions setup_dbdir() and setup_date()
via ab89958 ctdb-tests: Don't set FAKE_ETHTOOL_LINK_DOWN globally
via 26329aa ctdb-tests: Move variable FAKE_IP_STATE into the ip stub
via 3bbf3e9 ctdb-tests: Move variable FAKE_CTDB_IFACES_DOWN into ctdb stub
via ce1b5b3 ctdb-tests: Remove case statement in ctdb stub
via 713804b ctdb-tests: Update argument handling of ctdb stub functions
via 7d1d5fc ctdb-tests: Move ctdb stub code from case statement to functions
via 06be4a6 ctdb-tests: Drop unused ctdb stub scriptstatus and xpnn commands
via 6f730c4 ctdb-tests: Fix a bug in the ctdb stub's moveip command
via fb20907 ctdb-tests: New global variable FAKE_NETWORK_STATE
via ad081f9 ctdb-tests: Make FAKE_CTDB_STATE globally set
via cf866d6 ctdb-scripts: Drop unused functions
via 2f33b18 ctdb-script: Drop CTDB_MANAGED_SERVICES configuration option
from d955ab2 selftest: Run net.api.become.dc against less roles
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4e0cf2fa766eed922e86428b2ecdf3da0a27bc9b
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Mar 20 20:20:55 2018 +1100
ctdb-tests: Delete unused fake /etc/sysconfig/ctdb file
The only remaining item is a setting of CTDB_DEBUGLEVEL, which is not
required.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
Autobuild-Date(master): Wed Mar 28 07:27:58 CEST 2018 on sn-devel-144
commit 02fc52d69b2f74bb35150ddcec405c81da81f81f
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Feb 20 18:22:33 2018 +1100
ctdb-scripts: Tunables are now loaded from ctdb.tunables
Using CTDB_SET_TunableVariables in the main configuration file is no
longer supported.
The only subtlety is an unexpected order change in one of the unit
test results. This is because the old implementation implicitly
sorted the tunable variables via the set command.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 1db96ce26e555f1faa879ea4b29816f4ab2eb1a7
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Mar 22 14:39:45 2018 +1100
ctdb-tests: Rename setup_config() to setup_tunable_config()
Drop the "CTDB_SET_" prefix from variable names and add it back for
now. When there is a better way of setting tunables then this
function will support that.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 66cfddc61c77fa0eb7b8da05c34ae7eaf2596004
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Feb 19 14:58:48 2018 +1100
ctdb-tests: Script options into per-script file
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 65ce5e2129d7c4ba7b1728ef1df6dd424ed65b49
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Feb 20 12:56:42 2018 +1100
ctdb-scripts: Use load_script_options in event scripts
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit a2f8730c759438317ba3a0df08890075117e2525
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Feb 19 13:13:26 2018 +1100
ctdb-scripts: Add new function load_script_options()
For now this loads the global CTDB configuration too. This will
change in the future after things are properly modularised.
This also anticipates a future change where event scripts end with a
".script" suffix.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit e0c2b3a1e10c1e4557720933a0bd906901112e8e
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Mar 22 11:36:46 2018 +1100
ctdb-tests: Use setup_script_options() in 91.lvs tests
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit a48bd342465ff78275ed83824c01aefdddca2b77
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Mar 22 12:05:10 2018 +1100
ctdb-tests: Use setup_script_options() in 60.nfs (and 06.nfs) tests
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 96ed6c34ba0d3513d7eeb3090a996bd0e369c4e4
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Mar 22 12:03:56 2018 +1100
ctdb-tests: Use setup_script_options() in 50.samba tests
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit ecda38c8940de073dc7de8894bc77eabb1cf4001
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Mar 22 11:17:47 2018 +1100
ctdb-tests: Use setup_script_options() in 49.winbind tests
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 3944fc4ae304c8e58c8fa0f7c3b98c5d8bd29845
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Mar 22 07:19:14 2018 +1100
ctdb-tests: Use setup_script_options() in 41.httpd tests
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 17b8f12d1c5a99d7134018668e68302f19909582
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Mar 22 07:16:02 2018 +1100
ctdb-tests: Use setup_script_options() in 40.vsftpd tests
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 051458feb0208dd3cee1fed074d84e40fb5e65ea
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Mar 22 07:11:59 2018 +1100
ctdb-tests: Use setup_script_options() in 31.clamd tests
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit a16eb657d13d8f81b973481dfd7141407f204c0b
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Mar 22 07:04:49 2018 +1100
ctdb-tests: Use setup_script_options() in 20.multipathd tests
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit ef98333d6af7736f97eb19a273d43ce43bdbbfa2
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Mar 22 07:01:08 2018 +1100
ctdb-tests: Use setup_script_options() in 13.per_ip_routing tests
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 6b88a8188b0c5e945ee1c3135e4ff9a7520c3bdb
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Mar 22 06:56:18 2018 +1100
ctdb-tests: Use setup_script_options() in 11.natgw tests
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 87cd76e0c62052fa0d28dfea3a5fc1088d5d883d
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Mar 21 22:21:46 2018 +1100
ctdb-tests: Use setup_script_options() in 10.interface tests
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 45de2b1d9b873d8be0f52ce90f059070aed6b22c
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Mar 21 22:18:56 2018 +1100
ctdb-tests: Use setup_script_options() in 05.system tests
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 3712640d47d5e8e0b76ed2989779d2aae0ed73f6
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Feb 8 12:18:56 2018 +1100
ctdb-tests: New function setup_script_options()
Currently exports the variable assignment on each line. Later this
can be changed to handle actual per-script configuration.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit b49977552741a739ae2bc2d6c0b3b5d4c36ee084
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Feb 6 11:25:56 2018 +1100
ctdb-scripts: Split CTDB configuration loading
loadconfig() currently tries to load the CTDB configuration and also
any system configuration relevant to the current (event) script.
Instead add a new function load_system_config() to load the
distribution-specific system configuration for a component. Call this
directly in the rare scripts that need the system configuration.
Also call load_system_config when loading the CTDB configuration to
pull in anything from the CTDB system configuration. This is partly
for backward compatibility but also to get options that can be used
anywhere.
loadconfig() no longer takes an argument. It simply loads the CTDB
configuration.
Drop support for falling back to /etc/ctdb/sysconfig/ctdb (or
similar). Surely there's nobody who uses that!
Also, drop the indirection where loadconfig() calls _loadconfig().
This was used years ago as a test hook and is no longer required.
Inexplicably, this change introduces a new shellcheck test failure, so
silence this.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 8b18221529e242120ced0cee6592fb733950f1f5
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Feb 19 15:32:02 2018 +1100
ctdb-docs: Promote CTDB_INIT_STYLE to global options section
Clarify that the global options should be set in the system
configuration file.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 1c9b6c39925a9243179ba61a7c4476b35023c08e
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Feb 19 15:29:43 2018 +1100
ctdb-scripts: Clean up function detect_init_style()
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 6c5f7c0003ccbf99a00b8ec12b52e0ea97521f83
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Feb 13 06:55:35 2018 +1100
ctdb-tests: Remove unused functions and stubs
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 58db0dbeda788c975c422412e912c4c23f5141a1
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Feb 13 11:17:46 2018 +1100
ctdb-tests: statd-callout script setup modularisation
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 8ee51d2f2d5a2b1369989e5250d6e89f2f12179c
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Feb 12 16:46:17 2018 +1100
ctdb-tests: 91.lvs event script setup modularisation
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 042a5101fc401eb023ee010896da75279e2a7d9c
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Feb 13 06:53:44 2018 +1100
ctdb-tests: 60.nfs (and 06.nfs) event script setup modularisation
Includes gratuitous changes to get lines below 80 columns.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit ab5bc195c40f3be84f72745a334b0b12f4b7f8e2
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Feb 12 16:25:15 2018 +1100
ctdb-tests: 50.samba event script setup modularisation
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 34eba35c61f5123d08a2403817e99777decb0617
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Feb 12 14:10:12 2018 +1100
ctdb-tests: 49.winbind event script setup modularisation
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 29eb410f265029e690b8371b0141d251a7cadd36
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Feb 12 14:02:20 2018 +1100
ctdb-tests: 41.httpd event script setup modularisation
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 99c3fd3460da162d8c66e837ef42f28de48dd8fe
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Feb 12 13:47:56 2018 +1100
ctdb-tests: 40.vsftpd event script setup modularisation
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 3172dc724473ef91076f97e9bdb0d2cdd16fa712
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Feb 12 13:58:42 2018 +1100
ctdb-tests: 31.clamd event script setup modularisation
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 0bc1b4b27e5ffaff471118480b1ff00199839a78
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Feb 12 13:40:42 2018 +1100
ctdb-tests: 20.multipathd event script setup modularisation
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 0ca1cfcf6130c88c6808c4f8c37e4d7ff49f46b1
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Feb 12 13:37:02 2018 +1100
ctdb-tests: 13.per_ip_routing event script setup modularisation
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit a63c45608053d1f461f83f21cb2ca3471847d987
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Feb 12 11:42:04 2018 +1100
ctdb-tests: 11.natgw event script setup modularisation
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 8c81fb9d9a27ac836f24c90b381fcfba586d9fac
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Feb 8 22:01:49 2018 +1100
ctdb-tests: 10.interface event script setup modularisation
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit d8232476ed21c014a6452f2fc4ddb8ae275d61b8
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Feb 8 06:54:27 2018 +1100
ctdb-tests: 05.system event script setup modularisation
Do initial test setup using setup() function. Rename usage setting
functions to make them more obvious.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 7cddc88d0386bbe3b5c2fb18dc28b4e9fa75f727
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Feb 8 06:24:01 2018 +1100
ctdb-tests: 01.reclock event script setup modularisation
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit db5c6041522f72fa5a3f0f053f076769dbbab352
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Feb 8 06:04:58 2018 +1100
ctdb-tests: 00.ctdb testing setup modularisation
Switch to generic setup() function and set variables there.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 5815c32d0121d6f7b0741128383d3da923a3916a
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Feb 8 06:00:25 2018 +1100
ctdb-tests: Define generic setup() function
Create default setup() function that aborts. This function will be
redefined by each support script and used to do the setup.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 90387592598cf81db1dea53bc9ba077ce5eb26d7
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Mar 20 20:46:41 2018 +1100
ctdb-tests: statd-callout.sh simple 80 column fixups
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 44b29982f41729fbf7cae903f768b384e4a28824
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Mar 20 20:42:21 2018 +1100
ctdb-tests: 60.nfs.sh simple 80 column fixups and reordering
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit b526968bcf920c895a24d4bc447716721132166d
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Mar 20 20:38:13 2018 +1100
ctdb-tests: 20.multipathd.sh 80 column fixups
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 4430e22d0cbb92e0f2066ac9359eb287306ed85a
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Mar 20 20:51:00 2018 +1100
ctdb-tests: 11.natgw.sh simple 80 column fixups
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit bfd2d70fc490de94d04b91e0c8b5170bd915b314
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Mar 20 20:31:19 2018 +1100
ctdb-tests: 10.interface.sh simple 80 column fixups
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit b6cde6ff9f360e811c357ad7a461dfc7552e10d3
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Mar 20 20:28:57 2018 +1100
ctdb-tests: 05.system.sh simple 80 column fixups
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 0f78e0b4c404569ffe5d0091c8f2fdcca5c65455
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Mar 19 20:57:36 2018 +1100
ctdb-tests: Create statd-callout.sh
Contains testing support used only by tests for statd-callout script.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 0f080cebef01affb88df7dc5a301cbb9efcf5ee4
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Mar 19 20:55:10 2018 +1100
ctdb-tests: Create 91.lvs.sh
Contains testing support used only by tests for 91.lvs event scripts.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 7d91de549b56249d8d1cdb62d441142068b9e3b4
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Mar 19 20:53:21 2018 +1100
ctdb-tests: Create 60.nfs.sh and 06.nfs.sh
Contains testing support used only by tests for 60.nfs and 06.nfs
event scripts.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 32d8483b071dc93bbdeff97c9fbcfa34699dea6f
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Mar 19 20:49:48 2018 +1100
ctdb-tests: Create 50.samba.sh
Contains testing support used only by tests for 50.samba event script.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit a51e4ea042f71e1edddb4db19af8a70193900213
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Mar 19 20:47:48 2018 +1100
ctdb-tests: Create 49.winbind.sh
Contains testing support used only by tests for 49.winbind event
script.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit f33f4b3a2317f0d3c48b9b36c9af4af2ca219a10
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Mar 19 20:43:15 2018 +1100
ctdb-tests: Create 41.httpd.sh
Contains testing support used only by tests for 41.httpd event script.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit f306c2d8078af231b0406e579f296c5fec3382e7
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Mar 19 20:42:04 2018 +1100
ctdb-tests: Create 40.vsftpd.sh
Contains testing support used only by tests for 40.vsftpd event
script.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 38b54a60f52ac72a5d20b72f4ccb79c4f62b3ae2
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Mar 19 20:40:40 2018 +1100
ctdb-tests: Create 20.multipathd.sh
Contains testing support used only by tests for 20.multipathd event
script.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit e4899293355c6a139d59b22368e2425adea84df9
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Mar 19 20:39:27 2018 +1100
ctdb-tests: Create 13.per_ip_routing.sh
Contains testing support used only by tests for 13.per_ip_routing
event script.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 916b7f947e5c499dc7969def77b734f704c7ffb4
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Mar 19 20:38:28 2018 +1100
ctdb-tests: Create 11.natgw.sh
Contains testing support used only by tests for 11.natgw event script.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit ee6052e689c676fee1d3088befe9763940edb248
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Mar 19 20:36:22 2018 +1100
ctdb-tests: Create 10.interface.sh
Contains testing support used only by tests for 10.interface event
script.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit f5a70415dd5377b59f2f2de8d60d6c5f35b9f89d
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Mar 19 20:31:33 2018 +1100
ctdb-tests: Create 05.system.sh
Contains testing support used only by tests for 05.system event script.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 7b4dd7e539c8e37a4a594f3cd3a6819fc40a5594
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Mar 19 20:30:03 2018 +1100
ctdb-tests: Create 01.reclock.sh
Contains testing support used only by tests for 01.reclock event
script.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit bcb6cc28618dcd1952da12bfa1eeab51adb75fe6
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Feb 9 15:57:19 2018 +1100
ctdb-tests: Create 00.ctdb.sh
Contains testing support used only by tests for 00.ctdb event script.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit bbd96993c85bd3203ff555f18279260acb5f7695
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Feb 8 05:57:44 2018 +1100
ctdb-tests: Allow modularisation of event script testing support
local.sh is enormous. Allow per-event-script customisation.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 26e090dd4ea08a2a0d110ceead5ec11f77a0ff6a
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Feb 8 22:04:51 2018 +1100
ctdb-tests: Clean up handling of CTDB_SCRIPT_VARDIR
Only set this in ctdb_set_pnn() and always use the PNN in the path.
Generic setup functions like setup_ctdb() will go away soon in favour
of more doing setup that is specific to the script being tested.
Therefore, call ctdb_set_pnn() in define_test() to ensure that
CTDB_SCRIPT_VARDIR is always set. Note that setup_ctdb() is never
called with an argument so the default PNN has always been 0.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 1d7d4874df634e664a2331adabd4e437c8b3d95a
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Feb 12 15:41:27 2018 +1100
ctdb-tests: Clean up fake share handling
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 3c82d3ae3d11130dfafc78e9b099298906d45a61
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Feb 8 21:52:51 2018 +1100
ctdb-tests: New function setup_numnodes()
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 6eec33c0a7089e0e91597269f66f90dd5263e3d8
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Feb 12 15:41:09 2018 +1100
ctdb-tests: Tweak debug function
Output to stderr. Read from stdin if no arguments given, making it
possible to handle long lines using here documents.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit e4a4532e5c417146da3a30c00d74b2032e16dc66
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Mar 21 18:43:35 2018 +1100
ctdb-tests: Make date handling consistent in 00.ctdb tests
This duplicates the filter function but that will be fixed later.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 3571345667e56c77a969b54febfee4397c558bfd
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Feb 9 16:36:04 2018 +1100
ctdb-tests: New support functions setup_dbdir() and setup_date()
For now, these need to be called from setup_generic() to stop tests
from breaking.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit ab89958817c6d37056c833f641ddcf4121e82557
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Feb 8 21:58:51 2018 +1100
ctdb-tests: Don't set FAKE_ETHTOOL_LINK_DOWN globally
This variable doesn't need to be set in a generic function and can be
set by the ethtool support functions
This is now a subdirectory of FAKE_NETWORK_STATE.
The down/up functions get reindented because the new 1st line should
be indented according to the new script indent-with-tabs style.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 26329aa035674bc5a5779b670b8daf6f18b148d7
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Feb 8 16:29:05 2018 +1100
ctdb-tests: Move variable FAKE_IP_STATE into the ip stub
It is the only user of this variable.
This is now a subdirectory of FAKE_NETWORK_STATE.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 3bbf3e97ca312cdc017c3173e734c85ac6e156db
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Mar 21 14:48:12 2018 +1100
ctdb-tests: Move variable FAKE_CTDB_IFACES_DOWN into ctdb stub
It is the only user of this variable.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit ce1b5b30d3badd2dac3ff4df67e60eb3f3c6bbbc
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Mar 21 16:37:57 2018 +1100
ctdb-tests: Remove case statement in ctdb stub
This removes a lot of unnecessary clutter.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 713804beecbd05ec0e5c0ef823130fe1fd59061c
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Mar 21 16:21:06 2018 +1100
ctdb-tests: Update argument handling of ctdb stub functions
All functions are now called after shifting away the command name.
There is less churn that expected because some functions don't use any
arguments.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 7d1d5fc969840639606f07f454127f6d6e8dea16
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Mar 21 14:50:53 2018 +1100
ctdb-tests: Move ctdb stub code from case statement to functions
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 06be4a652935e7fbda280a5782a135e9806c74f2
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Feb 8 16:21:36 2018 +1100
ctdb-tests: Drop unused ctdb stub scriptstatus and xpnn commands
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 6f730c4b3a7f32a16403579173433a51446df49d
Author: Martin Schwenke <martin at meltin.net>
Date: Wed Mar 21 15:42:22 2018 +1100
ctdb-tests: Fix a bug in the ctdb stub's moveip command
This was writing garbage into the IP layout file and relevant tests
were passing by luck.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit fb2090762ec84075d44603c18c037d9cc774dfad
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Feb 8 16:27:20 2018 +1100
ctdb-tests: New global variable FAKE_NETWORK_STATE
Stash all the network state in this directory.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit ad081f91443a2f16eb72c14dbaf290b8b737f641
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Feb 8 16:25:20 2018 +1100
ctdb-tests: Make FAKE_CTDB_STATE globally set
Lots of things depend on it.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit cf866d66aa33f4729321ea491217f462c585bce0
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Mar 22 15:52:05 2018 +1100
ctdb-scripts: Drop unused functions
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
commit 2f33b18d844802e228843af3f225dbbe13af333e
Author: Martin Schwenke <martin at meltin.net>
Date: Thu Mar 22 15:33:58 2018 +1100
ctdb-script: Drop CTDB_MANAGED_SERVICES configuration option
This seems never to have caught on so reduce complexity.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
ctdb/config/ctdb-crash-cleanup.sh | 2 +-
ctdb/config/ctdb.init | 6 +-
ctdb/config/ctdb.tunables | 2 +
ctdb/config/ctdbd.conf | 3 -
ctdb/config/ctdbd_wrapper | 3 +-
ctdb/config/debug-hung-script.sh | 2 +-
ctdb/config/debug_locks.sh | 2 +-
ctdb/config/events.d/00.ctdb | 29 +-
ctdb/config/events.d/01.reclock | 2 +-
ctdb/config/events.d/05.system | 2 +-
ctdb/config/events.d/06.nfs | 4 +-
ctdb/config/events.d/10.interface | 2 +-
ctdb/config/events.d/11.natgw | 2 +-
ctdb/config/events.d/11.routing | 2 +-
ctdb/config/events.d/13.per_ip_routing | 2 +-
ctdb/config/events.d/20.multipathd | 2 +-
ctdb/config/events.d/31.clamd | 4 +-
ctdb/config/events.d/40.vsftpd | 4 +-
ctdb/config/events.d/41.httpd | 6 +-
ctdb/config/events.d/49.winbind | 4 +-
ctdb/config/events.d/50.samba | 4 +-
ctdb/config/events.d/60.nfs | 6 +-
ctdb/config/events.d/70.iscsi | 4 +-
ctdb/config/events.d/91.lvs | 2 +-
ctdb/config/events.d/99.timeout | 2 +-
ctdb/config/events.d/README | 3 +-
ctdb/config/functions | 114 +-
ctdb/config/statd-callout | 5 +-
ctdb/doc/ctdb-tunables.7.xml | 28 +-
ctdb/doc/ctdbd.conf.5.xml | 105 +-
ctdb/packaging/RPM/ctdb.spec.in | 2 +
ctdb/tests/eventscripts/00.ctdb.init.001.sh | 2 +-
ctdb/tests/eventscripts/00.ctdb.init.002.sh | 2 +-
ctdb/tests/eventscripts/00.ctdb.init.003.sh | 2 +-
ctdb/tests/eventscripts/00.ctdb.init.004.sh | 8 +-
ctdb/tests/eventscripts/00.ctdb.init.005.sh | 2 +-
ctdb/tests/eventscripts/00.ctdb.init.006.sh | 6 +-
ctdb/tests/eventscripts/00.ctdb.init.007.sh | 2 +-
ctdb/tests/eventscripts/00.ctdb.init.008.sh | 2 +-
ctdb/tests/eventscripts/00.ctdb.init.009.sh | 11 +-
ctdb/tests/eventscripts/00.ctdb.setup.001.sh | 2 +-
ctdb/tests/eventscripts/00.ctdb.setup.002.sh | 8 +-
ctdb/tests/eventscripts/00.ctdb.setup.003.sh | 10 +-
ctdb/tests/eventscripts/00.ctdb.setup.004.sh | 10 +-
ctdb/tests/eventscripts/01.reclock.monitor.001.sh | 2 +
ctdb/tests/eventscripts/01.reclock.monitor.002.sh | 2 +
ctdb/tests/eventscripts/01.reclock.monitor.003.sh | 2 +-
ctdb/tests/eventscripts/01.reclock.monitor.004.sh | 2 +-
ctdb/tests/eventscripts/01.reclock.monitor.005.sh | 2 +-
ctdb/tests/eventscripts/05.system.monitor.001.sh | 7 +-
ctdb/tests/eventscripts/05.system.monitor.002.sh | 6 +-
ctdb/tests/eventscripts/05.system.monitor.003.sh | 7 +-
ctdb/tests/eventscripts/05.system.monitor.004.sh | 7 +-
ctdb/tests/eventscripts/05.system.monitor.005.sh | 7 +-
ctdb/tests/eventscripts/05.system.monitor.006.sh | 7 +-
ctdb/tests/eventscripts/05.system.monitor.007.sh | 6 +-
ctdb/tests/eventscripts/05.system.monitor.011.sh | 6 +-
ctdb/tests/eventscripts/05.system.monitor.012.sh | 5 +-
ctdb/tests/eventscripts/05.system.monitor.013.sh | 6 +-
ctdb/tests/eventscripts/05.system.monitor.014.sh | 6 +-
ctdb/tests/eventscripts/05.system.monitor.015.sh | 6 +-
ctdb/tests/eventscripts/05.system.monitor.016.sh | 5 +-
ctdb/tests/eventscripts/05.system.monitor.017.sh | 6 +-
ctdb/tests/eventscripts/05.system.monitor.018.sh | 30 +-
ctdb/tests/eventscripts/06.nfs.releaseip.001.sh | 6 +-
ctdb/tests/eventscripts/06.nfs.releaseip.002.sh | 6 +-
ctdb/tests/eventscripts/06.nfs.takeip.001.sh | 6 +-
ctdb/tests/eventscripts/06.nfs.takeip.002.sh | 6 +-
ctdb/tests/eventscripts/10.interface.010.sh | 2 +-
ctdb/tests/eventscripts/10.interface.011.sh | 2 +-
ctdb/tests/eventscripts/10.interface.012.sh | 2 +-
ctdb/tests/eventscripts/10.interface.013.sh | 2 +-
ctdb/tests/eventscripts/10.interface.init.001.sh | 2 +-
ctdb/tests/eventscripts/10.interface.init.002.sh | 2 +-
ctdb/tests/eventscripts/10.interface.init.021.sh | 2 +-
ctdb/tests/eventscripts/10.interface.init.022.sh | 2 +-
ctdb/tests/eventscripts/10.interface.init.023.sh | 2 +-
.../tests/eventscripts/10.interface.monitor.001.sh | 2 +-
.../tests/eventscripts/10.interface.monitor.002.sh | 2 +-
.../tests/eventscripts/10.interface.monitor.003.sh | 2 +-
.../tests/eventscripts/10.interface.monitor.004.sh | 2 +-
.../tests/eventscripts/10.interface.monitor.005.sh | 2 +-
.../tests/eventscripts/10.interface.monitor.006.sh | 2 +-
.../tests/eventscripts/10.interface.monitor.009.sh | 6 +-
.../tests/eventscripts/10.interface.monitor.010.sh | 12 +-
.../tests/eventscripts/10.interface.monitor.011.sh | 6 +-
.../tests/eventscripts/10.interface.monitor.012.sh | 12 +-
.../tests/eventscripts/10.interface.monitor.013.sh | 2 +-
.../tests/eventscripts/10.interface.monitor.014.sh | 2 +-
.../tests/eventscripts/10.interface.monitor.015.sh | 2 +-
.../tests/eventscripts/10.interface.monitor.016.sh | 6 +-
.../tests/eventscripts/10.interface.monitor.017.sh | 2 +-
.../tests/eventscripts/10.interface.monitor.018.sh | 2 +-
ctdb/tests/eventscripts/10.interface.multi.001.sh | 2 +-
.../eventscripts/10.interface.releaseip.001.sh | 2 +-
.../eventscripts/10.interface.releaseip.002.sh | 2 +-
.../tests/eventscripts/10.interface.startup.001.sh | 2 +-
.../tests/eventscripts/10.interface.startup.002.sh | 2 +-
ctdb/tests/eventscripts/10.interface.takeip.001.sh | 2 +-
ctdb/tests/eventscripts/10.interface.takeip.002.sh | 2 +-
ctdb/tests/eventscripts/10.interface.takeip.003.sh | 2 +-
ctdb/tests/eventscripts/11.natgw.001.sh | 2 +-
ctdb/tests/eventscripts/11.natgw.002.sh | 4 +-
ctdb/tests/eventscripts/11.natgw.003.sh | 5 +-
ctdb/tests/eventscripts/11.natgw.004.sh | 5 +-
ctdb/tests/eventscripts/11.natgw.011.sh | 2 +-
ctdb/tests/eventscripts/11.natgw.012.sh | 2 +-
ctdb/tests/eventscripts/11.natgw.013.sh | 4 +-
ctdb/tests/eventscripts/11.natgw.014.sh | 4 +-
ctdb/tests/eventscripts/11.natgw.015.sh | 2 +-
ctdb/tests/eventscripts/11.natgw.021.sh | 6 +-
ctdb/tests/eventscripts/11.natgw.022.sh | 6 +-
ctdb/tests/eventscripts/11.natgw.023.sh | 6 +-
ctdb/tests/eventscripts/11.natgw.024.sh | 6 +-
ctdb/tests/eventscripts/11.natgw.025.sh | 7 +-
ctdb/tests/eventscripts/11.natgw.031.sh | 14 +-
ctdb/tests/eventscripts/11.natgw.041.sh | 5 +-
ctdb/tests/eventscripts/11.natgw.042.sh | 5 +-
ctdb/tests/eventscripts/11.natgw.051.sh | 3 +-
ctdb/tests/eventscripts/11.natgw.052.sh | 3 +-
ctdb/tests/eventscripts/11.natgw.053.sh | 3 +-
ctdb/tests/eventscripts/11.natgw.054.sh | 3 +-
ctdb/tests/eventscripts/13.per_ip_routing.001.sh | 6 +-
ctdb/tests/eventscripts/13.per_ip_routing.002.sh | 3 +-
ctdb/tests/eventscripts/13.per_ip_routing.003.sh | 3 +-
ctdb/tests/eventscripts/13.per_ip_routing.004.sh | 3 +-
ctdb/tests/eventscripts/13.per_ip_routing.005.sh | 3 +-
ctdb/tests/eventscripts/13.per_ip_routing.006.sh | 3 +-
ctdb/tests/eventscripts/13.per_ip_routing.007.sh | 3 +-
ctdb/tests/eventscripts/13.per_ip_routing.008.sh | 3 +-
ctdb/tests/eventscripts/13.per_ip_routing.009.sh | 3 +-
ctdb/tests/eventscripts/13.per_ip_routing.010.sh | 3 +-
ctdb/tests/eventscripts/13.per_ip_routing.011.sh | 7 +-
ctdb/tests/eventscripts/13.per_ip_routing.012.sh | 3 +-
ctdb/tests/eventscripts/13.per_ip_routing.013.sh | 3 +-
ctdb/tests/eventscripts/13.per_ip_routing.014.sh | 3 +-
ctdb/tests/eventscripts/13.per_ip_routing.015.sh | 3 +-
ctdb/tests/eventscripts/13.per_ip_routing.016.sh | 3 +-
ctdb/tests/eventscripts/13.per_ip_routing.017.sh | 3 +-
ctdb/tests/eventscripts/13.per_ip_routing.018.sh | 3 +-
ctdb/tests/eventscripts/13.per_ip_routing.019.sh | 3 +-
ctdb/tests/eventscripts/13.per_ip_routing.021.sh | 5 +-
ctdb/tests/eventscripts/13.per_ip_routing.022.sh | 5 +-
ctdb/tests/eventscripts/13.per_ip_routing.023.sh | 3 +-
ctdb/tests/eventscripts/13.per_ip_routing.024.sh | 3 +-
.../eventscripts/20.multipathd.monitor.001.sh | 2 +-
.../eventscripts/20.multipathd.monitor.002.sh | 2 +-
.../eventscripts/20.multipathd.monitor.003.sh | 2 +-
.../eventscripts/20.multipathd.monitor.004.sh | 2 +-
ctdb/tests/eventscripts/31.clamd.monitor.001.sh | 8 +-
ctdb/tests/eventscripts/31.clamd.monitor.002.sh | 8 +-
ctdb/tests/eventscripts/31.clamd.monitor.003.sh | 8 +-
ctdb/tests/eventscripts/40.vsftpd.monitor.001.sh | 2 +-
ctdb/tests/eventscripts/40.vsftpd.monitor.002.sh | 7 +-
ctdb/tests/eventscripts/40.vsftpd.shutdown.001.sh | 2 +-
ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh | 7 +-
ctdb/tests/eventscripts/40.vsftpd.startup.001.sh | 2 +-
ctdb/tests/eventscripts/40.vsftpd.startup.002.sh | 7 +-
ctdb/tests/eventscripts/41.httpd.monitor.001.sh | 2 +-
ctdb/tests/eventscripts/41.httpd.monitor.002.sh | 7 +-
ctdb/tests/eventscripts/41.httpd.shutdown.001.sh | 2 +-
ctdb/tests/eventscripts/41.httpd.shutdown.002.sh | 7 +-
ctdb/tests/eventscripts/41.httpd.startup.001.sh | 2 +-
ctdb/tests/eventscripts/41.httpd.startup.002.sh | 7 +-
ctdb/tests/eventscripts/49.winbind.monitor.001.sh | 2 +-
ctdb/tests/eventscripts/49.winbind.monitor.101.sh | 2 +-
ctdb/tests/eventscripts/49.winbind.monitor.102.sh | 3 +-
ctdb/tests/eventscripts/49.winbind.shutdown.001.sh | 2 +-
ctdb/tests/eventscripts/49.winbind.shutdown.002.sh | 7 +-
ctdb/tests/eventscripts/49.winbind.startup.001.sh | 2 +-
ctdb/tests/eventscripts/49.winbind.startup.002.sh | 7 +-
ctdb/tests/eventscripts/50.samba.monitor.001.sh | 2 +-
ctdb/tests/eventscripts/50.samba.monitor.101.sh | 2 +-
ctdb/tests/eventscripts/50.samba.monitor.103.sh | 3 +-
ctdb/tests/eventscripts/50.samba.monitor.104.sh | 3 +-
ctdb/tests/eventscripts/50.samba.monitor.105.sh | 6 +-
ctdb/tests/eventscripts/50.samba.monitor.106.sh | 7 +-
ctdb/tests/eventscripts/50.samba.monitor.110.sh | 8 +-
ctdb/tests/eventscripts/50.samba.monitor.111.sh | 8 +-
ctdb/tests/eventscripts/50.samba.monitor.112.sh | 2 +-
ctdb/tests/eventscripts/50.samba.monitor.113.sh | 2 +-
ctdb/tests/eventscripts/50.samba.shutdown.001.sh | 2 +-
ctdb/tests/eventscripts/50.samba.shutdown.002.sh | 2 +-
ctdb/tests/eventscripts/50.samba.shutdown.011.sh | 2 +-
ctdb/tests/eventscripts/50.samba.startup.011.sh | 2 +-
ctdb/tests/eventscripts/60.nfs.monitor.001.sh | 2 +-
ctdb/tests/eventscripts/60.nfs.monitor.101.sh | 2 +-
ctdb/tests/eventscripts/60.nfs.monitor.102.sh | 2 +-
ctdb/tests/eventscripts/60.nfs.monitor.103.sh | 4 +-
ctdb/tests/eventscripts/60.nfs.monitor.104.sh | 2 +-
ctdb/tests/eventscripts/60.nfs.monitor.105.sh | 2 +-
ctdb/tests/eventscripts/60.nfs.monitor.106.sh | 3 +-
ctdb/tests/eventscripts/60.nfs.monitor.107.sh | 6 +-
ctdb/tests/eventscripts/60.nfs.monitor.108.sh | 6 +-
ctdb/tests/eventscripts/60.nfs.monitor.109.sh | 6 +-
ctdb/tests/eventscripts/60.nfs.monitor.111.sh | 3 +-
ctdb/tests/eventscripts/60.nfs.monitor.112.sh | 3 +-
ctdb/tests/eventscripts/60.nfs.monitor.113.sh | 3 +-
ctdb/tests/eventscripts/60.nfs.monitor.114.sh | 3 +-
ctdb/tests/eventscripts/60.nfs.monitor.121.sh | 3 +-
ctdb/tests/eventscripts/60.nfs.monitor.122.sh | 3 +-
ctdb/tests/eventscripts/60.nfs.monitor.131.sh | 3 +-
ctdb/tests/eventscripts/60.nfs.monitor.132.sh | 3 +-
ctdb/tests/eventscripts/60.nfs.monitor.141.sh | 3 +-
ctdb/tests/eventscripts/60.nfs.monitor.142.sh | 3 +-
ctdb/tests/eventscripts/60.nfs.monitor.143.sh | 3 +-
ctdb/tests/eventscripts/60.nfs.monitor.144.sh | 3 +-
ctdb/tests/eventscripts/60.nfs.monitor.151.sh | 3 +-
ctdb/tests/eventscripts/60.nfs.monitor.152.sh | 3 +-
ctdb/tests/eventscripts/60.nfs.monitor.153.sh | 3 +-
ctdb/tests/eventscripts/60.nfs.monitor.161.sh | 7 +-
ctdb/tests/eventscripts/60.nfs.monitor.162.sh | 7 +-
ctdb/tests/eventscripts/60.nfs.multi.001.sh | 2 +-
ctdb/tests/eventscripts/60.nfs.multi.002.sh | 2 +-
ctdb/tests/eventscripts/60.nfs.releaseip.001.sh | 6 +-
ctdb/tests/eventscripts/60.nfs.releaseip.002.sh | 6 +-
ctdb/tests/eventscripts/60.nfs.shutdown.001.sh | 6 +-
ctdb/tests/eventscripts/60.nfs.shutdown.002.sh | 6 +-
ctdb/tests/eventscripts/60.nfs.startup.001.sh | 6 +-
ctdb/tests/eventscripts/60.nfs.startup.002.sh | 6 +-
ctdb/tests/eventscripts/60.nfs.takeip.001.sh | 6 +-
ctdb/tests/eventscripts/60.nfs.takeip.002.sh | 6 +-
ctdb/tests/eventscripts/91.lvs.001.sh | 3 +-
.../tests/eventscripts/91.lvs.ipreallocated.011.sh | 3 +-
.../tests/eventscripts/91.lvs.ipreallocated.012.sh | 3 +-
.../tests/eventscripts/91.lvs.ipreallocated.013.sh | 3 +-
.../tests/eventscripts/91.lvs.ipreallocated.014.sh | 3 +-
ctdb/tests/eventscripts/91.lvs.monitor.001.sh | 3 +-
ctdb/tests/eventscripts/91.lvs.monitor.002.sh | 3 +-
ctdb/tests/eventscripts/91.lvs.monitor.003.sh | 3 +-
ctdb/tests/eventscripts/91.lvs.shutdown.001.sh | 3 +-
ctdb/tests/eventscripts/91.lvs.shutdown.002.sh | 3 +-
ctdb/tests/eventscripts/91.lvs.startup.001.sh | 3 +-
ctdb/tests/eventscripts/91.lvs.startup.002.sh | 3 +-
ctdb/tests/eventscripts/etc/sysconfig/ctdb | 5 -
ctdb/tests/eventscripts/scripts/00.ctdb.sh | 31 +
ctdb/tests/eventscripts/scripts/01.reclock.sh | 15 +
ctdb/tests/eventscripts/scripts/05.system.sh | 46 +
ctdb/tests/eventscripts/scripts/06.nfs.sh | 1 +
ctdb/tests/eventscripts/scripts/10.interface.sh | 72 ++
ctdb/tests/eventscripts/scripts/11.natgw.sh | 119 ++
.../eventscripts/scripts/13.per_ip_routing.sh | 42 +
ctdb/tests/eventscripts/scripts/20.multipathd.sh | 24 +
ctdb/tests/eventscripts/scripts/31.clamd.sh | 10 +
ctdb/tests/eventscripts/scripts/40.vsftpd.sh | 16 +
ctdb/tests/eventscripts/scripts/41.httpd.sh | 18 +
ctdb/tests/eventscripts/scripts/49.winbind.sh | 34 +
ctdb/tests/eventscripts/scripts/50.samba.sh | 62 ++
ctdb/tests/eventscripts/scripts/60.nfs.sh | 323 ++++++
ctdb/tests/eventscripts/scripts/91.lvs.sh | 76 ++
ctdb/tests/eventscripts/scripts/local.sh | 1138 +++-----------------
ctdb/tests/eventscripts/scripts/statd-callout.sh | 65 ++
ctdb/tests/eventscripts/statd-callout.001.sh | 4 +-
ctdb/tests/eventscripts/statd-callout.002.sh | 4 +-
ctdb/tests/eventscripts/statd-callout.003.sh | 4 +-
ctdb/tests/eventscripts/statd-callout.004.sh | 4 +-
ctdb/tests/eventscripts/statd-callout.005.sh | 4 +-
ctdb/tests/eventscripts/statd-callout.006.sh | 4 +-
ctdb/tests/eventscripts/statd-callout.007.sh | 4 +-
ctdb/tests/eventscripts/stubs/ctdb | 158 ++-
ctdb/tests/eventscripts/stubs/ip | 3 +
ctdb/tests/eventscripts/stubs/netstat | 109 --
ctdb/tests/eventscripts/stubs/nmap | 75 --
ctdb/tools/ctdb_lvs | 3 +-
ctdb/tools/ctdb_natgw | 3 +-
ctdb/tools/onnode | 3 +-
266 files changed, 1809 insertions(+), 1867 deletions(-)
create mode 100644 ctdb/config/ctdb.tunables
delete mode 100644 ctdb/tests/eventscripts/etc/sysconfig/ctdb
create mode 100644 ctdb/tests/eventscripts/scripts/00.ctdb.sh
create mode 100644 ctdb/tests/eventscripts/scripts/01.reclock.sh
create mode 100644 ctdb/tests/eventscripts/scripts/05.system.sh
create mode 100644 ctdb/tests/eventscripts/scripts/06.nfs.sh
create mode 100644 ctdb/tests/eventscripts/scripts/10.interface.sh
create mode 100644 ctdb/tests/eventscripts/scripts/11.natgw.sh
create mode 100644 ctdb/tests/eventscripts/scripts/13.per_ip_routing.sh
create mode 100644 ctdb/tests/eventscripts/scripts/20.multipathd.sh
create mode 100644 ctdb/tests/eventscripts/scripts/31.clamd.sh
create mode 100644 ctdb/tests/eventscripts/scripts/40.vsftpd.sh
create mode 100644 ctdb/tests/eventscripts/scripts/41.httpd.sh
create mode 100644 ctdb/tests/eventscripts/scripts/49.winbind.sh
create mode 100644 ctdb/tests/eventscripts/scripts/50.samba.sh
create mode 100644 ctdb/tests/eventscripts/scripts/60.nfs.sh
create mode 100644 ctdb/tests/eventscripts/scripts/91.lvs.sh
create mode 100644 ctdb/tests/eventscripts/scripts/statd-callout.sh
delete mode 100755 ctdb/tests/eventscripts/stubs/netstat
delete mode 100755 ctdb/tests/eventscripts/stubs/nmap
Changeset truncated at 500 lines:
diff --git a/ctdb/config/ctdb-crash-cleanup.sh b/ctdb/config/ctdb-crash-cleanup.sh
index 2ab8e52..8f4cc86 100755
--- a/ctdb/config/ctdb-crash-cleanup.sh
+++ b/ctdb/config/ctdb-crash-cleanup.sh
@@ -14,7 +14,7 @@ if service ctdb status >/dev/null 2>&1 ; then
exit 0
fi
-loadconfig ctdb
+loadconfig
if [ ! -f "$CTDB_BASE/public_addresses" ] ; then
die "No public addresses file found. Can't clean up."
diff --git a/ctdb/config/ctdb.init b/ctdb/config/ctdb.init
index dcb32e4..7fe8f00 100755
--- a/ctdb/config/ctdb.init
+++ b/ctdb/config/ctdb.init
@@ -41,14 +41,16 @@ unset TMPDIR
[ -n "$CTDB_BASE" ] || export CTDB_BASE="/etc/ctdb"
. "${CTDB_BASE}/functions"
-loadconfig "network"
-loadconfig "ctdb"
+
+load_system_config "network"
# check networking is up (for redhat)
if [ "$NETWORKING" = "no" ] ; then
exit 0
fi
+load_system_config "ctdb"
+
detect_init_style
export CTDB_INIT_STYLE
diff --git a/ctdb/config/ctdb.tunables b/ctdb/config/ctdb.tunables
new file mode 100644
index 0000000..b99e5cd
--- /dev/null
+++ b/ctdb/config/ctdb.tunables
@@ -0,0 +1,2 @@
+# Set some CTDB tunable variables during CTDB startup?
+# MutexEnabled=0
diff --git a/ctdb/config/ctdbd.conf b/ctdb/config/ctdbd.conf
index 2399a8e..3fe5c82 100644
--- a/ctdb/config/ctdbd.conf
+++ b/ctdb/config/ctdbd.conf
@@ -21,6 +21,3 @@
# Default log level is NOTICE. Want less logging?
# CTDB_DEBUGLEVEL=ERR
-
-# Set some CTDB tunable variables during CTDB startup?
-# CTDB_SET_TDBMutexEnabled=0
diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper
index c239e3d..8f3c6cb 100755
--- a/ctdb/config/ctdbd_wrapper
+++ b/ctdb/config/ctdbd_wrapper
@@ -19,7 +19,8 @@ if [ -z "$CTDB_BASE" ] ; then
fi
. "${CTDB_BASE}/functions"
-loadconfig "ctdb"
+
+loadconfig
ctdbd="${CTDBD:-/usr/local/sbin/ctdbd}"
diff --git a/ctdb/config/debug-hung-script.sh b/ctdb/config/debug-hung-script.sh
index 2e3792c..dc9c6e1 100755
--- a/ctdb/config/debug-hung-script.sh
+++ b/ctdb/config/debug-hung-script.sh
@@ -8,7 +8,7 @@
. "${CTDB_BASE}/functions"
-loadconfig ctdb
+loadconfig
# Testing hook
if [ -n "$CTDB_DEBUG_HUNG_SCRIPT_LOGFILE" ] ; then
diff --git a/ctdb/config/debug_locks.sh b/ctdb/config/debug_locks.sh
index f678724..0f8aaad 100755
--- a/ctdb/config/debug_locks.sh
+++ b/ctdb/config/debug_locks.sh
@@ -17,7 +17,7 @@
CTDB_DBDIR="${CTDB_VARDIR}"
CTDB_DBDIR_PERSISTENT="${CTDB_VARDIR}/persistent"
-loadconfig ctdb
+loadconfig
(
flock -n 9 || exit 1
diff --git a/ctdb/config/events.d/00.ctdb b/ctdb/config/events.d/00.ctdb
index d60b9aa..532f78b 100755
--- a/ctdb/config/events.d/00.ctdb
+++ b/ctdb/config/events.d/00.ctdb
@@ -8,7 +8,7 @@
. "${CTDB_BASE}/functions"
-loadconfig
+load_script_options
############################################################
@@ -105,18 +105,23 @@ EOF
set_ctdb_variables ()
{
- # set any tunables from the config file
- set | sed -n '/^CTDB_SET_/s/=.*//p' |
- while read v; do
- varname="${v#CTDB_SET_}"
- value=$(eval echo "\$$v")
- if $CTDB setvar "$varname" "$value" ; then
- echo "Set $varname to $value"
- else
- echo "Invalid configuration: CTDB_SET_${varname}=${value}"
- return 1
+ _f="${CTDB_BASE}/ctdb.tunables"
+ if [ ! -r "$_f" ] ; then
+ return
fi
- done
+
+ while IFS="=" read _var _val ; do
+ case "$_var" in
+ \#*|"") continue ;;
+ esac
+
+ if $CTDB setvar "$_var" "$_val" ; then
+ echo "Set $_var to $_val"
+ else
+ echo "Invalid tunable: ${_var}=${_val}"
+ return 1
+ fi
+ done <"$_f"
}
############################################################
diff --git a/ctdb/config/events.d/01.reclock b/ctdb/config/events.d/01.reclock
index 44e49f4..e2e4c0d 100755
--- a/ctdb/config/events.d/01.reclock
+++ b/ctdb/config/events.d/01.reclock
@@ -6,7 +6,7 @@
. "${CTDB_BASE}/functions"
-loadconfig
+load_script_options
ctdb_setup_state_dir "service" "reclock"
diff --git a/ctdb/config/events.d/05.system b/ctdb/config/events.d/05.system
index 41c582e..a902b22 100755
--- a/ctdb/config/events.d/05.system
+++ b/ctdb/config/events.d/05.system
@@ -6,7 +6,7 @@
. "${CTDB_BASE}/functions"
-loadconfig
+load_script_options
ctdb_setup_state_dir "service" "system-monitoring"
diff --git a/ctdb/config/events.d/06.nfs b/ctdb/config/events.d/06.nfs
index 833ae39..785188e 100755
--- a/ctdb/config/events.d/06.nfs
+++ b/ctdb/config/events.d/06.nfs
@@ -8,7 +8,7 @@
service_name="nfs"
-loadconfig
+load_script_options
ctdb_setup_state_dir "service" "$service_name"
@@ -28,7 +28,7 @@ nfs_callout_pre ()
# shellcheck disable=SC2154
nfs_callout_init "$script_state_dir"
-is_ctdb_managed_service || exit 0
+[ "$CTDB_MANAGES_NFS" = "yes" ] || exit 0
case "$1" in
takeip)
diff --git a/ctdb/config/events.d/10.interface b/ctdb/config/events.d/10.interface
index f05559b..28a7e5b 100755
--- a/ctdb/config/events.d/10.interface
+++ b/ctdb/config/events.d/10.interface
@@ -10,7 +10,7 @@
. "${CTDB_BASE}/functions"
-loadconfig
+load_script_options
ctdb_public_addresses="${CTDB_BASE}/public_addresses"
diff --git a/ctdb/config/events.d/11.natgw b/ctdb/config/events.d/11.natgw
index f2e17a7..cf80d41 100755
--- a/ctdb/config/events.d/11.natgw
+++ b/ctdb/config/events.d/11.natgw
@@ -12,7 +12,7 @@
service_name="natgw"
-loadconfig
+load_script_options
[ -n "$CTDB_NATGW_NODES" ] || exit 0
export CTDB_NATGW_NODES
diff --git a/ctdb/config/events.d/11.routing b/ctdb/config/events.d/11.routing
index c8d875c..018ee57 100755
--- a/ctdb/config/events.d/11.routing
+++ b/ctdb/config/events.d/11.routing
@@ -22,7 +22,7 @@
. "${CTDB_BASE}/functions"
-loadconfig
+load_script_options
[ -f "${CTDB_BASE}/static-routes" ] || {
exit 0
diff --git a/ctdb/config/events.d/13.per_ip_routing b/ctdb/config/events.d/13.per_ip_routing
index 2e080a1..ae5a0b9 100755
--- a/ctdb/config/events.d/13.per_ip_routing
+++ b/ctdb/config/events.d/13.per_ip_routing
@@ -5,7 +5,7 @@
. "${CTDB_BASE}/functions"
-loadconfig
+load_script_options
service_name="per_ip_routing"
diff --git a/ctdb/config/events.d/20.multipathd b/ctdb/config/events.d/20.multipathd
index ac34534..ed6d552 100755
--- a/ctdb/config/events.d/20.multipathd
+++ b/ctdb/config/events.d/20.multipathd
@@ -13,7 +13,7 @@
service_name="multipathd"
-loadconfig
+load_script_options
[ -n "$CTDB_MONITOR_MPDEVICES" ] || exit 0
diff --git a/ctdb/config/events.d/31.clamd b/ctdb/config/events.d/31.clamd
index 1b76365..1049c3b 100755
--- a/ctdb/config/events.d/31.clamd
+++ b/ctdb/config/events.d/31.clamd
@@ -23,9 +23,9 @@ redhat)
;;
esac
-loadconfig
+load_script_options
-is_ctdb_managed_service || exit 0
+[ "$CTDB_MANAGES_CLAMD" = "yes" ] || exit 0
case "$1" in
startup)
diff --git a/ctdb/config/events.d/40.vsftpd b/ctdb/config/events.d/40.vsftpd
index 95de406..c2e0eda 100755
--- a/ctdb/config/events.d/40.vsftpd
+++ b/ctdb/config/events.d/40.vsftpd
@@ -13,11 +13,11 @@ service_reconfigure ()
service $service_name restart
}
-loadconfig
+load_script_options
ctdb_setup_state_dir "service" "$service_name"
-is_ctdb_managed_service || exit 0
+[ "$CTDB_MANAGES_VSFTPD" = "yes" ] || exit 0
case "$1" in
startup)
diff --git a/ctdb/config/events.d/41.httpd b/ctdb/config/events.d/41.httpd
index adba397..73b8d0f 100755
--- a/ctdb/config/events.d/41.httpd
+++ b/ctdb/config/events.d/41.httpd
@@ -23,6 +23,8 @@ suse|debian|*)
;;
esac
+load_script_options
+
ctdb_setup_state_dir "service" "$service_name"
# RHEL5 sometimes use a SIGKILL to terminate httpd, which then leaks
@@ -47,9 +49,7 @@ service_stop ()
killall -q -9 $service_name || true
}
-loadconfig
-
-is_ctdb_managed_service || exit 0
+[ "$CTDB_MANAGES_HTTPD" = "yes" ] || exit 0
case "$1" in
startup)
diff --git a/ctdb/config/events.d/49.winbind b/ctdb/config/events.d/49.winbind
index 5e93737..07d4c1c 100755
--- a/ctdb/config/events.d/49.winbind
+++ b/ctdb/config/events.d/49.winbind
@@ -12,7 +12,7 @@ CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-winbind}
# shellcheck disable=SC2034
service_name="winbind"
-loadconfig
+load_script_options
service_start ()
{
@@ -34,7 +34,7 @@ service_stop ()
###########################
-is_ctdb_managed_service || exit 0
+[ "$CTDB_MANAGES_WINBIND" = "yes" ] || exit 0
###########################
diff --git a/ctdb/config/events.d/50.samba b/ctdb/config/events.d/50.samba
index ca987be..784d62c 100755
--- a/ctdb/config/events.d/50.samba
+++ b/ctdb/config/events.d/50.samba
@@ -26,7 +26,7 @@ esac
service_name="samba"
-loadconfig
+load_script_options
ctdb_setup_state_dir "service" "$service_name"
@@ -149,7 +149,7 @@ list_samba_ports ()
###########################
-is_ctdb_managed_service || exit 0
+[ "$CTDB_MANAGES_SAMBA" = "yes" ] || exit 0
###########################
diff --git a/ctdb/config/events.d/60.nfs b/ctdb/config/events.d/60.nfs
index f630a3d..51d8726 100755
--- a/ctdb/config/events.d/60.nfs
+++ b/ctdb/config/events.d/60.nfs
@@ -8,7 +8,9 @@
service_name="nfs"
-loadconfig
+load_system_config "nfs"
+
+load_script_options
ctdb_setup_state_dir "service" "$service_name"
@@ -251,7 +253,7 @@ nfs_update_lock_info ()
# shellcheck disable=SC2154
nfs_callout_init "$script_state_dir"
-is_ctdb_managed_service || exit 0
+[ "$CTDB_MANAGES_NFS" = "yes" ] || exit 0
case "$1" in
startup)
diff --git a/ctdb/config/events.d/70.iscsi b/ctdb/config/events.d/70.iscsi
index 8851c59..670e0d7 100755
--- a/ctdb/config/events.d/70.iscsi
+++ b/ctdb/config/events.d/70.iscsi
@@ -11,9 +11,9 @@
# shellcheck disable=SC2034
service_name="iscsi"
-loadconfig
+load_script_options
-is_ctdb_managed_service || exit 0
+[ "$CTDB_MANAGES_ISCSI" = "yes" ] || exit 0
[ -z "$CTDB_START_ISCSI_SCRIPTS" ] && {
echo "No iscsi start script directory found"
diff --git a/ctdb/config/events.d/91.lvs b/ctdb/config/events.d/91.lvs
index 9725ee8..c70f0c1 100755
--- a/ctdb/config/events.d/91.lvs
+++ b/ctdb/config/events.d/91.lvs
@@ -6,7 +6,7 @@
. "${CTDB_BASE}/functions"
-loadconfig ctdb
+load_script_options
[ -n "$CTDB_LVS_NODES" ] || exit 0
export CTDB_LVS_NODES
diff --git a/ctdb/config/events.d/99.timeout b/ctdb/config/events.d/99.timeout
index 4aa5940..71fe0b5 100755
--- a/ctdb/config/events.d/99.timeout
+++ b/ctdb/config/events.d/99.timeout
@@ -9,7 +9,7 @@
. "${CTDB_BASE}/functions"
-loadconfig ctdb
+load_script_options
[ "$CTDB_RUN_TIMEOUT_MONITOR" = "yes" ] || exit 0
diff --git a/ctdb/config/events.d/README b/ctdb/config/events.d/README
index 7025a4b..f13714a 100644
--- a/ctdb/config/events.d/README
+++ b/ctdb/config/events.d/README
@@ -51,8 +51,7 @@ setup
Failure of this event will cause CTDB to terminate.
- Example: 00.ctdb processes tunables defined in the CTDB
- configuration using CTDB_SET_<TunableName>=<TunableValue>.
+ Example: 00.ctdb processes tunables defined in ctdb.tunables.
startup
diff --git a/ctdb/config/functions b/ctdb/config/functions
index 84b6829..8728d99 100755
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -56,43 +56,39 @@ rewrite_ctdb_options ()
esac
}
-_loadconfig() {
+load_system_config ()
+{
+ if [ -z "$1" ] ; then
+ return
+ fi
- if [ -z "$1" ] ; then
- foo="${service_config:-${service_name}}"
- if [ -n "$foo" ] ; then
- loadconfig "$foo"
- return
+ if [ -f "${CTDB_SYS_ETCDIR}/sysconfig/$1" ]; then
+ . "${CTDB_SYS_ETCDIR}/sysconfig/$1"
+ elif [ -f "${CTDB_SYS_ETCDIR}/default/$1" ]; then
+ . "${CTDB_SYS_ETCDIR}/default/$1"
fi
- fi
+}
- if [ "$1" != "ctdb" ] ; then
- loadconfig "ctdb"
- fi
+loadconfig() {
- if [ -z "$1" ] ; then
- return
- fi
+ load_system_config "ctdb"
- if [ -f "${CTDB_SYS_ETCDIR}/sysconfig/$1" ]; then
- . "${CTDB_SYS_ETCDIR}/sysconfig/$1"
- elif [ -f "${CTDB_SYS_ETCDIR}/default/$1" ]; then
- . "${CTDB_SYS_ETCDIR}/default/$1"
- elif [ -f "${CTDB_BASE}/sysconfig/$1" ]; then
- . "${CTDB_BASE}/sysconfig/$1"
- fi
-
- if [ "$1" = "ctdb" ] ; then
_config="${CTDB_BASE}/ctdbd.conf"
if [ -r "$_config" ] ; then
- . "$_config"
+ . "$_config"
fi
rewrite_ctdb_options
- fi
}
-loadconfig () {
- _loadconfig "$@"
+load_script_options ()
+{
+ loadconfig
+
--
Samba Shared Repository
More information about the samba-cvs
mailing list