The branch, master has been updated
via 296845e ctdb-docs: Document configuration variable
CTDB_NFS_CHECKS_DIR
via 8eafa2c ctdb-scripts: Avoid log noise when NFS checks directory is
empty
via e7c2f27 ctdb-tests: Drop calls to ctdb_service_managed and
ctdb_service_unmanaged
from be8e90f s3/rpc_server: move rpc_modules.c to its own subsystem
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 296845e5f2a0c17e108d5b4d17204753cd284bde
Author: Martin Schwenke <[email protected]>
Date: Fri Jan 20 11:16:55 2017 +1100
ctdb-docs: Document configuration variable CTDB_NFS_CHECKS_DIR
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
Autobuild-User(master): Martin Schwenke <[email protected]>
Autobuild-Date(master): Fri Jan 20 18:47:04 CET 2017 on sn-devel-144
commit 8eafa2c5dfe78432b8b29d6063c2d2a1224470f0
Author: Martin Schwenke <[email protected]>
Date: Thu Jan 19 14:40:20 2017 +1100
ctdb-scripts: Avoid log noise when NFS checks directory is empty
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit e7c2f270b5d37e75a6176b4a3dce923b981ef191
Author: Amitay Isaacs <[email protected]>
Date: Thu Jan 19 17:04:20 2017 +1100
ctdb-tests: Drop calls to ctdb_service_managed and ctdb_service_unmanaged
These functions have been removed as part of dropping
CTDB_SERVICE_AUTOSTARTSTOP functionality.
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ctdb/config/events.d/60.nfs | 2 ++
ctdb/doc/ctdbd.conf.5.xml | 28 ++++++++++++++++++++++++++++
ctdb/tests/eventscripts/scripts/local.sh | 12 ------------
3 files changed, 30 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/config/events.d/60.nfs b/ctdb/config/events.d/60.nfs
index bd6be78..eaa260b 100755
--- a/ctdb/config/events.d/60.nfs
+++ b/ctdb/config/events.d/60.nfs
@@ -37,6 +37,8 @@ nfs_check_services ()
# Files must end with .check - avoids editor backups, RPM fu, ...
for _f in "$_dir"/[0-9][0-9].*.check ; do
+ [ -r "$_f" ] || continue
+
_t="${_f%.check}"
_progname="${_t##*/[0-9][0-9].}"
diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index 1259fd3..fc58c31 100644
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -1103,6 +1103,34 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
</varlistentry>
<varlistentry>
+ <term>CTDB_NFS_CHECKS_DIR=<parameter>DIRECTORY</parameter></term>
+ <listitem>
+ <para>
+ Specifies the path to a DIRECTORY containing files that
+ describe how to monitor the responsiveness of NFS RPC
+ services. See the README file for this directory for an
+ explanation of the contents of these "check" files.
+ </para>
+ <para>
+ CTDB_NFS_CHECKS_DIR can be used to point to different
+ sets of checks for different NFS servers.
+ </para>
+ <para>
+ One way of using this is to have it point to, say,
+ <filename>/usr/local/etc/ctdb/nfs-checks-enabled.d</filename>
+ and populate it with symbolic links to the desired check
+ files. This avoids duplication and is upgrade-safe.
+ </para>
+ <para>
+ Default is
+ <filename>/usr/local/etc/ctdb/nfs-checks.d</filename>,
+ which contains NFS RPC checks suitable for Linux kernel
+ NFS.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>CTDB_NFS_SKIP_SHARE_CHECK=yes|no</term>
<listitem>
<para>
diff --git a/ctdb/tests/eventscripts/scripts/local.sh
b/ctdb/tests/eventscripts/scripts/local.sh
index b7b4848..5a638df 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -802,8 +802,6 @@ setup_samba ()
if [ "$1" != "down" ] ; then
debug "Marking Samba services as up, listening and managed by CTDB"
- # Get into known state.
- eventscript_call ctdb_service_managed
# All possible service names for all known distros.
for i in "smb" "nmb" "samba" "smbd" "nmbd" ; do
@@ -822,8 +820,6 @@ setup_samba ()
export FAKE_SLEEP_FORCE=0.1
else
debug "Marking Samba services as down, not listening and not managed by
CTDB"
- # Get into known state.
- eventscript_call ctdb_service_unmanaged
# All possible service names for all known distros.
for i in "smb" "nmb" "samba" "smbd" "nmbd" ; do
@@ -865,8 +861,6 @@ setup_winbind ()
if [ "$1" != "down" ] ; then
debug "Marking Winbind service as up and managed by CTDB"
- # Get into known state.
- eventscript_call ctdb_service_managed
service "winbind" force-started
@@ -876,8 +870,6 @@ setup_winbind ()
else
debug "Marking Winbind service as down and not managed by CTDB"
- # Get into known state.
- eventscript_call ctdb_service_unmanaged
service "winbind" force-stopped
@@ -919,7 +911,6 @@ setup_nfs ()
if [ "$1" != "down" ] ; then
debug "Setting up NFS environment: all RPC services up, NFS managed by
CTDB"
- eventscript_call ctdb_service_managed
service "nfs" force-started
service "nfslock" force-started
@@ -933,7 +924,6 @@ setup_nfs ()
else
debug "Setting up NFS environment: all RPC services down, NFS not
managed by CTDB"
- eventscript_call ctdb_service_unmanaged
service "nfs" force-stopped
service "nfslock" force-stopped
@@ -1187,7 +1177,6 @@ setup_vsftpd ()
else
debug "Setting up VSFTPD environment: service down, not managed by CTDB"
- eventscript_call ctdb_service_unmanaged
service vsftpd force-stopped
export CTDB_MANAGED_SERVICES="foo"
@@ -1207,7 +1196,6 @@ setup_httpd ()
debug "Setting up HTTPD environment: service down, not managed by CTDB"
for service_name in "apache2" "httpd" ; do
- eventscript_call ctdb_service_unmanaged
service "$service_name" force-stopped
done
--
Samba Shared Repository
