[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 5a8e049 Fix typo in warning message
from 570a4b3 tevent_poll: add poll_event_loop_wait()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5a8e04963f611b21570b9bdfc3b74e18254df2d1
Author: Volker Lendecke v...@samba.org
Date: Sun Feb 3 12:30:10 2013 +0100
Fix typo in warning message
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-By: Ira Cooper i...@samba.org
Autobuild-User(master): Volker Lendecke v...@samba.org
Autobuild-Date(master): Mon Feb 4 11:48:25 CET 2013 on sn-devel-104
---
Summary of changes:
source3/wscript |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/wscript b/source3/wscript
index bb5ee89..7c63a9c 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -693,7 +693,7 @@ msg.msg_acctrightslen = sizeof(fd);
if not conf.CONFIG_SET('HAVE_GSS_GET_NAME_ATTRIBUTE') and \
not
(conf.CONFIG_SET('HAVE_GSSKRB5_EXTRACT_AUTHZ_DATA_FROM_SEC_CONTEXT') and \
conf.CONFIG_SET('HAVE_GSS_INQUIRE_SEC_CONTEXT_BY_OID')):
-Logs.warn(need eiterh gss_get_name_attribute or
gsskrb5_extract_authz_data_from_sec_context and gss_inquire_sec_context_by_oid
in -lgssapi for PAC support)
+Logs.warn(need either gss_get_name_attribute or
gsskrb5_extract_authz_data_from_sec_context and gss_inquire_sec_context_by_oid
in -lgssapi for PAC support)
use_ads_krb5 = False
if not conf.CONFIG_SET('HAVE_GSS_KRB5_EXPORT_LUCID_SEC_CONTEXT'):
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated via ad6b3e8 WHATSNEW: Start release notes for Samba 4.0.3. from 4eadddc VERSION: Bump version number up to 4.0.3. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit ad6b3e878ea57c9d283ad8a6be0b6b872b8f3527 Author: Karolin Seeger ksee...@samba.org Date: Mon Feb 4 11:30:18 2013 +0100 WHATSNEW: Start release notes for Samba 4.0.3. Karolin Autobuild-User(v4-0-test): Karolin Seeger ksee...@samba.org Autobuild-Date(v4-0-test): Mon Feb 4 13:23:03 CET 2013 on sn-devel-104 --- Summary of changes: WHATSNEW.txt | 168 +- 1 files changed, 166 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 0711f96..67c558f 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,4 +1,168 @@ = + Release Notes for Samba 4.0.3 + February 05, 2013 + = + + +This is is the latest stable release of Samba 4.0. + +Major enhancements in Samba 4.0.3 include: + +o Fix ACL problem with delegation of privileges and deletion of accounts + over LDAP interface (bug #8909). +o Fix 'smbd' panic triggered by unlink after open (bug #9571). +o smbd: Fix memleak in the async echo handler (bug #9549). + + +Changes since 4.0.2: + + +o Michael Adam ob...@samba.org +* BUG 9568: Document the command line options in dbwrap_tool(1). + + +o Jeremy Allison j...@samba.org +* BUG 9196: defer_open is triggered multiple times on the same request. +* BUG 9518: conn-share_access appears not be be reset between users. +* BUG 9550: sigprocmask does not work on FreeBSD to stop further signals in + a signal handler. +* BUG 9572: Fix file corruption during SMB1 read by Mac OSX 10.8.2 clients. +* BUG 9586: smbd[29175]: disk_free: sys_popen() failed message logged in + /var/log/message many times. +* BUG 9587: Archive flag is always set on directories. +* BUG 9588: ACLs are not inherited to directories for DFS shares. + + +o Andrew Bartlett abart...@samba.org +* BUG 8909: Fix ACL problem with delegation of privileges and deletion of + accounts over LDAP interface. +* BUG 9461: FSMO seize of naming role fails: NT_STATUS_IO_TIMEOUT. +* BUG 9564: Fix compilation of Solaris ACL module. +* BUG 9581: gensec: Allow login without a PAC by default. +* BUG 9596: Linked attribute handling should be by GUID. +* BUG 9598: Use pid,task_id as cluster_id in process_single just like + process_prefork. +* BUG 9609: ldb: Ensure to decrement the transaction_active whenever we + delete a transaction. +* BUG 9609: Add 'ldbdump' tool. +* BUG 9609: ldb: Remove no-longer-existing ltdb_unpack_data_free from + ldb_tdb.h. +* BUG 9609: ldb: Change ltdb_unpack_data to take an ldb_context. +* BUG 9610: dsdb: Make secrets_tdb_sync cope with -H secrets.ldb. + + +o Björn Baumbach b...@sernet.de +* BUG 9512: wafsamba: Use additional xml catalog file. +* BUG 9517: samba_dnsupdate: Set KRB5_CONFIG for nsupdate command. +* BUG 9552: smb.conf(5): Update list of available protocols. +* BUG 9568: Add dbwrap_tool.1 manual page. +* BUG 9569: ntlm_auth(1): Fix format and make examples visible. + + +o Ira Cooper i...@samba.org +* BUG 9575: Duplicate flags defined in the winbindd protocol. + + +o Günther Deschner g...@samba.org +* BUG 9474: Downgrade v4 printer driver requests to v3. +* BUG 9595: s3-winbind: Fix the build of idmap_ldap. + + +o David Disseldorp dd...@samba.org +* BUG 9378: Add extra attributes for AD printer publishing. + + +o Stephen Gallagher sgall...@redhat.com +* BUG 9609: ldb: Move doxygen comments for ldb_connect to the right place. + + +o Volker Lendecke v...@samba.org +* BUG 9541: Make use of posix_openpt. +* BUG 9544: Fix build of vfs_commit and plug in async pwrite support. +* BUG 9546: Fix aio_suspend detection on FreeBSD. +* BUG 9548: Correctly detect O_DIRECT. +* BUG 9549: smbd: Fix memleak in the async echo handler. + + +o Stefan Metzmacher me...@samba.org +* BUG 8909: Fix ACL problem with delegation of privileges and deletion of + accounts over LDAP interface. +* BUG 9481: samba_upgradeprovision: fix the nTSecurityDescriptor on more + containers. +* BUG 9499: s3:smb2_negprot: set the 'remote_proto' value. +* BUG 9508: s4:drsuapi: Make sure we report the meta data from the cycle + start. +* BUG 9540: terminate the irpc_servers_byname() result with + server_id_set_disconnected(). +* BUG 9598: Fix timeouts of some IRPC calls. +* BUG 9609: Fix a warning
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 4c1527b s3:modules remove gpfs_getacl_alloc via 18bfcac s3:modules use vfs_gpfs_getacl in gpfsacl_get_posix_acl via 5388773 s3:modules use vfs_gpfs_getacl in gpfsacl_set_nt_acl_internal via 16940d8 s3:modules use vfs_gpfs_getacl in gpfs_get_nfs4_acl via 940b7ec s3:torture/vfstest add memreport option via 8e571fd s3:torture/vfstest implement sys_acl_blob_get_fd via de67655 s3:torture/vfstest implement sys_acl_blob_get_file via 0621991 s3:vfs_gpfs use non_posix_sys_acl_blob_get_*_helper via f1ff845 s3:vfs_gpfs add a generic vfs_gpfs_getacl function via d9075e1 s3:modules/vfs_gpfs add GPFS_GETACL_NATIVE define via b4be8d5 s3:modules/non_posix_acls: only stat if we do not have it cached via 7cd91ca s3:autoconf add non_posix_acls to NFS4ACL_OBJ via ea6ac28 s3:autoconf introduce NFS4ACL_OBJ via d7ad24a s3-waf:modules add non_posix_acls dependency to vfs_gpfs via 2a2dbf8 vfs: Add helper function for non posix ACL modules via e650a5f idl: Provide a common wrapper for the data to hash for a non-POSIX ACL via a133a98 selftest: add a test that demonstrates how new ACL blob code helps via f0e49b0 vfs_acl_common: Do not fetch the underlying NT ACL unless we need it via 4e8c895 vfs: Whitespace fix only to get_nt_acl_internal indentation via 25526ed vfs: Implement an improved vfs_acl_common that uses the hash of the system ACL via 6a5f65b vfs: Add helper function hash_blob_sha256 to vfs_acl_common.c from 5a8e049 Fix typo in warning message http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 4c1527b1ce26759dbb7470b23f9f83a391d99b30 Author: Christian Ambach a...@samba.org Date: Tue Jan 8 17:10:27 2013 +0100 s3:modules remove gpfs_getacl_alloc last caller has gone Signed-off-by: Christian Ambach a...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org Autobuild-User(master): Andrew Bartlett abart...@samba.org Autobuild-Date(master): Mon Feb 4 14:10:08 CET 2013 on sn-devel-104 commit 18bfcac810bed431d0ca33ad02508fd87df1c626 Author: Christian Ambach a...@samba.org Date: Tue Jan 8 17:10:10 2013 +0100 s3:modules use vfs_gpfs_getacl in gpfsacl_get_posix_acl as preparation to remove gpfs_getacl_alloc() Signed-off-by: Christian Ambach a...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org commit 5388773d4baf902d8dd70d046cacc5a15fa790d7 Author: Christian Ambach a...@samba.org Date: Tue Jan 8 17:07:09 2013 +0100 s3:modules use vfs_gpfs_getacl in gpfsacl_set_nt_acl_internal as preparation to remove gpfs_getacl_alloc() Signed-off-by: Christian Ambach a...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org commit 16940d8a8ecb46a6de9cf5c83da7d2f54030777b Author: Christian Ambach a...@samba.org Date: Tue Jan 8 16:54:16 2013 +0100 s3:modules use vfs_gpfs_getacl in gpfs_get_nfs4_acl as preparation to remove gpfs_getacl_alloc() Signed-off-by: Christian Ambach a...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org commit 940b7ec78c50c41a399bee2775cd008618baf8f8 Author: Christian Ambach a...@samba.org Date: Fri Nov 16 22:58:06 2012 +0100 s3:torture/vfstest add memreport option this will run a talloc_report_full on the talloc stackframe after each command Signed-off-by: Christian Ambach a...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org commit 8e571fd385334bc12ee5c5bdfd32b31ad2c4b4b8 Author: Christian Ambach a...@samba.org Date: Thu Nov 15 15:25:52 2012 +0100 s3:torture/vfstest implement sys_acl_blob_get_fd Signed-off-by: Christian Ambach a...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org commit de676555ab882bd110a2649555645d58abe2bfeb Author: Christian Ambach a...@samba.org Date: Thu Nov 15 15:19:07 2012 +0100 s3:torture/vfstest implement sys_acl_blob_get_file Signed-off-by: Christian Ambach a...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org commit 06219913abc4f1c3912b377b4a9521a11ad45886 Author: Christian Ambach a...@samba.org Date: Tue Oct 30 13:44:40 2012 +0100 s3:vfs_gpfs use non_posix_sys_acl_blob_get_*_helper use the helper functions to return the blob based on the raw GPFS ACL blob (if it is a NFSv4 ACL). If not, fall back to the POSIX ACL code Signed-off-by: Christian Ambach a...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org commit f1ff845720604fc32788a59ec9a1a128135efe35 Author: Christian Ambach a...@samba.org Date: Mon Nov 5 19:26:57 2012 +0100 s3:vfs_gpfs add a generic vfs_gpfs_getacl function in contrast to gpfs_getacl_alloc which always puts the ACL on talloc_tos(), this one allows to
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via c5d991e Revert selftest: skip smb2.ioctl tests on ntvfs from 4c1527b s3:modules remove gpfs_getacl_alloc http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit c5d991e5102069ec712fe609c031a10ee8b0f389 Author: David Disseldorp dd...@samba.org Date: Sun Feb 3 17:06:37 2013 +0100 Revert selftest: skip smb2.ioctl tests on ntvfs This reverts commit cf27c2fbb6e7422cb962f4c63a53515321c65a70. The following concerns were raised with regard to the relocation of tests from selftest/knownfail to selftest/skip. Andrew Bartlett abart...@samba.org wrote: Unless there is some entirely undesirable side-effect, this patch throws away valuable testing, because it removes the test of the testsuite for failure (ie, does the test work!), and it removes the documentation of the difference between the servers (if someone did add some this to the ntvfs server, it would never be tested). It also removes a test that if this unimplemented functionality is called, that we don't crash and die. Reviewed-by: Andrew Bartlett abart...@samba.org Autobuild-User(master): David Disseldorp dd...@samba.org Autobuild-Date(master): Mon Feb 4 15:57:29 CET 2013 on sn-devel-104 --- Summary of changes: selftest/knownfail |2 ++ selftest/skip |1 - 2 files changed, 2 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/selftest/knownfail b/selftest/knownfail index dcd94ec..39485af 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -172,6 +172,8 @@ ^samba3.smb2.durable-v2-open.open-lease ^samba3.smb2.durable-v2-open.persistent-open-lease ^samba3.smb2.durable-v2-open.app-instance +^samba4.smb2.ioctl.req_resume_key\(dc\) # not supported by s4 ntvfs server +^samba4.smb2.ioctl.copy_chunk_\w*\(dc\)# not supported by s4 ntvfs server ^samba3.smb2.dir.one ^samba3.smb2.dir.modify ^samba3.smb2.lease.request diff --git a/selftest/skip b/selftest/skip index d54a5b0..5c49306 100644 --- a/selftest/skip +++ b/selftest/skip @@ -61,7 +61,6 @@ ^samba4.smb2.dir ^samba4.smb2.session ^samba4.smb2.compound -^samba4.smb2.ioctl # not supported by ntvfs ^samba4.ntvfs.cifs.*.base.charset ^samba4.ntvfs.cifs.*.base.iometer ^samba4.ntvfs.cifs.*.base.casetable -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via dc6c40b samba-tool/domain provision: add support for utf-8 passwords for --adminpass via 2e7bc87 samba-tool/user setpassword: fix help message via d60be81 s4:scripting/python: add support for utf-8 passwords from the command line via ff65500 s3:dbrwap_ctdb: ZERO_STRUCT(rec) just to be sure in traverse_persistent_callback_read() via 3949854 s3:dbwrap_ctdb: ZERO_STRUCT(rec) just to be sure in traverse_read_callback() via a09f3a3 s3:dbwrap_ctdb: add db_context to db_record via 25bdab9 s3:dbwrap_ctdb: setup result-name in db_open_ctdb() via 29aeaab lib/dbwrap: talloc_strdup() name in db_open_file() via 65f2bba lib/util: improve check_password_quality() to handle utf8 via e5ca813 dsdb/util: rework samdb_check_password() to support utf8 via 54cc3b1 dsdb/password_hash: rename variable 'stat' to 'vstat' via 6eccfc7 dsdb/password_hash: make sure that io-n.cleartext_utf8.data is a null terminated string via 9292e5b s3: use generate_random_password() instead of generate_random_str() from c5d991e Revert selftest: skip smb2.ioctl tests on ntvfs http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit dc6c40b193e125e8810cf95129fc99f7d4f6db27 Author: Stefan Metzmacher me...@samba.org Date: Mon Feb 4 11:41:39 2013 +0100 samba-tool/domain provision: add support for utf-8 passwords for --adminpass Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Michael Adam ob...@samba.org Autobuild-User(master): Michael Adam ob...@samba.org Autobuild-Date(master): Mon Feb 4 18:54:32 CET 2013 on sn-devel-104 commit 2e7bc87fa54148655ce13a59bd3274fb6285a579 Author: Stefan Metzmacher me...@samba.org Date: Mon Feb 4 13:35:48 2013 +0100 samba-tool/user setpassword: fix help message Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Michael Adam ob...@samba.org commit d60be8167b7264dadae7d4735ee5977233d4cea9 Author: Stefan Metzmacher me...@samba.org Date: Mon Feb 4 11:41:39 2013 +0100 s4:scripting/python: add support for utf-8 passwords from the command line Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Michael Adam ob...@samba.org commit ff65500f2b4f00dad25e342b51373f700d888c6b Author: Michael Adam ob...@samba.org Date: Mon Feb 4 13:10:34 2013 +0100 s3:dbrwap_ctdb: ZERO_STRUCT(rec) just to be sure in traverse_persistent_callback_read() Signed-off-by: Michael Adam ob...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit 394985454970e1eeb9b871bb359fa9f5edc9747b Author: Michael Adam ob...@samba.org Date: Mon Feb 4 13:09:46 2013 +0100 s3:dbwrap_ctdb: ZERO_STRUCT(rec) just to be sure in traverse_read_callback() Signed-off-by: Michael Adam ob...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit a09f3a35519d5be2a7d37dc2a283f84f6eb4e8cc Author: Stefan Metzmacher me...@samba.org Date: Fri Feb 1 02:48:00 2013 -0500 s3:dbwrap_ctdb: add db_context to db_record Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Michael Adam ob...@samba.org commit 25bdab9c6140a04dfb33e5b4118f45e8d8489d86 Author: Stefan Metzmacher me...@samba.org Date: Fri Feb 1 03:14:16 2013 -0500 s3:dbwrap_ctdb: setup result-name in db_open_ctdb() Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Michael Adam ob...@samba.org commit 29aeaab1d9bf2441f4a3a9f4a8554fa9af2bd5c2 Author: Stefan Metzmacher me...@samba.org Date: Fri Feb 1 03:13:35 2013 -0500 lib/dbwrap: talloc_strdup() name in db_open_file() Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Michael Adam ob...@samba.org commit 65f2bba559a33edb3c352d552aebb259e5e008eb Author: Stefan Metzmacher me...@samba.org Date: Mon Feb 4 08:45:48 2013 +0100 lib/util: improve check_password_quality() to handle utf8 Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Michael Adam ob...@samba.org commit e5ca813ffb4398faeefc96c224d3b2677e576c7a Author: Stefan Metzmacher me...@samba.org Date: Mon Feb 4 09:19:54 2013 +0100 dsdb/util: rework samdb_check_password() to support utf8 Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Michael Adam ob...@samba.org commit 54cc3b1f42eba19170e611b0ee0ea464ea4ac604 Author: Stefan Metzmacher me...@samba.org Date: Mon Feb 4 09:47:31 2013 +0100 dsdb/password_hash: rename variable 'stat' to 'vstat' Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Michael Adam ob...@samba.org commit 6eccfc74cd9a16e96a2b6214b943f5b2f9adfe65 Author: Stefan Metzmacher me...@samba.org Date: Mon Feb 4 09:18:59 2013 +0100 dsdb/password_hash: make sure that io-n.cleartext_utf8.data is a null terminated string
[SCM] CTDB repository - branch master updated - ctdb-2.1-11-g25a2040
The branch, master has been updated via 25a20409fb39a94b64c13990c0eba4f75d482ecd (commit) via d1ec06d30148e6fd344625a2fbf1c22391bd908a (commit) from 124e2a471aeda9c900fd898178a30522d7d74221 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit 25a20409fb39a94b64c13990c0eba4f75d482ecd Author: Martin Schwenke mar...@meltin.net Date: Tue Feb 5 12:13:57 2013 +1100 build: Fix a Makefile.in typo Objects are named *.o ;-) Signed-off-by: Martin Schwenke mar...@meltin.net commit d1ec06d30148e6fd344625a2fbf1c22391bd908a Author: Martin Schwenke mar...@meltin.net Date: Fri Jan 11 12:39:37 2013 +1100 tools/ctdb: Fix a compiler warning Signed-off-by: Martin Schwenke mar...@meltin.net Pair-programmed-with: Amitay Isaacs ami...@gmail.com --- Summary of changes: Makefile.in |2 +- tools/ctdb.c |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/Makefile.in b/Makefile.in index e704d63..762f788 100755 --- a/Makefile.in +++ b/Makefile.in @@ -72,7 +72,7 @@ UTIL_OBJ = lib/util/idtree.o lib/util/db_wrap.o lib/util/strlist.o lib/util/util CTDB_COMMON_OBJ = common/ctdb_io.o common/ctdb_util.o \ common/ctdb_ltdb.o common/ctdb_message.o common/cmdline.o \ lib/util/debug.o common/rb_tree.o @CTDB_SYSTEM_OBJ@ common/system_common.o \ - common/ctdb_logging.c common/ctdb_fork.o + common/ctdb_logging.o common/ctdb_fork.o CTDB_LIB_OBJ = libctdb/ctdb.o libctdb/io_elem.o libctdb/local_tdb.o \ libctdb/messages.o libctdb/sync.o libctdb/control.o \ diff --git a/tools/ctdb.c b/tools/ctdb.c index 678b555..fb3df8b 100644 --- a/tools/ctdb.c +++ b/tools/ctdb.c @@ -4935,7 +4935,7 @@ static int control_setdbseqnum(struct ctdb_context *ctdb, int argc, const char * } key.dptr = (uint8_t *)discard_const(CTDB_DB_SEQNUM_KEY); - key.dsize = strlen(key.dptr) + 1; + key.dsize = strlen(CTDB_DB_SEQNUM_KEY) + 1; data.dsize = sizeof(new_seqnum); data.dptr = talloc_size(tmp_ctx, data.dsize); -- CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-2.1-13-ga82d3ec
The branch, master has been updated
via a82d3ec12f0fda16d6bfa8442a07595de897c10e (commit)
via a4f622e85168f59417c11705f1734e0352e1d44a (commit)
from 25a20409fb39a94b64c13990c0eba4f75d482ecd (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit a82d3ec12f0fda16d6bfa8442a07595de897c10e
Author: Martin Schwenke mar...@meltin.net
Date: Tue Feb 5 12:09:36 2013 +1100
Logging: Free the ringbuffer in child processes created with ctdb_fork()
At the moment the log ringbuffer is duplicated in every child process.
Althought it is copy-on-write we want to see if it is contributing to
out-of-memory situations when there are a lot of children.
The ringbuffer isn't accessible from any of the children anyway...
Signed-off-by: Martin Schwenke mar...@meltin.net
commit a4f622e85168f59417c11705f1734e0352e1d44a
Author: Martin Schwenke mar...@meltin.net
Date: Tue Feb 5 12:08:11 2013 +1100
Logging: New function ctdb_log_ringbuffer_free()
Signed-off-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
common/ctdb_fork.c |3 +++
common/ctdb_logging.c |9 -
include/ctdb_private.h |2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/common/ctdb_fork.c b/common/ctdb_fork.c
index 24534e6..a11f75a 100644
--- a/common/ctdb_fork.c
+++ b/common/ctdb_fork.c
@@ -59,6 +59,9 @@ pid_t ctdb_fork(struct ctdb_context *ctdb)
ctdb_restore_scheduler(ctdb);
}
ctdb-can_send_controls = false;
+
+ ctdb_log_ringbuffer_free();
+
return 0;
}
diff --git a/common/ctdb_logging.c b/common/ctdb_logging.c
index 09b1df2..105b4df 100644
--- a/common/ctdb_logging.c
+++ b/common/ctdb_logging.c
@@ -85,7 +85,14 @@ void log_ringbuffer(const char *format, ...)
va_end(ap);
}
-
+void ctdb_log_ringbuffer_free(void)
+{
+ if (log_entries != NULL) {
+ free(log_entries);
+ log_entries = NULL;
+ }
+ log_ringbuf_size = 0;
+}
void ctdb_collect_log(struct ctdb_context *ctdb, struct ctdb_get_log_addr
*log_addr)
{
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index 5b519fb..cd0feaa 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -1435,7 +1435,7 @@ void ctdb_collect_log(struct ctdb_context *ctdb, struct
ctdb_get_log_addr *log_a
void ctdb_clear_log(struct ctdb_context *ctdb);
int32_t ctdb_control_get_log(struct ctdb_context *ctdb, TDB_DATA addr);
int32_t ctdb_control_clear_log(struct ctdb_context *ctdb);
-
+void ctdb_log_ringbuffer_free(void);
struct ctdb_log_state *ctdb_fork_with_logging(TALLOC_CTX *mem_ctx,
struct ctdb_context *ctdb,
--
CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-2.1-14-g35da9a7
The branch, master has been updated
via 35da9a7c2a0f5e54e61588c3c3455f06ebc66822 (commit)
from a82d3ec12f0fda16d6bfa8442a07595de897c10e (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit 35da9a7c2a0f5e54e61588c3c3455f06ebc66822
Author: Amitay Isaacs ami...@gmail.com
Date: Tue Jan 22 13:27:20 2013 +1100
daemon: Make sure all the traverse children are terminated if traverse
times out
When traverse times out, callback function is called with key and data set
to
tdb_null. This is also the way to signal end of traverse. So if the
traverse
times out, callback function treats it as traverse ended and frees state
without
calling the destructor.
Keep track if the traverse timed out, so callback function can take
appropriate
action for traverse timeout and traverse end.
Signed-off-by: Amitay Isaacs ami...@gmail.com
---
Summary of changes:
server/ctdb_traverse.c | 14 +++---
1 files changed, 11 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/server/ctdb_traverse.c b/server/ctdb_traverse.c
index 54ee70f..5b709dc 100644
--- a/server/ctdb_traverse.c
+++ b/server/ctdb_traverse.c
@@ -214,6 +214,7 @@ struct ctdb_traverse_all_handle {
ctdb_traverse_fn_t callback;
void *private_data;
uint32_t null_count;
+ bool timedout;
};
/*
@@ -243,6 +244,7 @@ static void ctdb_traverse_all_timeout(struct event_context
*ev, struct timed_eve
DEBUG(DEBUG_ERR,(__location__ Traverse all timeout on database:%s\n,
state-ctdb_db-db_name));
CTDB_INCREMENT_STAT(state-ctdb, timeouts.traverse);
+ state-timedout = true;
state-callback(state-private_data, tdb_null, tdb_null);
}
@@ -288,6 +290,7 @@ static struct ctdb_traverse_all_handle
*ctdb_daemon_traverse_all(struct ctdb_db_
state-callback = callback;
state-private_data = start_state;
state-null_count = 0;
+ state-timedout = false;
talloc_set_destructor(state, ctdb_traverse_all_destructor);
@@ -549,9 +552,14 @@ static void traverse_start_callback(void *p, TDB_DATA key,
TDB_DATA data)
ctdb_dispatch_message(state-ctdb, state-srvid, cdata);
if (key.dsize == 0 data.dsize == 0) {
- /* end of traverse */
- talloc_set_destructor(state, NULL);
- talloc_free(state);
+ if (state-h-timedout) {
+ /* timed out, send TRAVERSE_KILL control */
+ talloc_free(state);
+ } else {
+ /* end of traverse */
+ talloc_set_destructor(state, NULL);
+ talloc_free(state);
+ }
}
}
--
CTDB repository
[SCM] CTDB repository - branch 1.2.40 updated - ctdb-1.2.56-5-g2c203bb
The branch, 1.2.40 has been updated via 2c203bbad887dff6f38e9e47e640c05fad95a7be (commit) via 6b8ccd1d77ba33563c442d780ce75f2bbfae6f62 (commit) via 967549ecf79448a43cead227074e6376441b2fb9 (commit) via b0fbd82cae11fca243cf454cb46d9bb62fdabaf0 (commit) from 9fbd13ea7d3da5e297827e7763f336f484262f47 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2.40 - Log - commit 2c203bbad887dff6f38e9e47e640c05fad95a7be Author: Amitay Isaacs ami...@gmail.com Date: Tue Feb 5 12:59:53 2013 +1100 doc: Rebuild all documentation Signed-off-by: Amitay Isaacs ami...@gmail.com commit 6b8ccd1d77ba33563c442d780ce75f2bbfae6f62 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Tue Mar 20 11:38:20 2012 +1100 DOC document the FetchCollapse tunable Cherry-pick-from: c37aa6f3738693653f64c2fa015ace061da38b5a commit 967549ecf79448a43cead227074e6376441b2fb9 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Tue Mar 20 11:31:59 2012 +1100 FETCH COLLAPSE : Change the fetch-lock collapse to collapse ALL fetches, including fetch-locks into a single command in flight per record. Also add a tunable to enable/disable this optimization for hot records Conflicts: server/ctdb_tunables.c Cherry-pick-from: eafd7bbaaa5931546a96c8beae3cf9a39a49c925 commit b0fbd82cae11fca243cf454cb46d9bb62fdabaf0 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Tue Nov 8 06:55:46 2011 +1100 Record Fetch Collapse: Collapse multiple fetch request into one single request. When multiple clients fetch the same record concurrently, send only one single fetch across the network and deferr all other fetches locally. This improves performance for hot records and reduces cpu load on ctdb. Conflicts: server/ctdb_ltdb_server.c Cherry-pick-from: 82d6946ad8b3348e8b9d3d971f24925ade02d1be --- Summary of changes: doc/ctdb.1|4 +- doc/ctdb.1.html | 158 -- doc/ctdbd.1 | 13 +++- doc/ctdbd.1.html | 98 - doc/ctdbd.1.xml | 23 + doc/onnode.1 | 21 +++-- doc/onnode.1.html | 16 ++-- include/ctdb_private.h|5 + server/ctdb_daemon.c | 208 + server/ctdb_ltdb_server.c | 10 ++ server/ctdb_tunables.c|1 + 11 files changed, 415 insertions(+), 142 deletions(-) Changeset truncated at 500 lines: diff --git a/doc/ctdb.1 b/doc/ctdb.1 index 3b15032..dd2866e 100644 --- a/doc/ctdb.1 +++ b/doc/ctdb.1 @@ -2,12 +2,12 @@ .\ Title: ctdb .\Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\ Generator: DocBook XSL Stylesheets v1.76.1 http://docbook.sf.net/ -.\ Date: 01/02/2013 +.\ Date: 02/05/2013 .\Manual: CTDB - clustered TDB database .\Source: ctdb .\ Language: English .\ -.TH CTDB 1 01/02/2013 ctdb CTDB \- clustered TDB database +.TH CTDB 1 02/05/2013 ctdb CTDB \- clustered TDB database .\ - .\ * Define some portability stuff .\ - diff --git a/doc/ctdb.1.html b/doc/ctdb.1.html index 701b0dd..7e2cae7 100644 --- a/doc/ctdb.1.html +++ b/doc/ctdb.1.html @@ -1,6 +1,6 @@ -htmlheadmeta http-equiv=Content-Type content=text/html; charset=ISO-8859-1titlectdb/titlemeta name=generator content=DocBook XSL Stylesheets V1.75.2/headbody bgcolor=white text=black link=#FF vlink=#840084 alink=#FFdiv class=refentry title=ctdba name=ctdb.1/adiv class=titlepage/divdiv class=refnamedivh2Name/h2pctdb #8212; clustered tdb database management utility/p/divdiv class=refsynopsisdiv title=Synopsish2Synopsis/h2div class=cmdsynopsispcode class=commandctdb [ OPTIONS ] COMMAND .../code /p/divdiv class=cmdsynopsispcode class=commandctdb/code [-n lt;nodegt;] [-Y] [-t lt;timeoutgt;] [-T lt;timelimitgt;] [-? --help] [--usage] [-d --debug=lt;INTEGERgt;] [--socket=lt;filenamegt;]/p/div/divdiv class=refsect1 title=DESCRIPTIONa name=id2485540/ah2DESCRIPTION/h2p +htmlheadmeta http-equiv=Content-Type content=text/html; charset=ISO-8859-1titlectdb/titlemeta name=generator content=DocBook XSL Stylesheets V1.76.1/headbody bgcolor=white text=black link=#FF vlink=#840084 alink=#FFdiv class=refentry title=ctdba name=ctdb.1/adiv class=titlepage/divdiv class=refnamedivh2Name/h2pctdb #8212; clustered tdb database management utility/p/divdiv class=refsynopsisdiv title=Synopsish2Synopsis/h2div class=cmdsynopsispcode class=commandctdb [ OPTIONS ] COMMAND .../code /p/divdiv class=cmdsynopsispcode class=commandctdb/code [-n lt;nodegt;] [-Y] [-t lt;timeoutgt;] [-T lt;timelimitgt;] [-? --help] [--usage] [-d
[SCM] CTDB repository - branch master updated - ctdb-2.1-15-gf1ffe11
The branch, master has been updated
via f1ffe1112b7e342d7f1228ca816a8e5918f893cf (commit)
from 35da9a7c2a0f5e54e61588c3c3455f06ebc66822 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit f1ffe1112b7e342d7f1228ca816a8e5918f893cf
Author: Martin Schwenke mar...@meltin.net
Date: Thu Jan 10 14:39:09 2013 +1100
ctdbd: Message logged at exit should be different for different processes
Some subprocesses print CTDB daemon shutting down when they exit and
this can be confusing.
Signed-off-by: Martin Schwenke mar...@meltin.net
Pair-programmed-with: Amitay Isaacs ami...@gmail.com
---
Summary of changes:
server/ctdb_daemon.c |6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/server/ctdb_daemon.c b/server/ctdb_daemon.c
index fdfd5de..0550fab 100644
--- a/server/ctdb_daemon.c
+++ b/server/ctdb_daemon.c
@@ -40,7 +40,11 @@ static void daemon_incoming_packet(void *, struct
ctdb_req_header *);
static void print_exit_message(void)
{
- DEBUG(DEBUG_NOTICE,(CTDB daemon shutting down\n));
+ if (debug_extra != NULL debug_extra[0] != '\0') {
+ DEBUG(DEBUG_NOTICE,(CTDB %s shutting down\n, debug_extra));
+ } else {
+ DEBUG(DEBUG_NOTICE,(CTDB daemon shutting down\n));
+ }
}
--
CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-2.1-20-ga0ef73e
The branch, master has been updated
via a0ef73e197dc9147f7718e0813fe803ff0b3d54d (commit)
via 9b0d56b16775aa16f33bdfdf831256e085fa3339 (commit)
via 3400b2ed34b6eb9496eb55f1aab6f89d2952060d (commit)
via 0581f9a84e58764d194f4e04064c2c5b393c348b (commit)
via 501461cc3e132d4adee9e91b5d4513a26bae2846 (commit)
from f1ffe1112b7e342d7f1228ca816a8e5918f893cf (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit a0ef73e197dc9147f7718e0813fe803ff0b3d54d
Author: Martin Schwenke mar...@meltin.net
Date: Tue Feb 5 13:16:46 2013 +1100
initscript: export CTDB_EXTERNAL_TRACE
This means it can be set like any other configuration option in the
configuration file, without needing to export it there.
Signed-off-by: Martin Schwenke mar...@meltin.net
commit 9b0d56b16775aa16f33bdfdf831256e085fa3339
Author: Martin Schwenke mar...@meltin.net
Date: Tue Feb 5 14:36:29 2013 +1100
ctdbd: Don't use a fixed length buffer for the hung script command
The amount of data to write into the buffer wasn't constrained
anywhere...
Signed-off-by: Martin Schwenke mar...@meltin.net
commit 3400b2ed34b6eb9496eb55f1aab6f89d2952060d
Author: Martin Schwenke mar...@meltin.net
Date: Tue Feb 5 14:25:01 2013 +1100
ctdbd: Complain loudly if CTDB_DEBUG_HUNG_SCRIPT script isn't executable
This is quite easy to misconfigure by failing to set the execute bit
on the script. Better to complain loudly.
This is a debugging facilty rather than core CTDB functionality, so it
doesn't need a subtle mechanism to disable it at run-time. To disable
the designated script at run-time either edit it to put an exit 0 at
the top or move it aside and symlink to /bin/true.
This is implemented by actually removing the code that checks that the
file exists and is executable. The output from the shell when the
system() function fails is just as useful.
Signed-off-by: Martin Schwenke mar...@meltin.net
commit 0581f9a84e58764d194f4e04064c2c5b393c348b
Author: Martin Schwenke mar...@meltin.net
Date: Tue Feb 5 15:49:52 2013 +1100
ctdbd: Remove command-line option --debug-hung-script
Use an environment variable instead. This just means that the
initscript exports CTDB_DEBUG_HUNG_SCRIPT and the code checks for the
environment variable.
The justification for this simplification is that more debug options
will be arriving soon and we want to handle them consistently without
needing to add a command-line option for each. So, the convention
will be to use an environment variable for each debug option.
Signed-off-by: Martin Schwenke mar...@meltin.net
commit 501461cc3e132d4adee9e91b5d4513a26bae2846
Author: Martin Schwenke mar...@meltin.net
Date: Tue Feb 5 13:08:55 2013 +1100
ctdbd: Remove debug_hung_script_ctx
The only allocation against this context is by
ctdb_fork_with_logging(). This memory is freed by ctdb_log_handler()
anyway. There should be no memory leak.
Signed-off-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
config/ctdb.init |8 +++-
include/ctdb_private.h |3 ---
server/ctdbd.c | 11 ---
server/eventscript.c | 35 +--
4 files changed, 16 insertions(+), 41 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/ctdb.init b/config/ctdb.init
index 9f9b686..dafe8f7 100755
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -95,7 +95,6 @@ build_ctdb_options () {
maybe_set --event-script-dir $CTDB_EVENT_SCRIPT_DIR
maybe_set --transport $CTDB_TRANSPORT
maybe_set -d $CTDB_DEBUGLEVEL
-maybe_set --debug-hung-script $CTDB_DEBUG_HUNG_SCRIPT
maybe_set --notification-script$CTDB_NOTIFY_SCRIPT
maybe_set --start-as-disabled $CTDB_START_AS_DISABLEDyes
maybe_set --start-as-stopped $CTDB_START_AS_STOPPED yes
@@ -108,6 +107,11 @@ build_ctdb_options () {
maybe_set --max-persistent-check-errors
$CTDB_MAX_PERSISTENT_CHECK_ERRORS
}
+export_debug_variables ()
+{
+export CTDB_DEBUG_HUNG_SCRIPT CTDB_EXTERNAL_TRACE
+}
+
# Log given message or stdin to either syslog or a CTDB log file
do_log ()
{
@@ -235,6 +239,8 @@ start() {
build_ctdb_options
+export_debug_variables
+
# make sure we drop any ips that might still be held if previous
# instance of ctdb got killed with -9 or similar
drop_all_public_ips
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index cd0feaa..cf850aa 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -494,7 +494,6 @@ struct ctdb_context {
bool do_setsched;
void
