The branch, master has been updated
via 6551591 ctdb-daemon: Ignore SIGUSR1
via b0bc4d2 ctdb-scripts: Move 60.nfs Ganesha callout to doc/examples/
via dd88c2a ctdb-scripts: Support RPC checks for tcp6 and udp6
from d61ba23 Use uintptr_t for pointer int cast in SMBC_getdents_ctx()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 65515919142c922fe6ddf63d0f50449eec445b30
Author: Martin Schwenke <mar...@meltin.net>
Date: Tue Jul 21 12:23:27 2015 +1000
ctdb-daemon: Ignore SIGUSR1
No use dying or failing eventscripts if someone sends a random
SIGUSR1.
Signed-off-by: Martin Schwenke <mar...@meltin.net>
Reviewed-by: Amitay Isaacs <ami...@gmail.com>
Autobuild-User(master): Amitay Isaacs <ami...@samba.org>
Autobuild-Date(master): Tue Jul 21 11:00:17 CEST 2015 on sn-devel-104
commit b0bc4d2cab281ccb482e69dc56cb65d3059da75b
Author: Martin Schwenke <mar...@meltin.net>
Date: Sun Jul 19 21:23:44 2015 +1000
ctdb-scripts: Move 60.nfs Ganesha callout to doc/examples/
We don't expect to maintain an up-to-date copy. NFS Ganesha team
might provide patches.
Also move the Ganesha .check file
Signed-off-by: Martin Schwenke <mar...@meltin.net>
Reviewed-by: Amitay Isaacs <ami...@gmail.com>
commit dd88c2ab8c4d37c49b0c49f48b8e7e3ab7d5bdee
Author: Martin Schwenke <mar...@meltin.net>
Date: Wed Jul 15 20:15:46 2015 +1000
ctdb-scripts: Support RPC checks for tcp6 and udp6
This adds new configuration variable CTDB_RPCINFO_LOCALHOST6.
Signed-off-by: Martin Schwenke <mar...@meltin.net>
Reviewed-by: Amitay Isaacs <ami...@gmail.com>
-----------------------------------------------------------------------
Summary of changes:
ctdb/config/events.d/60.nfs | 8 +++++++-
ctdb/doc/ctdbd.conf.5.xml | 19 ++++++++++++++++++-
.../examples/20.nfs_ganesha.check} | 0
ctdb/doc/examples/README | 13 ++++++++++++-
ctdb/{config => doc/examples}/nfs-ganesha-callout | 2 +-
ctdb/packaging/RPM/ctdb.spec.in | 1 -
ctdb/server/ctdb_daemon.c | 1 +
7 files changed, 39 insertions(+), 5 deletions(-)
rename ctdb/{config/nfs-checks.d/20.nfs_ganesha.disabled =>
doc/examples/20.nfs_ganesha.check} (100%)
rename ctdb/{config => doc/examples}/nfs-ganesha-callout (98%)
Changeset truncated at 500 lines:
diff --git a/ctdb/config/events.d/60.nfs b/ctdb/config/events.d/60.nfs
index fce6beb..46ed29a 100755
--- a/ctdb/config/events.d/60.nfs
+++ b/ctdb/config/events.d/60.nfs
@@ -233,7 +233,13 @@ ctdb_check_rpc ()
_version="$2" # optional, not passed if empty/unset
_family="${3:-tcp}" # optional, default is "tcp"
- _localhost="${CTDB_RPCINFO_LOCALHOST:-127.0.0.1}"
+ case "$_family" in
+ tcp6|udp6)
+ _localhost="${CTDB_RPCINFO_LOCALHOST6:-::1}"
+ ;;
+ *)
+ _localhost="${CTDB_RPCINFO_LOCALHOST:-127.0.0.1}"
+ esac
if ! ctdb_check_rpc_out=$(rpcinfo -T $_family $_localhost \
$_progname $_version 2>&1) ; then
diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index 1d6982f..da53e51 100644
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -1049,7 +1049,7 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
<para>
IPADDR or HOSTNAME indicates the address that
<command>rpcinfo</command> should connect to when doing
- <command>rpcinfo</command> check on RPC service during
+ <command>rpcinfo</command> check on IPv4 RPC service during
monitoring. Optimally this would be "localhost".
However, this can add some performance overheads.
</para>
@@ -1059,6 +1059,23 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
</listitem>
</varlistentry>
+ <varlistentry>
+
<term>CTDB_RPCINFO_LOCALHOST6=<parameter>IPADDR</parameter>|<parameter>HOSTNAME</parameter></term>
+ <listitem>
+ <para>
+ IPADDR or HOSTNAME indicates the address that
+ <command>rpcinfo</command> should connect to when doing
+ <command>rpcinfo</command> check on IPv6 RPC service
+ during monitoring. Optimally this would be "localhost6"
+ (or similar). However, this can add some performance
+ overheads.
+ </para>
+ <para>
+ Default is "::1".
+ </para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
</refsect2>
diff --git a/ctdb/config/nfs-checks.d/20.nfs_ganesha.disabled
b/ctdb/doc/examples/20.nfs_ganesha.check
similarity index 100%
rename from ctdb/config/nfs-checks.d/20.nfs_ganesha.disabled
rename to ctdb/doc/examples/20.nfs_ganesha.check
diff --git a/ctdb/doc/examples/README b/ctdb/doc/examples/README
index 7a2e964..b3ca1c1 100644
--- a/ctdb/doc/examples/README
+++ b/ctdb/doc/examples/README
@@ -1,5 +1,16 @@
-This directory includes sample CTDB cluster configurations.
+This directory includes...
+
+Sample CTDB cluster configurations
o cluster.conf - Basic cluster setup
o natgw.conf - Basic cluster setup with NAT gateway feature
o external.conf - Basic cluster setup with externally managed public IP
addresses
+
+
+Sample 60.nfs configuration for NFS ganesha - callout script and
+.check file
+
+ o nfs-ganesha-callout
+ o 20.nfs_ganesha.check
+
+See the comment at the top of nfs-ganesha-callout for instructions.
diff --git a/ctdb/config/nfs-ganesha-callout
b/ctdb/doc/examples/nfs-ganesha-callout
similarity index 98%
rename from ctdb/config/nfs-ganesha-callout
rename to ctdb/doc/examples/nfs-ganesha-callout
index b66611c..3f0a016 100755
--- a/ctdb/config/nfs-ganesha-callout
+++ b/ctdb/doc/examples/nfs-ganesha-callout
@@ -17,7 +17,7 @@
# * Rename nfs-checks.d/{20.nfs.check,30.nlockmgr.check,50.mountd.check}
# so that they no longer have the ".check" suffix
#
-# * Rename nfs-checks.d/20.nfs-ganesha.disabled to nfs-checks.d/20.nfs.check
+# * Install 20.nfs-ganesha.check to nfs-checks.d/20.nfs.check
# I (Martin Schwenke) hereby relicense all of my contributions to this
# callout (and, previously, to 60.ganesha) to a license compatible
diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index c356b6c..00f0be5 100644
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -187,7 +187,6 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/00.portmapper.check
%config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/10.status.check
%config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/20.nfs.check
-%config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/20.nfs_ganesha.disabled
%config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/30.nlockmgr.check
%config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/40.mountd.check
%config(noreplace) %{_sysconfdir}/ctdb/nfs-checks.d/50.rquotad.check
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index 955b92e..ac2db75 100644
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -1219,6 +1219,7 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool
do_fork)
}
}
ignore_signal(SIGPIPE);
+ ignore_signal(SIGUSR1);
ctdb->ctdbd_pid = getpid();
DEBUG(DEBUG_ERR, ("Starting CTDBD (Version %s) as PID: %u\n",
--
Samba Shared Repository
