[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via bdb80ae s3:smbd:smb2: fix segfault (access after free) in durable
disconnect code
from 2cf83f7 samba_upgradeprovision: Use tdb_util.tdb_copy not
shutil.copy2
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit bdb80aeb11d5458e281483a5cdc57f5481979cc9
Author: Michael Adam ob...@samba.org
Date: Mon Feb 18 23:21:24 2013 +0100
s3:smbd:smb2: fix segfault (access after free) in durable disconnect code
Pair-Programmed-With: Stefan Metzmacher me...@samba.org
Signed-off-by: Michael Adam ob...@samba.org
Signed-off-by: Stefan Metzmacher me...@samba.org
Autobuild-User(master): Michael Adam ob...@samba.org
Autobuild-Date(master): Tue Feb 19 11:12:01 CET 2013 on sn-devel-104
---
Summary of changes:
source3/smbd/close.c|1 +
source3/smbd/smbXsrv_open.c |1 +
2 files changed, 2 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index df3ae23..d0c843e 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -782,6 +782,7 @@ static NTSTATUS close_normal_file(struct smb_request *req,
files_struct *fsp,
data_blob_free(fsp-op-global-backend_cookie);
fsp-op-global-backend_cookie = new_cookie;
+ fsp-op-compat = NULL;
tmp = smbXsrv_open_close(fsp-op, now);
if (!NT_STATUS_IS_OK(tmp)) {
DEBUG(1, (Failed to update smbXsrv_open
diff --git a/source3/smbd/smbXsrv_open.c b/source3/smbd/smbXsrv_open.c
index c1754e8..be39cbc 100644
--- a/source3/smbd/smbXsrv_open.c
+++ b/source3/smbd/smbXsrv_open.c
@@ -1078,6 +1078,7 @@ NTSTATUS smbXsrv_open_close(struct smbXsrv_open *op,
NTTIME now)
op-db_rec = NULL;
if (op-compat) {
+ op-compat-op = NULL;
file_free(NULL, op-compat);
op-compat = NULL;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 5ab7725 s3:net: new implementation of servid wipedbs with
smbXsrv_*
via d8dd0ec lib/util_tdb: factor out tdb_data_talloc_copy()
via d23f19a s3:smbXsrv_open: add smbXsrv_open_global_traverse()
via 60721a3 s3:smbXsrv_tcon: pass record in
smbXsrv_tcon_global_traverse()
via 93e22bb s3:smbXsrv_session: pass record in
smbXsrv_session_global_traverse()
from bdb80ae s3:smbd:smb2: fix segfault (access after free) in durable
disconnect code
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5ab77259746ef3811a64f6c7880ae2263d512c16
Author: Gregor Beck gb...@sernet.de
Date: Thu Dec 13 13:00:28 2012 +0100
s3:net: new implementation of servid wipedbs with smbXsrv_*
Signed-off-by: Gregor Beck gb...@sernet.de
Reviewed-by: Michael Adam ob...@samba.org
Reviewed-by: Stefan Metzmacher me...@samba.org
Autobuild-User(master): Michael Adam ob...@samba.org
Autobuild-Date(master): Tue Feb 19 13:56:57 CET 2013 on sn-devel-104
commit d8dd0ecc484ccc0c3450c3e96725e56e8bf1a9ef
Author: Gregor Beck gb...@sernet.de
Date: Thu Jan 10 11:09:09 2013 +0100
lib/util_tdb: factor out tdb_data_talloc_copy()
Signed-off-by: Gregor Beck gb...@sernet.de
Reviewed-by: Michael Adam ob...@samba.org
Reviewed-by: Stefan Metzmacher me...@samba.org
commit d23f19ab00314d773edb07a45e754365db378668
Author: Gregor Beck gb...@sernet.de
Date: Wed Dec 12 16:06:50 2012 +0100
s3:smbXsrv_open: add smbXsrv_open_global_traverse()
Signed-off-by: Gregor Beck gb...@sernet.de
Reviewed-by: Michael Adam ob...@samba.org
Reviewed-by: Stefan Metzmacher me...@samba.org
commit 60721a378240cb08e3f2ac0a1de14df5c9130010
Author: Gregor Beck gb...@sernet.de
Date: Thu Dec 13 15:27:07 2012 +0100
s3:smbXsrv_tcon: pass record in smbXsrv_tcon_global_traverse()
Signed-off-by: Gregor Beck gb...@sernet.de
Reviewed-by: Michael Adam ob...@samba.org
Reviewed-by: Stefan Metzmacher me...@samba.org
commit 93e22bb1c401b423b0242e6923b8e7944f793b3f
Author: Gregor Beck gb...@sernet.de
Date: Thu Dec 13 15:26:49 2012 +0100
s3:smbXsrv_session: pass record in smbXsrv_session_global_traverse()
Signed-off-by: Gregor Beck gb...@sernet.de
Reviewed-by: Michael Adam ob...@samba.org
Reviewed-by: Stefan Metzmacher me...@samba.org
---
Summary of changes:
lib/util/util_tdb.c | 15 +
lib/util/util_tdb.h |1 +
source3/smbd/globals.h |4 +
source3/smbd/smbXsrv_open.c | 73 +
source3/smbd/smbXsrv_session.c |1 +
source3/smbd/smbXsrv_tcon.c |1 +
source3/utils/net_idmap_check.c | 23 +--
source3/utils/net_serverid.c| 566 ++-
8 files changed, 663 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/util_tdb.c b/lib/util/util_tdb.c
index c005c82..93df958 100644
--- a/lib/util/util_tdb.c
+++ b/lib/util/util_tdb.c
@@ -63,6 +63,21 @@ TDB_DATA string_term_tdb_data(const char *string)
return make_tdb_data((const uint8_t *)string, string ? strlen(string) +
1 : 0);
}
+TDB_DATA tdb_data_talloc_copy(TALLOC_CTX* mem_ctx, TDB_DATA data) {
+ TDB_DATA ret = {
+ .dptr = (uint8_t *)talloc_size(mem_ctx, data.dsize+1),
+ .dsize = data.dsize
+ };
+ if (ret.dptr == NULL) {
+ ret.dsize = 0;
+ } else {
+ memcpy(ret.dptr, data.dptr, data.dsize);
+ ret.dptr[ret.dsize] = '\0';
+ }
+ return ret;
+}
+
+
/
Lock a chain by string. Return non-zero if lock failed.
/
diff --git a/lib/util/util_tdb.h b/lib/util/util_tdb.h
index d8a2333..630bdf6 100644
--- a/lib/util/util_tdb.h
+++ b/lib/util/util_tdb.h
@@ -30,6 +30,7 @@ bool tdb_data_equal(TDB_DATA t1, TDB_DATA t2);
bool tdb_data_is_empty(TDB_DATA d);
TDB_DATA string_tdb_data(const char *string);
TDB_DATA string_term_tdb_data(const char *string);
+TDB_DATA tdb_data_talloc_copy(TALLOC_CTX* mem_ctx, TDB_DATA data);
/
Lock a chain by string. Return non-zero if lock failed.
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 6ead962..90e9ab4 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -457,6 +457,10 @@ NTSTATUS smb2srv_open_recreate(struct smbXsrv_connection
*conn,
struct GUID create_guid,
NTTIME now,
struct smbXsrv_open **_open);
+struct smbXsrv_open_global0;
+NTSTATUS smbXsrv_open_global_traverse(
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 31e4d6d s3:smbd: preserve file type mode bits in file_set_dosmode() via f211b57 gencache: fix an extra newline in a DEBUG message in gencache_set_data_blob() via 86d78df gencache: fix an extra newline in a DEBUG message in gencache_iterate_fn() via f7525ab gencache: fix an extra newline in a DEBUG message in gencache_iterate_blobs_fn() via 762dd3c lib/util/time: strip a potential trailing newline in the asctime case. via 4d3928a gencache: unify a DEBUG message in gencache_set_data_blob() via 56ee82e gencache: unify a DEBUG message in gencache_iterate_fn() via ddf2aa3 gencache: unify a DEBUG message in gencache_iterate_blobs_fn() via 7e36b1b gencache: unify a DEBUG message in gencache_del() via c1d58f2 packaging(RHEL-CTDB): remove unpackaged manpages (samba and samba-tool) via ed28246 packaging(RHEL-CTDB): package the fake-acls vfs module from 5ab7725 s3:net: new implementation of servid wipedbs with smbXsrv_* http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 31e4d6d2c7779e2f688352f5947e6bbd2a1cfc60 Author: Michael Adam ob...@samba.org Date: Tue Feb 19 13:27:10 2013 +0100 s3:smbd: preserve file type mode bits in file_set_dosmode() When translating between dos modes and unix modes, these bits were dropped from the stat-st_ex_mode field. Pair-Programmed-With: Stefan Metzmacher me...@samba.org Signed-off-by: Michael Adam ob...@samba.org Signed-off-by: Stefan Metzmacher me...@samba.org Autobuild-User(master): Michael Adam ob...@samba.org Autobuild-Date(master): Tue Feb 19 15:45:31 CET 2013 on sn-devel-104 commit f211b57dd28e5aab69480f9e9764864922f988e4 Author: Michael Adam ob...@samba.org Date: Wed Feb 13 09:46:33 2013 +0100 gencache: fix an extra newline in a DEBUG message in gencache_set_data_blob() by using timestring() instead of ctime() Signed-off-by: Michael Adam ob...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit 86d78dfa838e8f4432d0ba73828b1f9bfc7877b8 Author: Michael Adam ob...@samba.org Date: Wed Feb 13 09:45:09 2013 +0100 gencache: fix an extra newline in a DEBUG message in gencache_iterate_fn() by using timestring() instead of ctime() Signed-off-by: Michael Adam ob...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit f7525abf3bc561a2b783523ef82520954c4e9d84 Author: Michael Adam ob...@samba.org Date: Wed Feb 13 09:43:19 2013 +0100 gencache: fix an extra newline in a DEBUG message in gencache_iterate_blobs_fn() by using timestring() instead of ctime() Signed-off-by: Michael Adam ob...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit 762dd3cf29788a9f8ab66fd96ad2b9cc20f621f3 Author: Michael Adam ob...@samba.org Date: Wed Feb 13 16:51:54 2013 +0100 lib/util/time: strip a potential trailing newline in the asctime case. If strftime() is not available, asctime() is used, and this usually appends a newline character to the result. This is not desired for timestamp(). Signed-off-by: Michael Adam ob...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit 4d3928a8f494661764f4a3367b2f1b94772dedf9 Author: Michael Adam ob...@samba.org Date: Mon Feb 11 13:41:12 2013 +0100 gencache: unify a DEBUG message in gencache_set_data_blob() Signed-off-by: Michael Adam ob...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit 56ee82e8a04a631ec4cee4e3f9a30f9104ca43c7 Author: Michael Adam ob...@samba.org Date: Mon Feb 11 13:42:58 2013 +0100 gencache: unify a DEBUG message in gencache_iterate_fn() Signed-off-by: Michael Adam ob...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit ddf2aa3340168361ba1680c05f07becaf4b25012 Author: Michael Adam ob...@samba.org Date: Mon Feb 11 13:42:28 2013 +0100 gencache: unify a DEBUG message in gencache_iterate_blobs_fn() Signed-off-by: Michael Adam ob...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit 7e36b1b8cbca1b3bcf3081928a453de581cf1977 Author: Michael Adam ob...@samba.org Date: Mon Feb 11 13:43:32 2013 +0100 gencache: unify a DEBUG message in gencache_del() Signed-off-by: Michael Adam ob...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit c1d58f222fec4b23a1e37a4e911a648afa4fdb74 Author: Michael Adam ob...@samba.org Date: Thu Oct 25 05:35:50 2012 -0400 packaging(RHEL-CTDB): remove unpackaged manpages (samba and samba-tool) Signed-off-by: Michael Adam ob...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit ed28246c2501ad1163aa979d41eba9fbf52010f5 Author: Michael Adam ob...@samba.org Date: Thu Oct 25 05:34:23 2012 -0400 packaging(RHEL-CTDB):
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 432dde0 s3:build fix the build with --fake-kaserver via e7f66f3 s3:lib/afs fix the build from a7fdd4f tdb: Slightly simplify transaction_write http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 432dde0223d884b7de1a9d3c0655304efbcf1f88 Author: Christian Ambach a...@samba.org Date: Mon Feb 18 17:34:25 2013 +0100 s3:build fix the build with --fake-kaserver this fixes Bug 9643 - Build in source3 of bin/net fails when configure option --with-fake-kaserver is used Bug: https://bugzilla.samba.org/show_bug.cgi?id=9643 Signed-off-by: Christian Ambach a...@samba.org Reviewed-by: Volker Lendecke v...@samba.org Autobuild-User(master): Volker Lendecke v...@samba.org Autobuild-Date(master): Tue Feb 19 19:15:19 CET 2013 on sn-devel-104 commit e7f66f37a62ad954e8b0a048905f0e6688b70849 Author: Christian Ambach a...@samba.org Date: Mon Feb 18 16:55:30 2013 +0100 s3:lib/afs fix the build Fix Bug 9644 - Compile of source3/lib/afs.c fails Bug: https://bugzilla.samba.org/show_bug.cgi?id=9644 Signed-off-by: Christian Ambach a...@samba.org Reviewed-by: Volker Lendecke v...@samba.org --- Summary of changes: source3/Makefile.in |2 +- source3/lib/afs.c |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index 35199e9..651d286 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1241,7 +1241,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \ NET_OBJ2 = utils/net_registry_util.o utils/net_help_common.o NET_OBJ = $(NET_OBJ1) \ - $(NET_OBJ2) \ + $(NET_OBJ2) @FAKE_KASERVER_OBJ@ \ $(LIBADDNS_OBJ0) \ $(READLINE_OBJ) \ $(LIBGPO_OBJ) $(INIPARSER_OBJ) $(DISPLAY_SEC_OBJ) \ diff --git a/source3/lib/afs.c b/source3/lib/afs.c index 4b6e6ec..2d77526 100644 --- a/source3/lib/afs.c +++ b/source3/lib/afs.c @@ -237,7 +237,7 @@ bool afs_login(connection_struct *conn) } afs_username = talloc_sub_advanced(ctx, - lp_servicename(SNUM(conn)), + lp_servicename(ctx, SNUM(conn)), conn-session_info-unix_info-unix_name, conn-connectpath, conn-session_info-unix_token-gid, -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via ff8ba06 build/autoconf: fix check for GNU ld version
from 432dde0 s3:build fix the build with --fake-kaserver
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ff8ba0628f6f13a5be1df94e5ac2e83008b7c69c
Author: Björn Jacke b...@sernet.de
Date: Tue Feb 19 15:30:34 2013 +0100
build/autoconf: fix check for GNU ld version
we need to look for the version once in the stdout and once in the stderr
output. Some version of ld output to stdout, some output to stderr.
redirecting
stderr to stdout messes the output up in our case, that's why we have to do
two
runs. See also bug #7825.
Signed-off-by: Bjoern Jacke b...@sernet.de
Reviewed-by: Stefan Metzmacher me...@samba.org
Autobuild-User(master): Björn Jacke b...@sernet.de
Autobuild-Date(master): Tue Feb 19 20:56:12 CET 2013 on sn-devel-104
---
Summary of changes:
source3/configure.in |6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/configure.in b/source3/configure.in
index 1b24ad6..594f4b9 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -227,7 +227,11 @@ dnl Certain versions of GNU ld the default is not to have
the
dnl --allow-shlib-undefined flag defined. This causes a stackload of
dnl warnings when building modules.
if test $ac_cv_prog_gnu_ld = yes; then
- ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 21 /dev/null | grep GNU
ld`
+ ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2 /dev/null /dev/null |
grep GNU ld`
+ # we need to make a 2nd (separate!) check on the output of stderr, see
bug #7825:
+ if test -z ${ac_cv_gnu_ld_version} ; then
+ ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 21 /dev/null
/dev/null | grep GNU ld`
+ fi
AC_MSG_CHECKING(GNU ld release date)
changequote(,)dnl
ac_cv_gnu_ld_date=`echo $ac_cv_gnu_ld_version | sed -n
's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
--
Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-2.1-29-g4f71dca
The branch, master has been updated
via 4f71dca8df19a63f198e2d6d59e605b49ec5e803 (commit)
via f505020a5720faa4ecc6414e0bfaa6b3c0e47291 (commit)
via a73bb56991b8c07ed0e9517ffcf0dc264be30487 (commit)
from d788bc8f7212b7dc1587ae592242dc8c876f4053 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit 4f71dca8df19a63f198e2d6d59e605b49ec5e803
Author: Martin Schwenke mar...@meltin.net
Date: Mon Feb 18 16:39:00 2013 +1100
recoverd: update_capabilities() should use connected nodes
... as the comment says... not just active nodes.
Signed-off-by: Martin Schwenke mar...@meltin.net
Pair-programmed-with: Amitay Isaacs ami...@gmail.com
commit f505020a5720faa4ecc6414e0bfaa6b3c0e47291
Author: Martin Schwenke mar...@meltin.net
Date: Tue Feb 19 14:30:50 2013 +1100
client: Refactor node listing functions to use list_of_nodes()
This reduces repetition.
Signed-off-by: Martin Schwenke mar...@meltin.net
Pair-programmed-with: Amitay Isaacs ami...@gmail.com
commit a73bb56991b8c07ed0e9517ffcf0dc264be30487
Author: Martin Schwenke mar...@meltin.net
Date: Tue Feb 19 14:29:06 2013 +1100
client: New generic node listing function list_of_nodes()
Signed-off-by: Martin Schwenke mar...@meltin.net
Pair-programmed-with: Amitay Isaacs ami...@gmail.com
---
Summary of changes:
client/ctdb_client.c | 86 +--
include/ctdb_client.h |5 +++
server/ctdb_recoverd.c |2 +-
3 files changed, 30 insertions(+), 63 deletions(-)
Changeset truncated at 500 lines:
diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index d7c3031..d2cf0f6 100644
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -3451,19 +3451,23 @@ uint32_t *list_of_vnnmap_nodes(struct ctdb_context
*ctdb,
return nodes;
}
-uint32_t *list_of_active_nodes(struct ctdb_context *ctdb,
- struct ctdb_node_map *node_map,
- TALLOC_CTX *mem_ctx,
- bool include_self)
+/* Get list of nodes not including those with flags specified by mask.
+ * If exclude_pnn is not -1 then exclude that pnn from the list.
+ */
+uint32_t *list_of_nodes(struct ctdb_context *ctdb,
+ struct ctdb_node_map *node_map,
+ TALLOC_CTX *mem_ctx,
+ uint32_t mask,
+ int exclude_pnn)
{
int i, j, num_nodes;
uint32_t *nodes;
for (i=num_nodes=0;inode_map-num;i++) {
- if (node_map-nodes[i].flags NODE_FLAGS_INACTIVE) {
+ if (node_map-nodes[i].flags mask) {
continue;
}
- if (node_map-nodes[i].pnn == ctdb-pnn !include_self) {
+ if (node_map-nodes[i].pnn == exclude_pnn) {
continue;
}
num_nodes++;
@@ -3473,10 +3477,10 @@ uint32_t *list_of_active_nodes(struct ctdb_context
*ctdb,
CTDB_NO_MEMORY_FATAL(ctdb, nodes);
for (i=j=0;inode_map-num;i++) {
- if (node_map-nodes[i].flags NODE_FLAGS_INACTIVE) {
+ if (node_map-nodes[i].flags mask) {
continue;
}
- if (node_map-nodes[i].pnn == ctdb-pnn !include_self) {
+ if (node_map-nodes[i].pnn == exclude_pnn) {
continue;
}
nodes[j++] = node_map-nodes[i].pnn;
@@ -3485,38 +3489,21 @@ uint32_t *list_of_active_nodes(struct ctdb_context
*ctdb,
return nodes;
}
+uint32_t *list_of_active_nodes(struct ctdb_context *ctdb,
+ struct ctdb_node_map *node_map,
+ TALLOC_CTX *mem_ctx,
+ bool include_self)
+{
+ return list_of_nodes(ctdb, node_map, mem_ctx, NODE_FLAGS_INACTIVE,
+include_self ? -1 : ctdb-pnn);
+}
+
uint32_t *list_of_active_nodes_except_pnn(struct ctdb_context *ctdb,
struct ctdb_node_map *node_map,
TALLOC_CTX *mem_ctx,
uint32_t pnn)
{
- int i, j, num_nodes;
- uint32_t *nodes;
-
- for (i=num_nodes=0;inode_map-num;i++) {
- if (node_map-nodes[i].flags NODE_FLAGS_INACTIVE) {
- continue;
- }
- if (node_map-nodes[i].pnn == pnn) {
- continue;
- }
- num_nodes++;
- }
-
- nodes = talloc_array(mem_ctx, uint32_t, num_nodes);
- CTDB_NO_MEMORY_FATAL(ctdb, nodes);
-
- for (i=j=0;inode_map-num;i++) {
- if (node_map-nodes[i].flags NODE_FLAGS_INACTIVE) {
-
[SCM] CTDB repository - annotated tag ctdb-1.2.39-7 created - ctdb-1.2.39-7
The annotated tag, ctdb-1.2.39-7 has been created at 09046ea2675b187b95c6e604952bafb629e6c4bd (tag) tagging 12c9737e00f548599ea88b644b625be72466bb8b (commit) replaces ctdb-1.9.1 tagged by Amitay Isaacs on Wed Dec 5 11:32:26 2012 +1100 - Log - new version 1.2.39-7 Amitay Isaacs (7): New version 1.2.39-4 Revert Add a tunable variable to control how long we defer after a ctdb addip until we force a rebalance and try to failback addresses onto this node Revert When adding ips to nodes, set up a deferred rebalance for the whole node to trigger after 60 seconds in case the normal ipreallocated is not sufficient to trigger rebalance. New version 1.2.39-5 daemon: Do not ignore timed out monitor events recoverd: Track the nodes that fail takeover run and set culprit count New version 1.2.39-7 Andrew Tridgell (1): tdb: added TDB_NO_FSYNC env variable Chandra Seetharaman (1): make changes to ctdb event scripts to support NFS-Ganesha. Christian Ambach (1): improve timing issue detections David Disseldorp (1): io: Make queue_io_read() safe for reentry Evan Kinney (1): ctdb: Fixed use of reserved word private in typedefs Gregor Beck (4): ctdb catdb: fix escaping of '' and '\' add ltdbtool - a standalone ltdb tool ltdbtool: add manpage ltdbtool: add manpage html + roff Günther Deschner (1): lib/tdb: fix c++ build warning in tdb_header_hash(). Harald Klatte (1): AIX bind wants the correct addrsize Jelmer Vernooij (3): pytdb: Make filename argument optional. pytdb: Include Python.h first to prevent warning. pytdb: Add __version__ attribute. Kirill Smelkov (9): pytdb: Add support for tdb_add_flags() tdb_remove_flags() pytdb: Fix repr segfault for internal db pytdb: Update open flags to match those for tdb_open() in tdb.h pytdb: Add support for tdb_enable_seqnum, tdb_get_seqnum and tdb_increment_seqnum_nonblock pytdb: Add support for tdb_transaction_prepare_commit() pytdb: Add support for tdb_freelist_size() pytdb: Add TDB_INCOMPATIBLE_HASH open flag pytdb: Add support for tdb_repack() pytdb: Check errors after PyObject_New() calls Martin Schwenke (89): Test suite: handle change to disconnected node error message. Test suite: handle extra lines in statistics output. Optimise 61.nfstickle to write the tickles more efficiently. Testing: Add Python IP allocation simulation. Test suite: handle change to disconnected node error message. Test suite: handle extra lines in statistics output. Optimise 61.nfstickle to write the tickles more efficiently. Testing: Add Python IP allocation simulation. Merge branch 'master' of git://git.samba.org/sahlberg/ctdb Testing: Add imbalance information to IP allocation simulation. Testing: In IP allocation simulation count total number of events. Testing: IP allocation simulation prints final imbalance in statistics. Testing: IP allocation simulation - save some warnings for verbose mode. Testing: IP allocation simulation - add command line option for random seed. Testing: IP allocation simulation - update copyright message. Testing: IP allocation simulation - Tweak options handling and Cluster.diff(). Testing: IP allocation simulation - fix nondeterminism in do_something_random(). Testing: IP allocation simulation - Update README. Testing: IP allocation simulation - update options processing in examples. Testing: IP allocation simulation - add general node group example. Testing: IP allocation simulation - rename an example to node_group_simple.py. Testing: IP allocation simulation - rename an example to node_group_extra.py. Testing: IP allocation simulation - make usage/failure more obvious. Testing: IP allocation simulation - improve help for options. Testing: IP allocation simulation - print maximum number of unhealthy nodes. Testing: IP allocation simulation - clean up usage message. Testing: IP allocation simulation - add option to change odds of a failure. Test suite - try to make addip test more reliable and add some debugging. Merge remote branch 'martins/master' Test suite - fix addip test. Test suite: remove thaw/freeze tests. Test suite - make the ctdb_fetch test cope with Reqid wrap! messages. initscript: wait until we can ping ctdbd before setting tunables. Test suite: weaken ctdb continue/enable tests for non-deterministic IPs. Test suite: Fix typo in continue test. Test suite: remove unnecessary verbosity from enable/continue tests. Add some command-line options to ctdb_diagnostics. Test suite: make addip test use $CTDB rather than ctdb in debug code. Test
[SCM] CTDB repository - branch 1.2.39 updated - ctdb-1.2.39-7-3-ga1c04ba
The branch, 1.2.39 has been updated
via a1c04ba95aa21837b8388f91480122e3349d3e92 (commit)
via c270381ee81903ff459a8b23fd57c997d038cf14 (commit)
via 61ac25e266d101c1ac979a4f3c765d4536cd7ccb (commit)
from 12c9737e00f548599ea88b644b625be72466bb8b (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2.39
- Log -
commit a1c04ba95aa21837b8388f91480122e3349d3e92
Author: Martin Schwenke mar...@meltin.net
Date: Wed Feb 20 15:53:17 2013 +1100
New version 1.2.39-8
Signed-off-by: Martin Schwenke mar...@meltin.net
commit c270381ee81903ff459a8b23fd57c997d038cf14
Author: Martin Schwenke mar...@meltin.net
Date: Mon Feb 18 16:32:14 2013 +1100
recoverd: Do not send ipreallocated event to stopped nodes
Stopped nodes will reject ipreallocated because they are in
recovery, so they will eventually be banned.
Signed-off-by: Martin Schwenke mar...@meltin.net
Pair-programmed-with: Amitay Isaacs ami...@gmail.com
commit 61ac25e266d101c1ac979a4f3c765d4536cd7ccb
Author: Martin Schwenke mar...@meltin.net
Date: Tue Feb 19 14:29:06 2013 +1100
client: New generic node listing function list_of_nodes()
Signed-off-by: Martin Schwenke mar...@meltin.net
Pair-programmed-with: Amitay Isaacs ami...@gmail.com
Cherry-pick-from: a73bb56991b8c07ed0e9517ffcf0dc264be30487
---
Summary of changes:
client/ctdb_client.c | 38 ++
include/ctdb_client.h |5 +
packaging/RPM/ctdb.spec.in |4 +++-
server/ctdb_takeover.c | 13 ++---
4 files changed, 56 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index 5e06604..7e2dd4a 100644
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -3176,6 +3176,44 @@ uint32_t *list_of_vnnmap_nodes(struct ctdb_context *ctdb,
return nodes;
}
+/* Get list of nodes not including those with flags specified by mask.
+ * If exclude_pnn is not -1 then exclude that pnn from the list.
+ */
+uint32_t *list_of_nodes(struct ctdb_context *ctdb,
+ struct ctdb_node_map *node_map,
+ TALLOC_CTX *mem_ctx,
+ uint32_t mask,
+ int exclude_pnn)
+{
+ int i, j, num_nodes;
+ uint32_t *nodes;
+
+ for (i=num_nodes=0;inode_map-num;i++) {
+ if (node_map-nodes[i].flags mask) {
+ continue;
+ }
+ if (node_map-nodes[i].pnn == exclude_pnn) {
+ continue;
+ }
+ num_nodes++;
+ }
+
+ nodes = talloc_array(mem_ctx, uint32_t, num_nodes);
+ CTDB_NO_MEMORY_FATAL(ctdb, nodes);
+
+ for (i=j=0;inode_map-num;i++) {
+ if (node_map-nodes[i].flags mask) {
+ continue;
+ }
+ if (node_map-nodes[i].pnn == exclude_pnn) {
+ continue;
+ }
+ nodes[j++] = node_map-nodes[i].pnn;
+ }
+
+ return nodes;
+}
+
uint32_t *list_of_active_nodes(struct ctdb_context *ctdb,
struct ctdb_node_map *node_map,
TALLOC_CTX *mem_ctx,
diff --git a/include/ctdb_client.h b/include/ctdb_client.h
index 3dc115f..9498791 100644
--- a/include/ctdb_client.h
+++ b/include/ctdb_client.h
@@ -486,6 +486,11 @@ int ctdb_ctrl_setreclock(struct ctdb_context *ctdb,
const char *reclock);
+uint32_t *list_of_nodes(struct ctdb_context *ctdb,
+ struct ctdb_node_map *node_map,
+ TALLOC_CTX *mem_ctx,
+ uint32_t mask,
+ int exclude_pnn);
uint32_t *list_of_connected_nodes(struct ctdb_context *ctdb,
struct ctdb_node_map *node_map,
TALLOC_CTX *mem_ctx,
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 5165c5c..1d9781d 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -4,7 +4,7 @@ Summary: Clustered TDB
Vendor: Samba Team
Packager: Samba Team sa...@samba.org
Version: 1.2.39
-Release: 7GITHASH
+Release: 8GITHASH
Epoch: 0
License: GNU GPL version 3
Group: System Environment/Daemons
@@ -144,6 +144,8 @@ development libraries for ctdb
%{_libdir}/libctdb.a
%changelog
+* Wed Feb 20 2013 : version 1.2.39-8
+ - Don't send ipreallocate events to stopped nodes
* Fri Nov 30 2012 : version 1.2.39-7
- Do not ignore timed out monitor events
- Track the nodes that fail takeover run and set culprit count
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index e17b481..1e8dc75 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -2074,11 +2074,18 @@ int
[SCM] CTDB repository - annotated tag ctdb-1.2.39-8 created - ctdb-1.2.39-8
The annotated tag, ctdb-1.2.39-8 has been created at ffaede0198a519f8ab3c0c0f03458edf9f1d08eb (tag) tagging a1c04ba95aa21837b8388f91480122e3349d3e92 (commit) replaces ctdb-1.2.39-7 tagged by Martin Schwenke on Wed Feb 20 15:57:31 2013 +1100 - Log - new version 1.2.39-8 Martin Schwenke (3): client: New generic node listing function list_of_nodes() recoverd: Do not send ipreallocated event to stopped nodes New version 1.2.39-8 --- -- CTDB repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 2f4b21b ntdb: switch between secrets.tdb and secrets.ntdb depending
on 'use ntdb'
via 3c9c302 param: 'use ntdb' flag (off by default).
via e201033 tdb_wrap: prevent tdbs called .ntdb or without extensions.
via 53aac0b dbwrap_local_open: never open the .tdb if there is an .ntdb
via f3c0d1d dbwrap_local_open: open NTDB if extension is .ntdb
via 48a4270 source3: explicitly disable NTDB support.
via 63a6381 dbwrap: dbwrap_ntdb.c
via 3d82f78 ntdb: fix database corruption when transaction doesn't
change anything.
from 85b6329 s3:selftest: generate ${SELFTESTPREFIX}/subunit with the
raw output
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2f4b21bb57c4f96c5f5b57a69d022c142d8088d5
Author: Rusty Russell ru...@rustcorp.com.au
Date: Wed Feb 20 14:59:42 2013 +1030
ntdb: switch between secrets.tdb and secrets.ntdb depending on 'use ntdb'
Since we open with dbwrap, it auto-converts old tdbs (which it will
rename to secrets.tdb.bak once it's done).
Signed-off-by: Rusty Russell ru...@rustcorp.com.au
Reviewed-by: Andrew Bartlett abart...@samba.org
Autobuild-User(master): Rusty Russell ru...@rustcorp.com.au
Autobuild-Date(master): Wed Feb 20 07:09:19 CET 2013 on sn-devel-104
commit 3c9c3029f2bcf10ef614dd9f923d02232db3ac8d
Author: Rusty Russell ru...@rustcorp.com.au
Date: Wed Feb 20 14:59:42 2013 +1030
param: 'use ntdb' flag (off by default).
For simplicity, we use this in the caller to choose between filenames.
Signed-off-by: Rusty Russell ru...@rustcorp.com.au
Reviewed-by: Andrew Bartlett abart...@samba.org
commit e201033e84b54b13acc751db2b67cff159e12a0e
Author: Rusty Russell ru...@rustcorp.com.au
Date: Wed Feb 20 14:59:42 2013 +1030
tdb_wrap: prevent tdbs called .ntdb or without extensions.
This is another belt-and-braces check in case someone decides to turn
on the fancy new .ntdb extension, and we haven't converted it to ntdb.
Signed-off-by: Rusty Russell ru...@rustcorp.com.au
Reviewed-by: Andrew Bartlett abart...@samba.org
commit 53aac0bc9384db68c5ff469b07ae757ca1051cec
Author: Rusty Russell ru...@rustcorp.com.au
Date: Wed Feb 20 14:59:42 2013 +1030
dbwrap_local_open: never open the .tdb if there is an .ntdb
This provides an extra safety check that everyone is using one or the
other: you can't create a tdb file if there's an ntdb file.
Signed-off-by: Rusty Russell ru...@rustcorp.com.au
Reviewed-by: Andrew Bartlett abart...@samba.org
commit f3c0d1d7fe71be7e8b2d1a9780586f8654b46469
Author: Rusty Russell ru...@rustcorp.com.au
Date: Wed Feb 20 14:59:42 2013 +1030
dbwrap_local_open: open NTDB if extension is .ntdb
This switches dbwrap_local_open() based on the extension of the
database name, so it handles both TDB and NTDB files.
Moreover, if asked to open a .ntdb, and there's no ntdb file but
there's a .tdb file, it converts that then moves it to .tdb.bak before
opening, and turn the .tdb file into a dangling symlink to make sure
it's never accidentally re-created or used:
$ ls -l secrets.tdb
lrwxrwxrwx 1 rusty rusty 23 Feb 11 11:31 secrets.tdb - This is now in
an NTDB
This provides transparent upgrade if people decide to use NTDB on a
database. Downgrade would be manual, eg:
ntdbdump foo.ntdb | tdbrestore foo.tdb mv foo.ntdb foo.ntdb.bak
Signed-off-by: Rusty Russell ru...@rustcorp.com.au
Reviewed-by: Andrew Bartlett abart...@samba.org
commit 48a42708aead320bfbcee16ae76d095c014802de
Author: Rusty Russell ru...@rustcorp.com.au
Date: Wed Feb 20 14:59:42 2013 +1030
source3: explicitly disable NTDB support.
The next patch make dbwrap_local_open() call the ntdb backend for ntdb
files, but we don't want to add ntdb support to the old autoconf
build. It's cleaner to use the existing DISABLE_NTDB flag rather than
test for _SAMBA_BUILD_ in dbwrap_local_open.c.
Signed-off-by: Rusty Russell ru...@rustcorp.com.au
Reviewed-by: Andrew Bartlett abart...@samba.org
commit 63a6381a26171f069cdc7465ca753f0b3c5d26f2
Author: Rusty Russell ru...@rustcorp.com.au
Date: Wed Feb 20 14:58:59 2013 +1030
dbwrap: dbwrap_ntdb.c
This is a dbwrap backend for ntdb. It's a fairly straight conversion from
the tdb version.
Signed-off-by: Rusty Russell ru...@rustcorp.com.au
Reviewed-by: Andrew Bartlett abart...@samba.org
commit 3d82f786ecdd6747e90fe480a15de8c3fcea5f7b
Author: Rusty Russell ru...@rustcorp.com.au
Date: Sun Feb 17 20:56:34 2013 +1030
ntdb: fix database corruption when transaction doesn't change anything.
ntdb's transaction code has an optimization which tdb's doesnt: it
only writes the parts of blocks
