autobuild[sn-devel-144]: intermittent test failure detected
The autobuild test system (on sn-devel-144) 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.sn-devel-144/2016-10-15-0442/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-144/2016-10-15-0442/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-144/2016-10-15-0442/samba.stdout The top commit at the time of the failure was: commit 1f0dd8f698e7bd74846d3b4c36a5c3dac2098051 Author: Volker LendeckeDate: Wed Oct 12 12:27:56 2016 +0200 talloc: Fix CID 1373619 Unchecked return value Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Sat Oct 15 01:28:02 CEST 2016 on sn-devel-144
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) 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.sn-devel-104/2016-10-15-0407/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-10-15-0407/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-10-15-0407/samba.stdout The top commit at the time of the failure was: commit 1f0dd8f698e7bd74846d3b4c36a5c3dac2098051 Author: Volker LendeckeDate: Wed Oct 12 12:27:56 2016 +0200 talloc: Fix CID 1373619 Unchecked return value Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Sat Oct 15 01:28:02 CEST 2016 on sn-devel-144
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 1f0dd8f talloc: Fix CID 1373619 Unchecked return value via 1ecea45 messaging: Fix CID 1373622 Extra high-order bits via 978c379 messaging: Fix CID 1373625 Unused value via a04a096 pthreadpool: Fix CID 1373620 Unchecked return value from library via 6de421b talloc: Fix CID 1373621 Unchecked return value via 1e676a6 pthreadpool: Rearrange locks a bit via 9f6fe5e s3: winbind: Ensure we store name2sid with the correct cache sequence number. via 3b97211 examples: Add smb2mount from 8577456 support volfile fetch from multiple glusterd nodes https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 1f0dd8f698e7bd74846d3b4c36a5c3dac2098051 Author: Volker LendeckeDate: Wed Oct 12 12:27:56 2016 +0200 talloc: Fix CID 1373619 Unchecked return value Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Sat Oct 15 01:28:02 CEST 2016 on sn-devel-144 commit 1ecea454e55ccd683f7b098181917ddeed203ebe Author: Volker Lendecke Date: Wed Oct 12 12:25:39 2016 +0200 messaging: Fix CID 1373622 Extra high-order bits Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison commit 978c3792b55ddbc2b3b9da922d11d2797909731f Author: Volker Lendecke Date: Wed Oct 12 12:21:36 2016 +0200 messaging: Fix CID 1373625 Unused value Hmm. I wonder how that cut happened... Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison commit a04a096783ea083abafb7f943074be9b59ebd950 Author: Volker Lendecke Date: Wed Oct 12 12:20:00 2016 +0200 pthreadpool: Fix CID 1373620 Unchecked return value from library Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison commit 6de421b299d8edd3f5e3365e143010becda474f9 Author: Volker Lendecke Date: Wed Oct 12 12:18:11 2016 +0200 talloc: Fix CID 1373621 Unchecked return value Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison commit 1e676a6e2c71ceb1f9bf693d94b750c1ebcb95dd Author: Volker Lendecke Date: Wed Oct 12 12:12:28 2016 +0200 pthreadpool: Rearrange locks a bit Coverity ID 1373624 says we have a deadlock between pthreadpool_prepare and pthreadpool_destroy. Coverity somehow misses that pthreadpool_free unlocks pool->mutex, so I think this is a false positive. Nevertheless this re-arranges the code a bit for more clarity, hoping that Coverity now can better track the locks and unlocks. Also, the human reader might have to jump between routines a bit less. Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison commit 9f6fe5e2c54870abfff48c8a9d96e21bfec2425f Author: Jeremy Allison Date: Thu Oct 13 15:01:58 2016 -0700 s3: winbind: Ensure we store name2sid with the correct cache sequence number. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11259 Signed-off-by: Jeremy Allison Reviewed-by: Uri Simchoni commit 3b97211d1854b208afae711cc8804dd28ff1e532 Author: Volker Lendecke Date: Wed Oct 12 15:02:45 2016 +0200 examples: Add smb2mount This is an incomplete playground to add a fuse client based on the Samba-internal libsmb interfaces. There's a few fuse smb clients out there, but they all suffer from Samba not exporting the async internal libsmb interfaces. We don't export those with an API, because we believe we need the ability to mess with those interfaces. This is an attempt to create a fully asynchronous user-space fuse client file system that might make it easier to mess with fancy SMB features than it would be possible in a kernel client. Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Reviewed-by: Ralph Böhme --- Summary of changes: examples/fuse/README |7 + examples/fuse/clifuse.c| 1473 source3/lib/sys_popen.h => examples/fuse/clifuse.h | 13 +- examples/fuse/smb2mount.c | 167 +++ examples/fuse/wscript | 14 + examples/fuse/wscript_build|7 + lib/talloc/testsuite.c | 19 +- source3/lib/messages_dgm.c |2 +-
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) 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.sn-devel-104/2016-10-15-0002/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-10-15-0002/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-10-15-0002/samba.stdout The top commit at the time of the failure was: commit 857745655bd29656de3b0f96765d6b65221f3a3e Author: Raghavendra TalurDate: Thu Aug 25 16:03:55 2016 +0530 support volfile fetch from multiple glusterd nodes glusterfs:volfile_server option can be used in smb.conf to define where to fetch the volfile from. Currently it supports only a single IP or a hostname. The default is 'localhost'. glfs_set_volfile_server() has been enhanced in gfapi to support multiple invocations. A list is maintained in libgfapi which gets appended on every invocation. When glfs_init is performed, libgfapi would first try to fetch the volfile from glusterd on that node. However, on failure to fetch the volfile, it would proceed to contact glusterd on every node in the list until it gets the volfile or exhausts the list. This enhacement was done in Gluster commit [2]. This commit is available in 3.6, 3.7, 3.8 versions of Gluster. As we cannot have multiple lines having the same key of glusterfs:volfile_server in a share definition in smb.conf, we propose a scheme like this: where value of glusterfs:volfile_server could be list of white space seperated elements where each element could be unix+/path/to/socket/file or [tcp+]IP|hostname|\[IPv6\][:port]. Note the restriction on naming a IPv6 host, it follows the same restriction that is based on IPv6 naming in URL as per RFC 2732[1]. [1] http://www.ietf.org/rfc/rfc2732.txt [2] 0c1d78f5c52c69268ec3a1d8d5fcb1a1bf15f243 Signed-off-by: Raghavendra Talur Reviewed-by: Jeremy Allison Reviewed-by: Michael Adam Reviewed-by: Guenther Deschner Autobuild-User(master): Günther Deschner Autobuild-Date(master): Fri Oct 14 17:09:24 CEST 2016 on sn-devel-144
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) 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.sn-devel-104/2016-10-14-2006/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-10-14-2006/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-10-14-2006/samba.stdout The top commit at the time of the failure was: commit 857745655bd29656de3b0f96765d6b65221f3a3e Author: Raghavendra TalurDate: Thu Aug 25 16:03:55 2016 +0530 support volfile fetch from multiple glusterd nodes glusterfs:volfile_server option can be used in smb.conf to define where to fetch the volfile from. Currently it supports only a single IP or a hostname. The default is 'localhost'. glfs_set_volfile_server() has been enhanced in gfapi to support multiple invocations. A list is maintained in libgfapi which gets appended on every invocation. When glfs_init is performed, libgfapi would first try to fetch the volfile from glusterd on that node. However, on failure to fetch the volfile, it would proceed to contact glusterd on every node in the list until it gets the volfile or exhausts the list. This enhacement was done in Gluster commit [2]. This commit is available in 3.6, 3.7, 3.8 versions of Gluster. As we cannot have multiple lines having the same key of glusterfs:volfile_server in a share definition in smb.conf, we propose a scheme like this: where value of glusterfs:volfile_server could be list of white space seperated elements where each element could be unix+/path/to/socket/file or [tcp+]IP|hostname|\[IPv6\][:port]. Note the restriction on naming a IPv6 host, it follows the same restriction that is based on IPv6 naming in URL as per RFC 2732[1]. [1] http://www.ietf.org/rfc/rfc2732.txt [2] 0c1d78f5c52c69268ec3a1d8d5fcb1a1bf15f243 Signed-off-by: Raghavendra Talur Reviewed-by: Jeremy Allison Reviewed-by: Michael Adam Reviewed-by: Guenther Deschner Autobuild-User(master): Günther Deschner Autobuild-Date(master): Fri Oct 14 17:09:24 CEST 2016 on sn-devel-144
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 8577456 support volfile fetch from multiple glusterd nodes from 1d2d0c3 ctdb-scripts: Strengthen check to see if ctdbd is running https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 857745655bd29656de3b0f96765d6b65221f3a3e Author: Raghavendra TalurDate: Thu Aug 25 16:03:55 2016 +0530 support volfile fetch from multiple glusterd nodes glusterfs:volfile_server option can be used in smb.conf to define where to fetch the volfile from. Currently it supports only a single IP or a hostname. The default is 'localhost'. glfs_set_volfile_server() has been enhanced in gfapi to support multiple invocations. A list is maintained in libgfapi which gets appended on every invocation. When glfs_init is performed, libgfapi would first try to fetch the volfile from glusterd on that node. However, on failure to fetch the volfile, it would proceed to contact glusterd on every node in the list until it gets the volfile or exhausts the list. This enhacement was done in Gluster commit [2]. This commit is available in 3.6, 3.7, 3.8 versions of Gluster. As we cannot have multiple lines having the same key of glusterfs:volfile_server in a share definition in smb.conf, we propose a scheme like this: where value of glusterfs:volfile_server could be list of white space seperated elements where each element could be unix+/path/to/socket/file or [tcp+]IP|hostname|\[IPv6\][:port]. Note the restriction on naming a IPv6 host, it follows the same restriction that is based on IPv6 naming in URL as per RFC 2732[1]. [1] http://www.ietf.org/rfc/rfc2732.txt [2] 0c1d78f5c52c69268ec3a1d8d5fcb1a1bf15f243 Signed-off-by: Raghavendra Talur Reviewed-by: Jeremy Allison Reviewed-by: Michael Adam Reviewed-by: Guenther Deschner Autobuild-User(master): Günther Deschner Autobuild-Date(master): Fri Oct 14 17:09:24 CEST 2016 on sn-devel-144 --- Summary of changes: docs-xml/manpages/vfs_glusterfs.8.xml | 16 - source3/modules/vfs_glusterfs.c | 128 ++ 2 files changed, 130 insertions(+), 14 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages/vfs_glusterfs.8.xml b/docs-xml/manpages/vfs_glusterfs.8.xml index 5e18e53..5e67f71 100644 --- a/docs-xml/manpages/vfs_glusterfs.8.xml +++ b/docs-xml/manpages/vfs_glusterfs.8.xml @@ -131,7 +131,19 @@ Defines which volfile server to use, defaults to - localhost. + localhost. It could be list of white space + seperated elements where each element could be + + + 1. unix+/path/to/socket/file + + + 2. [tcp+]IP|hostname|\[IPv6\][:port] + + + Note the restriction on naming a IPv6 host, it follows + the same restriction that is based on IPv6 naming in + URL as per RFC 2732. @@ -153,7 +165,7 @@ VERSION - This man page is correct for version 4.2.0 of the Samba suite. + This man page is correct for version 4.6.0 of the Samba suite. diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c index b0ff0f6..3e15ce6 100644 --- a/source3/modules/vfs_glusterfs.c +++ b/source3/modules/vfs_glusterfs.c @@ -157,13 +157,116 @@ static void glfs_clear_preopened(glfs_t *fs) } } +static int vfs_gluster_set_volfile_servers(glfs_t *fs, + const char *volfile_servers) +{ + char *server = NULL; + int server_count = 0; + int server_success = 0; + int ret = -1; + TALLOC_CTX *frame = talloc_stackframe(); + + DBG_INFO("servers list %s\n", volfile_servers); + + while (next_token_talloc(frame, _servers, , " \t")) { + char *transport = NULL; + char *host = NULL; + int port = 0; + + server_count++; + DBG_INFO("server %d %s\n", server_count, server); + + /* Determine the transport type */ + if (strncmp(server, "unix+", 5) == 0) { + port = 0; + transport = talloc_strdup(frame, "unix"); + if (!transport) { + errno = ENOMEM; + goto out; +
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) 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.sn-devel-104/2016-10-14-1602/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-10-14-1602/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-10-14-1602/samba.stdout The top commit at the time of the failure was: commit 1d2d0c34fc6e7d217f322adb6b6d3e920cbedf89 Author: Martin SchwenkeDate: Mon Oct 10 14:56:18 2016 +1100 ctdb-scripts: Strengthen check to see if ctdbd is running Don't just rely on the process existing. It must be called "ctdbd". Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs Autobuild-User(master): Amitay Isaacs Autobuild-Date(master): Fri Oct 14 11:54:40 CEST 2016 on sn-devel-144
autobuild[sn-devel-144]: intermittent test failure detected
The autobuild test system (on sn-devel-144) 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.sn-devel-144/2016-10-14-1219/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-144/2016-10-14-1219/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-144/2016-10-14-1219/samba.stdout The top commit at the time of the failure was: commit 1d2d0c34fc6e7d217f322adb6b6d3e920cbedf89 Author: Martin SchwenkeDate: Mon Oct 10 14:56:18 2016 +1100 ctdb-scripts: Strengthen check to see if ctdbd is running Don't just rely on the process existing. It must be called "ctdbd". Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs Autobuild-User(master): Amitay Isaacs Autobuild-Date(master): Fri Oct 14 11:54:40 CEST 2016 on sn-devel-144
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) 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.sn-devel-104/2016-10-14-1204/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-10-14-1204/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-10-14-1204/samba.stdout The top commit at the time of the failure was: commit 1d2d0c34fc6e7d217f322adb6b6d3e920cbedf89 Author: Martin SchwenkeDate: Mon Oct 10 14:56:18 2016 +1100 ctdb-scripts: Strengthen check to see if ctdbd is running Don't just rely on the process existing. It must be called "ctdbd". Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs Autobuild-User(master): Amitay Isaacs Autobuild-Date(master): Fri Oct 14 11:54:40 CEST 2016 on sn-devel-144
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 1d2d0c3 ctdb-scripts: Strengthen check to see if ctdbd is running via fd8e562 ctdb-packaging: Move CTDB tests to /usr/local/share/ctdb/tests/ from 3aebe9e smbd: Fix a comment https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 1d2d0c34fc6e7d217f322adb6b6d3e920cbedf89 Author: Martin SchwenkeDate: Mon Oct 10 14:56:18 2016 +1100 ctdb-scripts: Strengthen check to see if ctdbd is running Don't just rely on the process existing. It must be called "ctdbd". Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs Autobuild-User(master): Amitay Isaacs Autobuild-Date(master): Fri Oct 14 11:54:40 CEST 2016 on sn-devel-144 commit fd8e562069e3c01720be62069b7d58d14c10afd5 Author: Martin Schwenke Date: Tue Oct 11 11:30:37 2016 +1100 ctdb-packaging: Move CTDB tests to /usr/local/share/ctdb/tests/ In time, other things will end up in /use/local/share/ctdb/. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12104 Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- Summary of changes: ctdb/config/ctdbd_wrapper | 14 +- ctdb/packaging/RPM/ctdb.spec.in | 4 ++-- ctdb/wscript| 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper index 11ea59a..8a9f554 100755 --- a/ctdb/config/ctdbd_wrapper +++ b/ctdb/config/ctdbd_wrapper @@ -31,17 +31,21 @@ ctdbd="${CTDBD:-/usr/local/sbin/ctdbd}" # ctdbd_is_running() # Check if ctdbd is running. ctdbd is only considered to running if -# the PID in the PID file is active. Return true if this is the case. -# Print the PID regardless, since it can be used to kill stale -# processes in the session. +# the PID in the PID file is active and is called "ctdbd". Return +# true if this is the case. Print the PID regardless, since it can be +# used to kill stale processes in the session. ctdbd_is_running () { if read _pid 2>/dev/null <"$pidfile" ; then echo "$_pid" - # Return value of kill is used - kill -0 "$_pid" 2>/dev/null + # This could be optimised with ps options -q and -h. + # However, -q is not generally available because it is + # fairly new and -h is not in some older distros. The + # options below are portable. + _cmd=$(ps -p "$_pid" -o comm | tail -n +2) + [ "$_cmd" = "ctdbd" ] else # Missing/empty PID file return 1 diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in index ea97d8e..aae2c7e 100644 --- a/ctdb/packaging/RPM/ctdb.spec.in +++ b/ctdb/packaging/RPM/ctdb.spec.in @@ -257,8 +257,8 @@ test suite for ctdb %files tests %defattr(-,root,root) -%dir %{_datadir}/%{name}-tests -%{_datadir}/%{name}-tests/* +%dir %{_datadir}/%{name}/tests +%{_datadir}/%{name}/tests/* %dir %{_libexecdir}/%{name}/tests %{_libexecdir}/%{name}/tests/* %{_bindir}/ctdb_run_tests diff --git a/ctdb/wscript b/ctdb/wscript index 5675849..c775cb5 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -209,7 +209,7 @@ def configure(conf): conf.env.CTDB_RUNDIR)) conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.EXEC_PREFIX, - 'share/ctdb-tests') + 'share/ctdb/tests') conf.env.CTDB_TEST_LIBEXECDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb/tests') # Allow unified compilation and separate compilation of utilities -- Samba Shared Repository
autobuild[sn-devel-104]: intermittent test failure detected
The autobuild test system (on sn-devel-104) 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.sn-devel-104/2016-10-14-0802/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-104/2016-10-14-0802/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-104/2016-10-14-0802/samba.stdout The top commit at the time of the failure was: commit 3aebe9efa741a3298f78ffebcb8801680f63e725 Author: Volker LendeckeDate: Thu Oct 13 16:07:22 2016 +0200 smbd: Fix a comment This is described in https://msdn.microsoft.com/en-us/library/cc232053.aspx which is section 2.3.67 in the FSCC version available 2016-10-13. Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Oct 14 05:31:07 CEST 2016 on sn-devel-144