[SCM] CTDB repository - branch master updated - ctdb-2.3-41-g5e9b1a7
The branch, master has been updated via 5e9b1a7e24d058ff88aaa0563db36a804e866fa9 (commit) via 867afb247bd8cc86c8d738f051a44cc534cafacf (commit) via 44a64d1c388bfe3c3388b191edfaedecfb7bb831 (commit) via 9cde47e1a5bf1b9ca3b4da8c2db94caac2b1aa5e (commit) via 81d7ce03b28d592a1337639e14d9ea141e20bfff (commit) via d7f6bc3fed2dc61e6e587b4c0ec0ac27d533bbbe (commit) via 9e99e0eb072e2b845914ee3896acbc66b96138d7 (commit) via 44eb86e6042adb6efe75d2a5528b82a0f21d496d (commit) via ebecc3a18f1cb397a78b56eaf8f752dd5495bcc9 (commit) via 68af5405acc123b5a90decd2123e2a02961a8fcf (commit) from 824dcec35ec461d78e22b2ea109473b32bfe3972 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit 5e9b1a7e24d058ff88aaa0563db36a804e866fa9 Author: Amitay Isaacs Date: Mon Aug 5 17:28:47 2013 +1000 common/io: Keep queue buffer size multiple of 4K Currently queue buffer size is realloc'd every time we need to extend the buffer. Small increments can cause memory fragmentation. Instead always extend buffer in multiples of 4K. This should reduce multiple talloc_realloc calls when there are lots of packets in the socket buffer. Also, if queue buffer has grown larger than 64K, throw away the buffer once all the requests in the queue have been processed. That way queue does not hold on to large buffers. Signed-off-by: Amitay Isaacs commit 867afb247bd8cc86c8d738f051a44cc534cafacf Author: Martin Schwenke Date: Fri Jul 26 13:57:03 2013 +1000 packaging: Allow setting custom release number in RPM spec file Signed-off-by: Martin Schwenke Pair-Programmed-With: Amitay Isaacs commit 44a64d1c388bfe3c3388b191edfaedecfb7bb831 Author: Amitay Isaacs Date: Wed Jul 31 15:59:11 2013 +1000 ctdbd: When a record is made sticky, log only once Instead of logging from ctdb_request_call(), log the message from ctdb_make_record_sticky(). That way if the record is already sticky, the message is not repeated unnecessarily. Signed-off-by: Amitay Isaacs commit 9cde47e1a5bf1b9ca3b4da8c2db94caac2b1aa5e Author: Amitay Isaacs Date: Mon Jul 15 17:34:31 2013 +1000 ctdbd: Improve high hopcount log messages when request is redirected Signed-off-by: Amitay Isaacs commit 81d7ce03b28d592a1337639e14d9ea141e20bfff Author: Martin Schwenke Date: Tue Aug 6 16:11:40 2013 +1000 scripts: Do not run ctdb tool commands when debugging hung "init" event CTDB daemon is not ready to accept clients in INIT runstate (init event). CTDB daemon will start accepting connections in SETUP runstate (setup event) and later. Also, minor log formatting changes. Signed-off-by: Martin Schwenke commit d7f6bc3fed2dc61e6e587b4c0ec0ac27d533bbbe Author: Amitay Isaacs Date: Mon Aug 5 17:38:42 2013 +1000 ctdbd: Avoid leaking file descriptor if talloc fails Signed-off-by: Amitay Isaacs commit 9e99e0eb072e2b845914ee3896acbc66b96138d7 Author: Amitay Isaacs Date: Mon Aug 5 14:08:28 2013 +1000 eventscript: Wait for debug hung script to finish or timeout before continuing Currently if the debug hung script takes long time to finish, the subsequent monitor event can collide with the previous event which is not yet finished. Signed-off-by: Amitay Isaacs commit 44eb86e6042adb6efe75d2a5528b82a0f21d496d Author: Amitay Isaacs Date: Fri Aug 2 15:49:06 2013 +1000 eventscripts: Use configured RECLOCK file instead of asking CTDB On cluster where recovery lock file is not being used, asking CTDB daemon is unnecessary overhead. And if CTDB is using recovery file, then changing configuration without restarting is *stupid*. Signed-off-by: Amitay Isaacs Pair-Programmed-With: Martin Schwenke commit ebecc3a18f1cb397a78b56eaf8f752dd5495bcc9 Author: Amitay Isaacs Date: Fri Aug 2 10:54:38 2013 +1000 locking: Do not create multiple lock processes for the same key If there are multiple lock helper processes waiting for the same record, then it will cause a thundering herd when that record has been unlocked. So avoid scheduling lock contexts for the same record. This will also mean that multiple requests will get queued up behind the same lock context and can be processed quickly once the lock has been obtained. Signed-off-by: Amitay Isaacs commit 68af5405acc123b5a90decd2123e2a02961a8fcf Author: Amitay Isaacs Date: Fri Aug 2 10:51:45 2013 +1000 locking: Move function find_lock_context() before ctdb_lock_schedule() So that ctdb_lock_schedule() can call this function without requiring extra prototype declaration. Signed-off-by: Amitay Isaacs --- Summary
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 20b64ea waf: replace dependency to libintl with samba_intl
via 07b3a04 waf: consolidate libintl related checks
via a742e87 waf: add --without-gettext option
via ce8fbdf waf: fix build on AIX7
from 9177a0d libcli/auth: add more const to
spnego_negTokenInit->mechTypes
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 20b64eae75b8809d67b8c2824616996bb4722612
Author: Christian Ambach
Date: Thu Aug 1 23:00:21 2013 +0200
waf: replace dependency to libintl with samba_intl
Signed-off-by: Christian Ambach
Reviewed-by: Andrew Bartlett
Autobuild-User(master): Christian Ambach
Autobuild-Date(master): Mon Aug 12 00:46:34 CEST 2013 on sn-devel-104
commit 07b3a048724a6b41282e1f673aea5ce2c1202a5e
Author: Christian Ambach
Date: Thu Aug 1 22:28:05 2013 +0200
waf: consolidate libintl related checks
consolidate the dealing with functions from libintl and the
handling of checking if libiconv is required or not
to a common place in lib/replace
also add a new samba_intl subsystem that has dependencies
on the appropriate set of libraries (libintl, libintl+libiconv or none)
that can be used as a general dependency by code that depends
on the internationalization libraries
Signed-off-by: Christian Ambach
Reviewed-by: Andrew Bartlett
commit a742e87b39bed97ac59f5ec8bff9bf3cedf8b68a
Author: Christian Ambach
Date: Tue Jun 25 18:37:35 2013 +0200
waf: add --without-gettext option
Signed-off-by: Christian Ambach
Reviewed-by: Andrew Bartlett
commit ce8fbdf76ee2792d011d9da4d0116f04d9656886
Author: Christian Ambach
Date: Thu Jun 20 18:26:04 2013 +0200
waf: fix build on AIX7
the same works for AIX 5,6,7 so leave away the version specifics (as
autoconf build did)
Signed-off-by: Christian Ambach
Reviewed-by: Andrew Bartlett
---
Summary of changes:
buildtools/wafsamba/wscript |5 +++-
lib/replace/wscript | 46 ---
nsswitch/wscript_build |2 +-
source3/wscript |9 +++---
source3/wscript_build |2 +-
source4/heimdal_build/wscript_build |4 +-
source4/heimdal_build/wscript_configure |4 +--
7 files changed, 49 insertions(+), 23 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 17aef27..fe2e515 100755
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -82,6 +82,9 @@ def set_options(opt):
help='additional directory to search for gettext',
action='store', dest='gettext_location',
default='/usr/local',
match = ['Checking for library intl', 'Checking for header
libintl.h'])
+opt.add_option('--without-gettext',
+ help=("Disable use of gettext"),
+ action="store_true", dest='disable_gettext', default=False)
gr = opt.option_group('developer options')
@@ -322,7 +325,7 @@ def configure(conf):
else:
conf.env.HAVE_LD_VERSION_SCRIPT = False
-if sys.platform == "aix5" or sys.platform == "aix6":
+if sys.platform.startswith('aix'):
conf.DEFINE('_ALL_SOURCE', 1, add_to_cflags=True)
# Might not be needed if ALL_SOURCE is defined
# conf.DEFINE('_XOPEN_SOURCE', 600, add_to_cflags=True)
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 2117f56..b6fb10b 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -89,7 +89,7 @@ struct foo bar = { .y = 'X', .x = 1 };
sys/sockio.h sys/un.h''', together=True)
conf.CHECK_HEADERS('sys/uio.h ifaddrs.h direct.h dirent.h')
conf.CHECK_HEADERS('windows.h winsock2.h ws2tcpip.h')
-conf.CHECK_HEADERS('libintl.h errno.h')
+conf.CHECK_HEADERS('errno.h')
conf.CHECK_HEADERS('gcrypt.h getopt.h iconv.h')
conf.CHECK_HEADERS('sys/inotify.h memory.h nss.h sasl/sasl.h')
conf.CHECK_HEADERS('security/pam_appl.h zlib.h asm/unistd.h')
@@ -363,17 +363,41 @@ removeea setea
headers='netinet/in.h arpa/nameser.h resolv.h')
-if not conf.CHECK_FUNCS_IN('gettext', 'intl', checklibc=True,
headers='libintl.h'):
-# Some hosts need lib iconv for linking with lib intl
-# So we try with flags just in case it helps.
-oldflags = conf.env['LDFLAGS_INTL']
-conf.env['LDFLAGS_INTL'] = "-liconv"
-if not conf.CHECK_LIB('intl'):
-conf.env['LDFLAGS_INTL'] = oldflags
+conf.env.intl_libs=''
+if not Options.options.disable_gettext:
+conf.CHECK_HEADERS('libintl.h')
+conf.CHECK_LIB('intl')
+# *textdomain fu
