The branch, 2.5 has been updated
via f33b1f208a668d881144ead0eb3cad8e918748ed (commit)
via 27fb3fcba34b85d315f9b25c3d54dc3d4f65f890 (commit)
via 15ae5b63369d67621837803ff56426bd2293f27f (commit)
via bde34c1abc5f25102c64dae8a20c81b2ab716f05 (commit)
from e56f920a8bc1b52f4905032be63e8cf1f4519f19 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=2.5
- Log -----------------------------------------------------------------
commit f33b1f208a668d881144ead0eb3cad8e918748ed
Author: Amitay Isaacs <ami...@gmail.com>
Date: Tue Feb 11 18:07:08 2014 +1100
daemon: Do not support connection tracking if there are no public IPs
CTDB tracks connections to be able to send tickle ACKs and gratuitous
ARPs. When there are no public IPs, there is no need for tickle ACKs
and gratuitous ARPs.
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
Autobuild-User(master): Martin Schwenke <mart...@samba.org>
Autobuild-Date(master): Tue Mar 4 03:01:38 CET 2014 on sn-devel-104
(Imported from commit fb2631f5dfd3ec58fd277dbe155afab58f882202)
commit 27fb3fcba34b85d315f9b25c3d54dc3d4f65f890
Author: Amitay Isaacs <ami...@gmail.com>
Date: Tue Feb 11 17:57:42 2014 +1100
util: Do not use mlockall() on AIX
Memory lockdown causes recovery daemon to crash on AIX.
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
(Imported from commit af3a168ed3b0dcac4086d2d90bfdef65590b68dc)
commit 15ae5b63369d67621837803ff56426bd2293f27f
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Feb 6 16:32:42 2014 +1100
build: AIX does not have working C99 vsnprintf, requires libreplace
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
(Imported from commit 44520dcefc226ff1a93f77c8c7cf79d1c5244c3a)
commit bde34c1abc5f25102c64dae8a20c81b2ab716f05
Author: Amitay Isaacs <ami...@gmail.com>
Date: Thu Feb 6 16:27:09 2014 +1100
build: Remove auto-generated header file in distclean
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Reviewed-by: Martin Schwenke <mar...@meltin.net>
(Imported from commit 96203d9126d77c45ee53e6b536720863851a42aa)
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 5 +++--
common/ctdb_util.c | 7 +------
server/ctdb_takeover.c | 15 +++++++++++++++
3 files changed, 19 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index d8397b8..ba90ae6 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -178,9 +178,9 @@ bin/ctdb_lock_helper: server/ctdb_lock_helper.o
lib/util/util_file.o $(CTDB_EXTE
@echo Linking $@
$(WRAPPER) $(CC) $(CFLAGS) -o $@ server/ctdb_lock_helper.o
lib/util/util_file.o $(CTDB_EXTERNAL_OBJ) $(TDB_LIBS) $(LIB_FLAGS)
-bin/ctdb_event_helper: server/ctdb_event_helper.o $(SOCKET_WRAPPER_OBJ)
+bin/ctdb_event_helper: server/ctdb_event_helper.o $(REPLACE_OBJ)
$(SOCKET_WRAPPER_OBJ)
@echo Linking $@
- $(WRAPPER) $(CC) $(CFLAGS) -o $@ server/ctdb_event_helper.o
$(SOCKET_WRAPPER_OBJ) $(LIB_FLAGS)
+ $(WRAPPER) $(CC) $(CFLAGS) -o $@ server/ctdb_event_helper.o
$(REPLACE_OBJ) $(SOCKET_WRAPPER_OBJ) $(LIB_FLAGS)
bin/smnotify: utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o
utils/smnotify/smnotify.o $(POPT_OBJ)
@echo Linking $@
@@ -315,6 +315,7 @@ distclean: clean
rm -rf bin
rm -f config.log config.status config.cache config.h
rm -f Makefile
+ rm -f $(CTDB_VERSION_H)
install: all manpages $(PMDA_INSTALL)
mkdir -p $(DESTDIR)$(libdir)/pkgconfig
diff --git a/common/ctdb_util.c b/common/ctdb_util.c
index 44eb0db..fd0d7da 100644
--- a/common/ctdb_util.c
+++ b/common/ctdb_util.c
@@ -735,7 +735,7 @@ int32_t get_debug_by_desc(const char *desc)
* we'd fail to mmap later on. */
void ctdb_lockdown_memory(struct ctdb_context *ctdb)
{
-#ifdef HAVE_MLOCKALL
+#if defined(HAVE_MLOCKALL) && !defined(_AIX_)
/* Extra stack, please! */
char dummy[10000];
memset(dummy, 0, sizeof(dummy));
@@ -744,11 +744,6 @@ void ctdb_lockdown_memory(struct ctdb_context *ctdb)
return;
}
- /* TODO: Add a command line option to disable memory lockdown.
- * This can be a performance issue on AIX since fork() copies
- * all locked memory pages.
- */
-
/* Ignore when running in local daemons mode */
if (getuid() != 0) {
return;
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index ba34e8b..5c8eb05 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -2899,6 +2899,11 @@ int32_t ctdb_control_tcp_client(struct ctdb_context
*ctdb, uint32_t client_id,
struct ctdb_vnn *vnn;
ctdb_sock_addr addr;
+ /* If we don't have public IPs, tickles are useless */
+ if (ctdb->vnn == NULL) {
+ return 0;
+ }
+
switch (indata.dsize) {
case sizeof(struct ctdb_control_tcp):
old_addr = (struct ctdb_control_tcp *)indata.dptr;
@@ -3043,6 +3048,11 @@ int32_t ctdb_control_tcp_add(struct ctdb_context *ctdb,
TDB_DATA indata, bool tc
struct ctdb_tcp_connection tcp;
struct ctdb_vnn *vnn;
+ /* If we don't have public IPs, tickles are useless */
+ if (ctdb->vnn == NULL) {
+ return 0;
+ }
+
vnn = find_public_ip_vnn(ctdb, &p->dst_addr);
if (vnn == NULL) {
DEBUG(DEBUG_INFO,(__location__ " got TCP_ADD control for an
address which is not a public address '%s'\n",
@@ -3180,6 +3190,11 @@ int32_t ctdb_control_tcp_remove(struct ctdb_context
*ctdb, TDB_DATA indata)
{
struct ctdb_tcp_connection *conn = (struct ctdb_tcp_connection
*)indata.dptr;
+ /* If we don't have public IPs, tickles are useless */
+ if (ctdb->vnn == NULL) {
+ return 0;
+ }
+
ctdb_remove_tcp_connection(ctdb, conn);
return 0;
--
CTDB repository
