[SCM] CTDB repository - branch 2.5 updated - ctdb-2.5.3-151-ge1cc869
Amitay Isaacs
amitay at samba.org
Sun Sep 21 19:19:14 MDT 2014
The branch, 2.5 has been updated
via e1cc86972fa11bc22d202354db7786671b038dfe (commit)
via 64e08fe93b2ea8d548ec69a08e81ffadb5d9c6fe (commit)
via c20cbbcbf45bdc11067a4ed3f3cdfab4f014782d (commit)
from 99c1abbefc4a643d3f83ec210509cd2bd5556642 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=2.5
- Log -----------------------------------------------------------------
commit e1cc86972fa11bc22d202354db7786671b038dfe
Author: Amitay Isaacs <amitay at gmail.com>
Date: Tue Sep 16 12:33:26 2014 +1000
scripts: Do not export variables if they are not set
Variables that are not set but exported, may return an empty string
for getenv(). Tested on freebsd.
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
Autobuild-User(master): Martin Schwenke <martins at samba.org>
Autobuild-Date(master): Wed Sep 17 09:55:47 CEST 2014 on sn-devel-104
(Imported from commit 22257dd4b6d226ee956ede5a847ce0bcb99333be)
commit 64e08fe93b2ea8d548ec69a08e81ffadb5d9c6fe
Author: Amitay Isaacs <amitay at gmail.com>
Date: Tue Sep 16 12:00:10 2014 +1000
scripts: Fix a typo
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
(Imported from commit 8509bffdebb7884b765904f8112ff83056511a30)
commit c20cbbcbf45bdc11067a4ed3f3cdfab4f014782d
Author: Martin Schwenke <martin at meltin.net>
Date: Mon Sep 15 11:48:33 2014 +1000
util: Log an error if there is no way to set scheduler
Although configure should catch this, logging a run-time error is
better than being mystified when ctdbd silently exits.
Signed-off-by: Martin Schwenke <martin at meltin.net>
Reviewed-by: Amitay Isaacs <amitay at gmail.com>
(Imported from commit fb9c49f2ce0838baa5f94f4ca03d1c92cb58b306)
-----------------------------------------------------------------------
Summary of changes:
common/system_util.c | 1 +
config/ctdbd_wrapper | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/common/system_util.c b/common/system_util.c
index 761acbc..6fe4152 100644
--- a/common/system_util.c
+++ b/common/system_util.c
@@ -76,6 +76,7 @@ bool set_scheduler(void)
}
#endif
#endif
+ DEBUG(DEBUG_CRIT,("No way to set real-time priority.\n"));
return false;
}
diff --git a/config/ctdbd_wrapper b/config/ctdbd_wrapper
index f0b032d..cbde6ba 100755
--- a/config/ctdbd_wrapper
+++ b/config/ctdbd_wrapper
@@ -20,7 +20,7 @@ action="$2"
. "${CTDB_BASE}/functions"
loadconfig "ctdb"
-export CTDB_SOCKET
+[ -n "$CTDB_SOCKET" ] && export CTDB_SOCKET
ctdbd="${CTDBD:-/usr/sbin/ctdbd}"
@@ -104,7 +104,7 @@ build_ctdb_options ()
}
if [ -z "$CTDB_RECOVERY_LOCK" ] ; then
- echo "No recovery lock specified. Starting CTDB without split brain preventivon"
+ echo "No recovery lock specified. Starting CTDB without split brain prevention."
fi
maybe_set "--reclock" "$CTDB_RECOVERY_LOCK"
@@ -136,7 +136,9 @@ build_ctdb_options ()
export_debug_variables ()
{
- export CTDB_DEBUG_HUNG_SCRIPT CTDB_EXTERNAL_TRACE CTDB_DEBUG_LOCKS
+ [ -n "$CTDB_DEBUG_HUNG_SCRIPT" ] && export CTDB_DEBUG_HUNG_SCRIPT
+ [ -n "$CTDB_EXTERNAL_TRACE" ] && export CTDB_EXTERNAL_TRACE
+ [ -n "$CTDB_DEBUG_LOCKS" ] && export CTDB_DEBUG_LOCKS
}
kill_ctdbd ()
--
CTDB repository
More information about the samba-cvs
mailing list