The branch, master has been updated
via 1be8564 ctdb-common: Use SCHED_RESET_ON_FORK when setting SCHED_FIFO
via a283b9e ctdb-recoverd: Don't say "Election timed out"
via 8bdb9b8 ctdb-recoverd: Log a message when releasing the recovery
lock
via 61b1fde ctdb-scripts: Support NFS on RHEL7 with systemd
from 1dddf6c auth: Fix an incompatible pointer assignment
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1be8564e553ce044426dbe7b3987edf514832940
Author: Martin Schwenke <[email protected]>
Date: Sat May 31 14:01:53 2014 +1000
ctdb-common: Use SCHED_RESET_ON_FORK when setting SCHED_FIFO
This makes the scheduler reset code a no-op.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
Autobuild-User(master): Amitay Isaacs <[email protected]>
Autobuild-Date(master): Mon Jul 7 13:28:25 CEST 2014 on sn-devel-104
commit a283b9e43a602b9c72065336edbe8ad7c2499117
Author: Martin Schwenke <[email protected]>
Date: Fri Jun 20 13:36:25 2014 +1000
ctdb-recoverd: Don't say "Election timed out"
That makes people think there's a problem (and report bugs) so say
something a bit less scary instead...
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 8bdb9b85cc02f589a3b219de07f3c2ef7510d937
Author: Martin Schwenke <[email protected]>
Date: Fri Jun 20 10:51:16 2014 +1000
ctdb-recoverd: Log a message when releasing the recovery lock
It is a non-trivial event and will make it easier to debug recovery
lock issues.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
commit 61b1fdec2fdb19be9b9cd39bc5298917e914cc04
Author: Martin Schwenke <[email protected]>
Date: Thu Jun 26 10:36:17 2014 +1000
ctdb-scripts: Support NFS on RHEL7 with systemd
Need to be able to recognise a RHEL system. Still use "system" to
start and stop service, since that still works and yields the smallest
change.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ctdb/common/system_util.c | 8 +++++++-
ctdb/config/functions | 6 ++++--
ctdb/server/ctdb_recoverd.c | 3 ++-
3 files changed, 13 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/common/system_util.c b/ctdb/common/system_util.c
index 6a5f454..fe0f403 100644
--- a/ctdb/common/system_util.c
+++ b/ctdb/common/system_util.c
@@ -59,10 +59,14 @@ void set_scheduler(void)
#else /* no AIX */
#if HAVE_SCHED_SETSCHEDULER
struct sched_param p;
+ int policy = SCHED_FIFO;
p.sched_priority = 1;
- if (sched_setscheduler(0, SCHED_FIFO, &p) == -1) {
+#ifdef SCHED_RESET_ON_FORK
+ policy |= SCHED_RESET_ON_FORK;
+#endif
+ if (sched_setscheduler(0, policy, &p) == -1) {
DEBUG(DEBUG_CRIT,("Unable to set scheduler to SCHED_FIFO
(%s)\n",
strerror(errno)));
} else {
@@ -92,6 +96,7 @@ void reset_scheduler(void)
#endif
#else /* no AIX */
#if HAVE_SCHED_SETSCHEDULER
+#ifndef SCHED_RESET_ON_FORK
struct sched_param p;
p.sched_priority = 0;
@@ -100,6 +105,7 @@ void reset_scheduler(void)
}
#endif
#endif
+#endif
}
void set_nonblocking(int fd)
diff --git a/ctdb/config/functions b/ctdb/config/functions
index 6bc0312..3f2ccee 100755
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -681,7 +681,8 @@ startstop_nfs() {
[ -x $CTDB_ETCDIR/init.d/nfsserver ] && {
PLATFORM="sles"
}
- [ -x $CTDB_ETCDIR/init.d/nfslock ] && {
+ [ -x $CTDB_ETCDIR/init.d/nfslock -o \
+ -r /usr/lib/systemd/system/nfs-lock.service ] && {
PLATFORM="rhel"
}
@@ -761,7 +762,8 @@ startstop_nfslock() {
[ -x $CTDB_ETCDIR/init.d/nfsserver ] && {
PLATFORM="sles"
}
- [ -x $CTDB_ETCDIR/init.d/nfslock ] && {
+ [ -x $CTDB_ETCDIR/init.d/nfslock -o \
+ -r /usr/lib/systemd/system/nfs-lock.service ] && {
PLATFORM="rhel"
}
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index cfba29d..f553f67 100644
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -1168,7 +1168,7 @@ static void ctdb_election_timeout(struct event_context
*ev, struct timed_event *
rec->election_timeout = NULL;
fast_start = false;
- DEBUG(DEBUG_WARNING,(__location__ " Election timed out\n"));
+ DEBUG(DEBUG_WARNING,("Election period ended\n"));
}
@@ -2716,6 +2716,7 @@ static void election_handler(struct ctdb_context *ctdb,
uint64_t srvid,
/* release the recmaster lock */
if (em->pnn != ctdb->pnn &&
ctdb->recovery_lock_fd != -1) {
+ DEBUG(DEBUG_NOTICE, ("Release the recovery lock\n"));
close(ctdb->recovery_lock_fd);
ctdb->recovery_lock_fd = -1;
unban_all_nodes(ctdb);
--
Samba Shared Repository
