[SCM] Samba Shared Repository - branch master updated

[Martin Schwenke]

The branch, master has been updated
       via  fb2631f ctdb-daemon: Do not support connection tracking if there are no public IPs
       via  af3a168 ctdb-util: Do not use mlockall() on AIX
       via  44520dc ctdb-build: AIX does not have working C99 vsnprintf, requires libreplace
       via  96203d9 ctdb-build: Remove auto-generated header file in distclean
      from  1b5a6d8 docs-smbdotconf: fix WINBINDD_SOCKET_DIR path in fallback table

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fb2631f5dfd3ec58fd277dbe155afab58f882202
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Tue Feb 11 18:07:08 2014 +1100

    ctdb-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 <amitay at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Tue Mar  4 03:01:38 CET 2014 on sn-devel-104

commit af3a168ed3b0dcac4086d2d90bfdef65590b68dc
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Tue Feb 11 17:57:42 2014 +1100

    ctdb-util: Do not use mlockall() on AIX
    
    Memory lockdown causes recovery daemon to crash on AIX.
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

commit 44520dcefc226ff1a93f77c8c7cf79d1c5244c3a
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Thu Feb 6 16:32:42 2014 +1100

    ctdb-build: AIX does not have working C99 vsnprintf, requires libreplace
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

commit 96203d9126d77c45ee53e6b536720863851a42aa
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Thu Feb 6 16:27:09 2014 +1100

    ctdb-build: Remove auto-generated header file in distclean
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

-----------------------------------------------------------------------

Summary of changes:
 ctdb/Makefile.in            |    5 +++--
 ctdb/common/ctdb_util.c     |    7 +------
 ctdb/server/ctdb_takeover.c |   15 +++++++++++++++
 3 files changed, 19 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index 94904bd..3c9167d 100755
--- a/ctdb/Makefile.in
+++ b/ctdb/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/ctdb/common/ctdb_util.c b/ctdb/common/ctdb_util.c
index 44eb0db..fd0d7da 100644
--- a/ctdb/common/ctdb_util.c
+++ b/ctdb/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/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index fe4f472..34b210e 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -2900,6 +2900,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;
@@ -3044,6 +3049,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",
@@ -3181,6 +3191,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;


-- 
Samba Shared Repository