[SCM] Samba Shared Repository - branch master updated
Volker Lendecke
vlendec at samba.org
Mon Jun 6 14:11:04 UTC 2016
The branch, master has been updated
via a936234 Add yet another error code when forking an smbd and ctdb is not there. We can see NT_STATUS_CONNECTION_REFUSED in the logs upon such a rare case.
via 97e1f53 ctdb-packaging: Remove tevent-unix-util public library
via 2082c0c lib/util: Avoid splitting tevent-unix-util as public library
from 4d26210 dsdb: Cache our local invocation_id at the start of each request
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a936234b554309c8d480c5e276deda9e7f9029b4
Author: Peter Somogyi <psomogyi at hu.ibm.com>
Date: Wed Jun 1 18:30:08 2016 +0200
Add yet another error code when forking an smbd and ctdb is not there. We can see NT_STATUS_CONNECTION_REFUSED in the logs upon such a rare case.
Signed-off-by: Peter Somogyi <psomogyi at hu.ibm.com>
Reviewed-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
Autobuild-User(master): Volker Lendecke <vl at samba.org>
Autobuild-Date(master): Mon Jun 6 16:10:19 CEST 2016 on sn-devel-144
commit 97e1f53daeb1edf7f0a337c38dd9f8d7d8e36321
Author: Amitay Isaacs <amitay at gmail.com>
Date: Thu Jun 2 17:59:16 2016 +1000
ctdb-packaging: Remove tevent-unix-util public library
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11946
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 2082c0c3b5b62286d111d91c56541710ecc0ffa1
Author: Amitay Isaacs <amitay at gmail.com>
Date: Thu Jun 2 17:17:19 2016 +1000
lib/util: Avoid splitting tevent-unix-util as public library
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11946
Commit 670db6ac1d678babd25dd82c4467c0f094cfabc5 split tevent-util public
library to create tevent-unix-util public library for standalone ctdb
use. This created a public library dependency between samba and ctdb
for packaging.
Bundle tevent_unix.c in public library tevent-util as before. However,
to avoid the dependencies for packaging, standalone ctdb build will
build tevent-util as a private library with only tevent_unix.c
This simplifies any new subsystems (or libraries) which need tevent-util
and are linked in both samba and ctdb.
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Volker Lendecke <vl at samba.org>
-----------------------------------------------------------------------
Summary of changes:
ctdb/packaging/RPM/ctdb.spec.in | 3 ---
ctdb/wscript | 6 +++---
lib/util/wscript_build | 23 +++++++++++------------
source3/smbd/server.c | 13 ++++++++-----
4 files changed, 22 insertions(+), 23 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index 9710ca0..3bc9beb 100644
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -212,7 +212,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libexecdir}/ctdb/smnotify
%dir %{_libdir}
%{_libdir}/ctdb/lib*
-%{_libdir}/libtevent-unix-util.so.0*
%{_mandir}/man1/ctdb.1.gz
%{_mandir}/man1/ctdbd.1.gz
%{_mandir}/man1/ctdbd_wrapper.1.gz
@@ -234,8 +233,6 @@ development libraries for ctdb
%files devel
%defattr(-,root,root)
-%{_includedir}/ctdb/util/*.h
-%{_libdir}/libtevent-unix-util.so
%package tests
Summary: CTDB test suite
diff --git a/ctdb/wscript b/ctdb/wscript
index cf60e86..744ba96 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -341,7 +341,7 @@ def build(bld):
'''db_hash.c srvid.c reqid.c
pkt_read.c pkt_write.c comm.c
logging.c rb_tree.c'''),
- deps='replace talloc tevent tdb tevent-unix-util')
+ deps='replace talloc tevent tdb tevent-util')
bld.SAMBA_SUBSYSTEM('ctdb-protocol',
source=bld.SUBDIR('protocol',
@@ -654,7 +654,7 @@ def build(bld):
bld.SAMBA_BINARY(target,
source=src,
- deps='talloc tevent tdb tevent-unix-util',
+ deps='talloc tevent tdb tevent-util',
install_path='${CTDB_TEST_LIBDIR}')
bld.SAMBA_BINARY('reqid_test',
@@ -708,7 +708,7 @@ def build(bld):
bld.SAMBA_BINARY('fake_ctdbd',
source='tests/src/fake_ctdbd.c',
deps='''ctdb-util ctdb-protocol ctdb-system
- samba-util tevent-unix-util popt''',
+ samba-util tevent-util popt''',
install_path='${CTDB_TEST_LIBDIR}')
if bld.env.HAVE_INFINIBAND:
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index aa0586c..713946d 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -70,16 +70,15 @@ bld.SAMBA_SUBSYSTEM('samba-util-core',
tevent execinfo pthread strv''',
local_include=False)
-bld.SAMBA_LIBRARY('tevent-unix-util',
- source='tevent_unix.c',
- local_include=False,
- deps='tevent',
- public_headers='tevent_unix.h',
- header_path=[ ('*', 'util') ],
- pc_files=[],
- vnum='0.0.1')
+if bld.env.SAMBA_UTIL_CORE_ONLY:
+
+ bld.SAMBA_LIBRARY('tevent-util',
+ source='tevent_unix.c',
+ local_include=False,
+ deps='tevent',
+ private_library=True)
-if not bld.env.SAMBA_UTIL_CORE_ONLY:
+else:
bld.env.public_headers_skip.append('charset_compat.h')
@@ -143,10 +142,10 @@ if not bld.env.SAMBA_UTIL_CORE_ONLY:
)
bld.SAMBA_LIBRARY('tevent-util',
- source='tevent_ntstatus.c tevent_werror.c',
+ source='tevent_unix.c tevent_ntstatus.c tevent_werror.c',
local_include=False,
- public_deps='tevent samba-errors tevent-unix-util',
- public_headers='tevent_ntstatus.h tevent_werror.h',
+ public_deps='tevent samba-errors',
+ public_headers='tevent_ntstatus.h tevent_unix.h tevent_werror.h',
header_path=[ ('*', 'util') ],
pc_files=[],
vnum='0.0.1'
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 82e686e..24acc04 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -747,11 +747,14 @@ static void smbd_accept_connection(struct tevent_context *ev,
goto exit;
}
if (lp_clustering() &&
- NT_STATUS_EQUAL(status,
- NT_STATUS_INTERNAL_DB_ERROR)) {
- DEBUG(1,("child process cannot initialize "
- "because connection to CTDB "
- "has failed\n"));
+ (NT_STATUS_EQUAL(
+ status, NT_STATUS_INTERNAL_DB_ERROR) ||
+ NT_STATUS_EQUAL(
+ status, NT_STATUS_CONNECTION_REFUSED))) {
+ DEBUG(1, ("child process cannot initialize "
+ "because connection to CTDB "
+ "has failed: %s\n",
+ nt_errstr(status)));
goto exit;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list