autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2012-04-02-1027/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-04-02-1027/samba3.stderr http://git.samba.org/autobuild.flakey/2012-04-02-1027/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-04-02-1027/samba4.stderr http://git.samba.org/autobuild.flakey/2012-04-02-1027/samba4.stdout The top commit at the time of the failure was: commit 2c322ca95a7dc4fb8396b475d115f31837316267 Author: Richard Sharpe realrichardsha...@gmail.com Date: Sun Apr 1 13:14:49 2012 -0700 Fix some of the issues that Jelmer identified in my first patch. This might be changed again, especially when I figure out how to return the file as an object. Autobuild-User: Richard Sharpe sha...@samba.org Autobuild-Date: Mon Apr 2 01:43:44 CEST 2012 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 13a4b72 s4-upgradedns: Fix the fqdn for forest dns zone from 2c322ca Fix some of the issues that Jelmer identified in my first patch. This might be changed again, especially when I figure out how to return the file as an object. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 13a4b7284753e7e52bad7dd19aa50327b886d845 Author: Amitay Isaacs ami...@gmail.com Date: Mon Apr 2 17:15:09 2012 +1000 s4-upgradedns: Fix the fqdn for forest dns zone Autobuild-User: Amitay Isaacs ami...@samba.org Autobuild-Date: Mon Apr 2 10:56:10 CEST 2012 on sn-devel-104 --- Summary of changes: source4/scripting/bin/samba_upgradedns |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/bin/samba_upgradedns b/source4/scripting/bin/samba_upgradedns index 86172a7..5a335a9 100755 --- a/source4/scripting/bin/samba_upgradedns +++ b/source4/scripting/bin/samba_upgradedns @@ -345,7 +345,7 @@ if __name__ == '__main__': # Create DNS partitions if missing and fill DNS information try: expression = '(|(dnsRoot=DomainDnsZones.%s)(dnsRoot=ForestDnsZones.%s))' % \ - (dnsdomain, dnsdomain) + (dnsdomain, dnsforest) msg = ldbs.sam.search(base=names.configdn, scope=ldb.SCOPE_DEFAULT, expression=expression, attrs=['nCName']) ncname = msg[0]['nCName'][0] -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 831a97c s3: Notifies should never time out
from 13a4b72 s4-upgradedns: Fix the fqdn for forest dns zone
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 831a97c147c6231397c51500bd44c1c3d3f83f19
Author: Volker Lendecke v...@samba.org
Date: Mon Apr 2 10:50:33 2012 +0200
s3: Notifies should never time out
Autobuild-User: Volker Lendecke v...@samba.org
Autobuild-Date: Mon Apr 2 12:31:17 CEST 2012 on sn-devel-104
---
Summary of changes:
source3/libsmb/clifile.c |8
1 files changed, 8 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 48a0636..1a67bcd 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -4945,6 +4945,7 @@ struct tevent_req *cli_notify_send(TALLOC_CTX *mem_ctx,
{
struct tevent_req *req, *subreq;
struct cli_notify_state *state;
+ unsigned old_timeout;
req = tevent_req_create(mem_ctx, state, struct cli_notify_state);
if (req == NULL) {
@@ -4955,6 +4956,11 @@ struct tevent_req *cli_notify_send(TALLOC_CTX *mem_ctx,
SSVAL(state-setup, 4, fnum);
SSVAL(state-setup, 6, recursive);
+ /*
+* Notifies should not time out
+*/
+ old_timeout = cli_set_timeout(cli, 0);
+
subreq = cli_trans_send(
state, /* mem ctx. */
ev, /* event ctx. */
@@ -4974,6 +4980,8 @@ struct tevent_req *cli_notify_send(TALLOC_CTX *mem_ctx,
0, /* num data. */
0); /* max returned data. */
+ cli_set_timeout(cli, old_timeout);
+
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
--
Samba Shared Repository
Re: wild use of strlcpy() broke ipv6 support
On Sun, Apr 01, 2012 at 01:07:01AM -0700, Matthieu Patou wrote: I'll just tested your patch it's working for local-link ipv6, was too busy today between homedepot and fry's and enjoying this beautifull bay area weather :-) And please can you recheck that you didn't introduced other regression. I did a quick scan and didn't see any other issues. I'm thinking of having one instance of samba in make test with interface + bind interface only combo set so that we can catch this problem in the future. That would be great - thanks !
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via c7a3b8a s4:smb_server/smb2: add missing 'return;' statements in
smb2srv_chain_reply()
via d72641e s4:smb_server/smb2: after smbsrv_terminate_connection() we
have to return
via e01d6f4 s4:smb_server/smb2: fix memory leak in smb2srv_chain_reply()
via dca4e6e s4:smb_server/smb2: use helper variable
smb2srv_chain_reply()
via 6865241 s4:smb_server/smb: remove a request from the list before
adding the next one in a chain.
from 831a97c s3: Notifies should never time out
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c7a3b8ae21523f6af2c3e3fea1a0d3fcf9706d4c
Author: Stefan Metzmacher me...@samba.org
Date: Mon Mar 26 13:50:44 2012 +0200
s4:smb_server/smb2: add missing 'return;' statements in
smb2srv_chain_reply()
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Mon Apr 2 23:02:53 CEST 2012 on sn-devel-104
commit d72641ef769da6cba8fd8422586121c79ad3af42
Author: Stefan Metzmacher me...@samba.org
Date: Mon Mar 26 13:49:36 2012 +0200
s4:smb_server/smb2: after smbsrv_terminate_connection() we have to return
req is a talloc child of the connection...
metze
commit e01d6f4af02160199a014b9ea3e05a56c47f9f1f
Author: Stefan Metzmacher me...@samba.org
Date: Mon Mar 26 13:48:51 2012 +0200
s4:smb_server/smb2: fix memory leak in smb2srv_chain_reply()
metze
commit dca4e6eb6e199e35b50a36ea3861a5d3429f6804
Author: Stefan Metzmacher me...@samba.org
Date: Mon Mar 26 13:47:39 2012 +0200
s4:smb_server/smb2: use helper variable smb2srv_chain_reply()
metze
commit 6865241fdde71c5f7bbe85b3b88cb57ca14578b2
Author: Stefan Metzmacher me...@samba.org
Date: Mon Mar 19 23:52:25 2012 +0100
s4:smb_server/smb: remove a request from the list before adding the next
one in a chain.
metze
---
Summary of changes:
source4/smb_server/smb/receive.c |1 +
source4/smb_server/smb2/receive.c | 19 ---
2 files changed, 13 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/smb_server/smb/receive.c b/source4/smb_server/smb/receive.c
index 8e3bab8..b100757 100644
--- a/source4/smb_server/smb/receive.c
+++ b/source4/smb_server/smb/receive.c
@@ -633,6 +633,7 @@ void smbsrv_chain_reply(struct smbsrv_request *req)
SSVAL(req-out.vwv, VWV(1), req-out.size - NBT_HDR_SIZE);
/* cleanup somestuff for the next request */
+ DLIST_REMOVE(req-smb_conn-requests, req);
talloc_free(req-ntvfs);
req-ntvfs = NULL;
talloc_free(req-io_ptr);
diff --git a/source4/smb_server/smb2/receive.c
b/source4/smb_server/smb2/receive.c
index 141fdd8..3b54c97 100644
--- a/source4/smb_server/smb2/receive.c
+++ b/source4/smb_server/smb2/receive.c
@@ -155,6 +155,7 @@ static NTSTATUS smb2srv_reply(struct smb2srv_request *req);
static void smb2srv_chain_reply(struct smb2srv_request *p_req)
{
NTSTATUS status;
+ struct smbsrv_connection *smb_conn = p_req-smb_conn;
struct smb2srv_request *req;
uint32_t chain_offset;
uint32_t protocol_version;
@@ -163,6 +164,8 @@ static void smb2srv_chain_reply(struct smb2srv_request
*p_req)
uint32_t flags;
uint32_t last_hdr_offset;
+ talloc_steal(req, p_req);
+
last_hdr_offset = p_req-in.hdr - p_req-in.buffer;
chain_offset = p_req-chain_offset;
@@ -171,7 +174,7 @@ static void smb2srv_chain_reply(struct smb2srv_request
*p_req)
if (p_req-in.size (last_hdr_offset + chain_offset +
SMB2_MIN_SIZE_NO_BODY)) {
DEBUG(2,(Invalid SMB2 chained packet at offset 0x%X from last
hdr 0x%X\n,
chain_offset, last_hdr_offset));
- smbsrv_terminate_connection(p_req-smb_conn, Invalid SMB2
chained packet);
+ smbsrv_terminate_connection(smb_conn, Invalid SMB2 chained
packet);
return;
}
@@ -179,13 +182,13 @@ static void smb2srv_chain_reply(struct smb2srv_request
*p_req)
if (protocol_version != SMB2_MAGIC) {
DEBUG(2,(Invalid SMB chained packet: protocol prefix:
0x%08X\n,
protocol_version));
- smbsrv_terminate_connection(p_req-smb_conn, NON-SMB2 chained
packet);
+ smbsrv_terminate_connection(smb_conn, NON-SMB2 chained
packet);
return;
}
- req = smb2srv_init_request(p_req-smb_conn);
+ req = smb2srv_init_request(smb_conn);
if (!req) {
- smbsrv_terminate_connection(p_req-smb_conn, SMB2 chained
packet - no memory);
+ smbsrv_terminate_connection(smb_conn, SMB2 chained packet - no
memory);
return;
}
@@ -206,9 +209,11 @@ static void smb2srv_chain_reply(struct
[SCM] CTDB repository - branch 1.13 updated - ctdb-1.13-70-g0489d75
The branch, 1.13 has been updated
via 0489d75a27b63f3f2e69f18400498e667995738a (commit)
via 2899dd5d400bbfcaddc2b8a0e9a405dca979f6d0 (commit)
from aaec46211b72f7d6886832301eee169d4b6a5f80 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.13
- Log -
commit 0489d75a27b63f3f2e69f18400498e667995738a
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue Apr 3 13:45:22 2012 +1000
New version 1.41
commit 2899dd5d400bbfcaddc2b8a0e9a405dca979f6d0
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue Apr 3 13:43:21 2012 +1000
CTDB: add back the rebalanceip command
---
Summary of changes:
packaging/RPM/ctdb.spec.in |2 +
tools/ctdb.c | 75
2 files changed, 77 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index f9a5cef..8db59d2 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -145,6 +145,8 @@ development libraries for ctdb
%{_libdir}/libctdb.a
%changelog
+* Tue Apr 3 2012 : Version 1.41
+ - add back the rebalanceip command
* Thu Mar 1 2012 : Version 1.13
- This is the new stable branch for modern features for ctdb.
Main new features are performance/scaling improvements for
diff --git a/tools/ctdb.c b/tools/ctdb.c
index d482eab..a56d579 100644
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -1619,6 +1619,80 @@ static int control_rebalancenode(struct ctdb_context
*ctdb, int argc, const char
}
+static int rebalance_ip(struct ctdb_context *ctdb, ctdb_sock_addr *addr)
+{
+ struct ctdb_public_ip ip;
+ int ret;
+ uint32_t *nodes;
+ uint32_t disable_time;
+ TDB_DATA data;
+ struct ctdb_node_map *nodemap=NULL;
+ TALLOC_CTX *tmp_ctx = talloc_new(ctdb);
+
+ disable_time = 30;
+ data.dptr = (uint8_t*)disable_time;
+ data.dsize = sizeof(disable_time);
+ ret = ctdb_client_send_message(ctdb, CTDB_BROADCAST_CONNECTED,
CTDB_SRVID_DISABLE_IP_CHECK, data);
+ if (ret != 0) {
+ DEBUG(DEBUG_ERR,(Failed to send message to disable
ipcheck\n));
+ return -1;
+ }
+
+ ip.pnn = -1;
+ ip.addr = *addr;
+
+ data.dptr = (uint8_t *)ip;
+ data.dsize = sizeof(ip);
+
+ ret = ctdb_ctrl_getnodemap(ctdb, TIMELIMIT(), options.pnn, tmp_ctx,
nodemap);
+ if (ret != 0) {
+ DEBUG(DEBUG_ERR, (Unable to get nodemap from node %u\n,
options.pnn));
+ talloc_free(tmp_ctx);
+ return ret;
+ }
+
+ nodes = list_of_active_nodes(ctdb, nodemap, tmp_ctx, true);
+ ret = ctdb_client_async_control(ctdb, CTDB_CONTROL_RELEASE_IP,
+ nodes, 0,
+ LONGTIMELIMIT(),
+ false, data,
+ NULL, NULL,
+ NULL);
+ if (ret != 0) {
+ DEBUG(DEBUG_ERR,(Failed to release IP on nodes\n));
+ talloc_free(tmp_ctx);
+ return -1;
+ }
+
+ talloc_free(tmp_ctx);
+ return 0;
+}
+
+/*
+ release an ip form all nodes and have it re-assigned by recd
+ */
+static int control_rebalanceip(struct ctdb_context *ctdb, int argc, const char
**argv)
+{
+ ctdb_sock_addr addr;
+
+ if (argc 1) {
+ usage();
+ return -1;
+ }
+
+ if (parse_ip(argv[0], NULL, 0, addr) == 0) {
+ DEBUG(DEBUG_ERR,(Wrongly formed ip address '%s'\n, argv[0]));
+ return -1;
+ }
+
+ if (rebalance_ip(ctdb, addr) != 0) {
+ DEBUG(DEBUG_ERR,(Error when trying to reassign ip\n));
+ return -1;
+ }
+
+ return 0;
+}
+
static int getips_store_callback(void *param, void *data)
{
struct ctdb_public_ip *node_ip = (struct ctdb_public_ip *)data;
@@ -5582,6 +5656,7 @@ static const struct {
{ listnodes, control_listnodes, false, true, list all
nodes in the cluster},
{ reloadnodes, control_reload_nodes_file, false, false, reload
the nodes file and restart the transport on all nodes},
{ moveip, control_moveip,false, false,
move/failover an ip address to another node, ip node},
+ { rebalanceip, control_rebalanceip, false, false, release
an ip from the node and let recd rebalance it, ip},
{ addip, control_addip, true, false, add a
ip address to a node, ip/mask iface},
{ delip, control_delip, false, false, delete
an ip address from a node, ip},
{ eventscript, control_eventscript, true, false, run the
eventscript with
[SCM] CTDB repository - branch master updated - ctdb-1.13-61-g83aea64
The branch, master has been updated
via 83aea6488002aa75dd25752fa0d164afb8b4f300 (commit)
via a2ba2c4ec153c8844cf7f5b0de03b2269ec892f3 (commit)
via 98ac99c4a79fe2ee024890bb27c3ca68dc02d434 (commit)
via 10ab88a5c822ac403a70a9cd1a6c81020eb91d08 (commit)
via 2ade83de4e1f318c91489ec9a7f90d1b26f77e1b (commit)
via 94f1e02406c353c3a0235685acdd107ee5a7f285 (commit)
via 0cbe7a4f92795203f022252a50a240b8bd4238c3 (commit)
via 36e690faab3d76919780c8550fe6d49fb6bbfba5 (commit)
via 45773dab630ee44b39df0dd4b50f43fb1e7bb0ba (commit)
via a9e9444a7a78f5ef0e929a8dbd8ca0c68b40acd4 (commit)
from 00cd75595685dae829758abf1a4cb644af7ed50e (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit 83aea6488002aa75dd25752fa0d164afb8b4f300
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue Apr 3 13:43:21 2012 +1000
CTDB: add back the rebalanceip command
commit a2ba2c4ec153c8844cf7f5b0de03b2269ec892f3
Author: Amitay Isaacs ami...@gmail.com
Date: Fri Mar 30 12:06:05 2012 +1100
build: Substitute POPT macros once and reuse variables
Signed-off-by: Amitay Isaacs ami...@gmail.com
commit 98ac99c4a79fe2ee024890bb27c3ca68dc02d434
Author: Amitay Isaacs ami...@gmail.com
Date: Tue Mar 27 10:53:25 2012 +1100
recovery: Add prototypes for tdb internal functions
Signed-off-by: Amitay Isaacs ami...@gmail.com
commit 10ab88a5c822ac403a70a9cd1a6c81020eb91d08
Author: Amitay Isaacs ami...@gmail.com
Date: Wed Mar 21 14:45:56 2012 +1100
build: Use system tdb library if available
Signed-off-by: Amitay Isaacs ami...@gmail.com
commit 2ade83de4e1f318c91489ec9a7f90d1b26f77e1b
Author: Amitay Isaacs ami...@gmail.com
Date: Wed Mar 21 15:56:45 2012 +1100
build: Use system tevent library if available
Signed-off-by: Amitay Isaacs ami...@gmail.com
commit 94f1e02406c353c3a0235685acdd107ee5a7f285
Author: Amitay Isaacs ami...@gmail.com
Date: Wed Mar 21 13:18:10 2012 +1100
build: Use system talloc library if available
Signed-off-by: Amitay Isaacs ami...@gmail.com
commit 0cbe7a4f92795203f022252a50a240b8bd4238c3
Author: Amitay Isaacs ami...@gmail.com
Date: Wed Mar 21 16:08:57 2012 +1100
build: Display correct LIB_FLAGS while building
Signed-off-by: Amitay Isaacs ami...@gmail.com
commit 36e690faab3d76919780c8550fe6d49fb6bbfba5
Author: Amitay Isaacs ami...@gmail.com
Date: Tue Mar 20 09:22:54 2012 +1100
build: Remove re-definition of same variable
Signed-off-by: Amitay Isaacs ami...@gmail.com
commit 45773dab630ee44b39df0dd4b50f43fb1e7bb0ba
Author: Amitay Isaacs ami...@gmail.com
Date: Mon Feb 6 16:45:50 2012 +1100
packaging: Setup directories for rpmbuild
Signed-off-by: Amitay Isaacs ami...@gmail.com
commit a9e9444a7a78f5ef0e929a8dbd8ca0c68b40acd4
Author: Amitay Isaacs ami...@gmail.com
Date: Wed Jan 11 19:04:39 2012 +1100
build: Add rules to create ctags/etags
Signed-off-by: Amitay Isaacs ami...@gmail.com
---
Summary of changes:
Makefile.in | 44 ++---
lib/talloc/libtalloc.m4 | 63 +---
lib/tdb/libtdb.m4 | 66 +
lib/tevent/libtevent.m4 | 66 --
packaging/RPM/makerpms.sh |8
server/ctdb_recover.c |7
server/ctdb_update_record.c |8 ++--
tools/ctdb.c| 75 +++
8 files changed, 256 insertions(+), 81 deletions(-)
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index 90d7b08..1794be5 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,6 +29,18 @@ POPT_LIBS = @POPT_LIBS@
POPT_CFLAGS = @POPT_CFLAGS@
POPT_OBJ = @POPT_OBJ@
+TALLOC_LIBS = @TALLOC_LIBS@
+TALLOC_CFLAGS = @TALLOC_CFLAGS@
+TALLOC_OBJ = @TALLOC_OBJ@
+
+TEVENT_LIBS = @TEVENT_LIBS@
+TEVENT_CFLAGS = @TEVENT_CFLAGS@
+TEVENT_OBJ = @TEVENT_OBJ@
+
+TDB_LIBS = @TDB_LIBS@
+TDB_CFLAGS = @TDB_CFLAGS@
+TDB_OBJ = @TDB_OBJ@
+
SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@
PMDA_LIBS = -lpcp -lpcp_pmda
@@ -36,7 +48,7 @@ PMDA_INSTALL = @CTDB_PMDA_INSTALL@
PMDA_DEST_DIR = /var/lib/pcp/pmdas
CFLAGS=@CPPFLAGS@ -g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util
-I$(srcdir) \
- -I@tallocdir@ -I@tdbdir@/include -I@libreplacedir@ \
+ $(TALLOC_CFLAGS) $(TEVENT_CFLAGS) $(TDB_CFLAGS) -I@libreplacedir@ \
-DVARDIR=\$(localstatedir)\ -DETCDIR=\$(etcdir)\ \
-DLOGDIR=\$(logdir)\ \
-DUSE_MMAP=1 -DTEVENT_DEPRECATED_QUIET=1 @CFLAGS@
-Wno-format-zero-length $(POPT_CFLAGS) \
@@ -46,7 +58,8 @@ LDSHFLAGS=-fPIC -shared
#LDSHFLAGS=-fPIC -shared -Wl,-Bsymbolic -Wl,-z,relo -Wl,-Bsymbolic-funtions
-Wl,--as-needed -Wl,-z,defs
SHLD=${CC}
