[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 959b9ea ctdb-recoverd: Process all the records for vacuum fetch in
a loop
via 257311e ctdb-vacuum: Do not delete VACUUM MIGRATED records
immediately
via dbb1958 ctdb-vacuum: Use non-blocking lock when traversing delete
tree
via d35f512 ctdb-vacuum: Use non-blocking lock when traversing delete
queue
via e4597f8 ctdb-vacuum: Stagger vacuuming child processes
via a0628e3 ctdb-vacuum: Track time for vacuuming in database statistics
from 8f4813f vfs_fruit: add AAPL options
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 959b9ea0ef85c57ffc84d66a6e5e855868943391
Author: Amitay Isaacs ami...@gmail.com
Date: Wed Apr 23 18:02:39 2014 +1000
ctdb-recoverd: Process all the records for vacuum fetch in a loop
Processing one migration request at a time is very slow and processing
a batch of records can take longer than VacuumInterval. This causes
subsequent vacuum fetch requests to be dropped. The dropped records
can accumulate quickly and will cause the vacuum database traverse to
be quite expensive.
Signed-off-by: Amitay Isaacs ami...@gmail.com
Reviewed-by: Martin Schwenke mar...@meltin.net
Autobuild-User(master): Amitay Isaacs ami...@samba.org
Autobuild-Date(master): Fri Dec 5 17:06:58 CET 2014 on sn-devel-104
commit 257311e337065f089df688cbf261d2577949203d
Author: Amitay Isaacs ami...@gmail.com
Date: Mon Apr 14 14:53:25 2014 +1000
ctdb-vacuum: Do not delete VACUUM MIGRATED records immediately
Such records should be processed by the local vacuuming daemon to ensure
that all the remote copies have been deleted first.
Signed-off-by: Amitay Isaacs ami...@gmail.com
Reviewed-by: Martin Schwenke mar...@meltin.net
commit dbb1958284657f26a868705e5f9612bc377fd5e0
Author: Amitay Isaacs ami...@gmail.com
Date: Thu Nov 6 09:33:50 2014 +1100
ctdb-vacuum: Use non-blocking lock when traversing delete tree
This avoids vacuuming getting in the way of ctdb daemon to process
record requests.
Signed-off-by: Amitay Isaacs ami...@gmail.com
Reviewed-by: Martin Schwenke mar...@meltin.net
commit d35f512cd972ac1f732fe998b2179242d042082d
Author: Amitay Isaacs ami...@gmail.com
Date: Mon Apr 14 13:18:41 2014 +1000
ctdb-vacuum: Use non-blocking lock when traversing delete queue
This avoids vacuuming getting in the way of ctdb daemon to process
record requests.
Signed-off-by: Amitay Isaacs ami...@gmail.com
Reviewed-by: Martin Schwenke mar...@meltin.net
commit e4597f8771f42cf315bd163c18b2f27147d3de5f
Author: Amitay Isaacs ami...@gmail.com
Date: Fri Feb 21 14:58:00 2014 +1100
ctdb-vacuum: Stagger vacuuming child processes
This prevents multiple child processes being forked at the same time
for vacuuming TDBs.
Signed-off-by: Amitay Isaacs ami...@gmail.com
Reviewed-by: Martin Schwenke mar...@meltin.net
commit a0628e317df76c7c38a7cca9c3090077fa352899
Author: Amitay Isaacs ami...@gmail.com
Date: Tue Feb 11 14:23:28 2014 +1100
ctdb-vacuum: Track time for vacuuming in database statistics
Signed-off-by: Amitay Isaacs ami...@gmail.com
Reviewed-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
ctdb/include/ctdb_protocol.h | 3 +++
ctdb/server/ctdb_ltdb_server.c | 5 +
ctdb/server/ctdb_recoverd.c| 5 +
ctdb/server/ctdb_vacuum.c | 24 ++--
ctdb/tools/ctdb.c | 8
5 files changed, 31 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index 725e426..15d9fc5 100644
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -717,6 +717,9 @@ struct ctdb_db_statistics {
struct latency_counter latency;
uint32_t buckets[MAX_COUNT_BUCKETS];
} locks;
+ struct {
+ struct latency_counter latency;
+ } vacuum;
uint32_t db_ro_delegations;
uint32_t db_ro_revokes;
uint32_t hop_count_bucket[MAX_COUNT_BUCKETS];
diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c
index 8fb2bc7..9ac2217 100644
--- a/ctdb/server/ctdb_ltdb_server.c
+++ b/ctdb/server/ctdb_ltdb_server.c
@@ -115,6 +115,11 @@ static int ctdb_ltdb_store_server(struct ctdb_db_context
*ctdb_db,
* fails. So storing the empty record makes sure that we do not
* need to change the client code.
*/
+ if ((header-flags CTDB_REC_FLAG_VACUUM_MIGRATED)
+ (ctdb_db-ctdb-pnn == header-dmaster)) {
+ keep = true;
+ schedule_for_deletion = true;
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via abf867d inotify: Properly handle cross-dir renames via d6e2db6 lib: Fix signed/unsigned comparisons via accb6b4 s4: torture: leases. Simple lease_v2 rename test v2_rename. via f435f1b s3: leases: Make SMB2 setinfo SMB2_FILE_RENAME_INFORMATION_INTERNAL async. via bddd600 s3: leases: send_break_message() public. via cd6269c s3: leases: Make aio_add_req_to_fsp() public. via 4061b8d s3: leases : Cope with renaming leased open files. via 59cd638 s3: leases: Add leases_db_rename() to cope with renaming a leased file. from 959b9ea ctdb-recoverd: Process all the records for vacuum fetch in a loop https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit abf867da764b60e94c43ab9ec1d5338ac99ec18d Author: Volker Lendecke v...@samba.org Date: Fri Dec 5 15:38:45 2014 + inotify: Properly handle cross-dir renames When watching two subdirectories with inotify and a file is moved between both, we get a IN_MOVED_FROM for the source watch and a IN_MOVED_TO for the destination watch. Without this patch we create a NOTIFY_ACTION_OLD_NAME for the old directory. We hold this back in notify_fsp, expecting the NEW_NAME immediately after it. In the cross-directory rename case this does not work, we'll not get the NEW_NAME, there is no NEW_NAME in that directory. This patch changes us to create NOTIFY_ACTION_REMOVED and NOTIFY_ACTION_ADDED in this case. Not sure this is right, but at least it is better than before: We get something at all. This is more likely to happen with the notifyd approach, as there we inotify-watch many subdirectories from one process. Without nootifyd you had to have two explorer windows open and do a nfs or local mv between those two directories to find this. Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org Autobuild-User(master): Jeremy Allison j...@samba.org Autobuild-Date(master): Fri Dec 5 21:01:54 CET 2014 on sn-devel-104 commit d6e2db6f52fa26ae3c044ff56ebf814313ca4eb8 Author: Volker Lendecke v...@samba.org Date: Wed Dec 3 15:54:19 2014 +0100 lib: Fix signed/unsigned comparisons Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit accb6b4fb8184ebe176dce76bda6b1f02584b99e Author: Jeremy Allison j...@samba.org Date: Thu Dec 4 21:29:47 2014 -0800 s4: torture: leases. Simple lease_v2 rename test v2_rename. Proves that renaming files can break handle leases. With the previous patches we now pass this. Pair-Programmed-With: Stefan Metzmacher me...@samba.org Signed-off-by: Jeremy Allison j...@samba.org Signed-off-by: Stefan Metzmacher me...@samba.org commit f435f1b3acb75c065166e3077c01acbd88601f34 Author: Jeremy Allison j...@samba.org Date: Thu Dec 4 21:19:32 2014 -0800 s3: leases: Make SMB2 setinfo SMB2_FILE_RENAME_INFORMATION_INTERNAL async. If there are any RH leases we must break them to read and must wait for the client response before doing the rename. Pair-Programmed-With: Stefan Metzmacher me...@samba.org Signed-off-by: Jeremy Allison j...@samba.org Signed-off-by: Stefan Metzmacher me...@samba.org commit bddd6004ee400cf90d08d174e9fb867a129433e7 Author: Jeremy Allison j...@samba.org Date: Thu Dec 4 21:15:24 2014 -0800 s3: leases: send_break_message() public. We're going to need this to allow async SMB2 setinfo renames to send lease break messages as well as the open code. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit cd6269c9ea601e89bf9cd8b6c73f79cf594b8c7f Author: Jeremy Allison j...@samba.org Date: Thu Dec 4 21:13:33 2014 -0800 s3: leases: Make aio_add_req_to_fsp() public. We're going to need this to stop handle closures with outstanding async SMB2 renames causing a crash. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit 4061b8db1bbdb53a0755277b1f0ceeccb6dc7eaa Author: Jeremy Allison j...@samba.org Date: Thu Dec 4 10:14:23 2014 -0800 s3: leases : Cope with renaming leased open files. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org commit 59cd638a1d241fae037d45e9ed1f029f65ac9080 Author: Jeremy Allison j...@samba.org Date: Thu Dec 4 10:13:47 2014 -0800 s3: leases: Add leases_db_rename() to cope with renaming a leased file. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org --- Summary of changes: lib/util/data_blob.c | 4 +-
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via a07af1b ctdb-tests: Need to drop public IPs in kill-failover tests via 7f3f3b1 ctdb-daemon: Gratuitous ARP equivalent for IPv6 is neighbor advertisement via 3a2c8bb ctdb-tests: More debug on SSH failure via 49449f6 ctdb-tests: Make tcpdump output more verbose via a7e7d95 ctdb-tests: Use ip neigh command instead of arp via 0f3d975 ctdb-tests: Generalise the gratarp and tickle sniffing code for IPv6 via 3135a8c ctdb-tests: Match IPv6 connections in netstat output via 255705c ctdb-tests: Use ping_wrapper to do relevant ping or ping6 via 62acf59 ctdb-tests: Extend regexps to handle IPv6 address matching via 62164ec ctdb-tests: Bracket IP addresses in NFS mounts and scp command (for IPv6) via d9d07ff ctdb-tests: Try to handle IPv6 addresses for local daemons via 2a83b74 ctdb-tests: Extend regexp to match IPv6 addresses via 2d48079 ctdb-tools: Bracket IP addresses in onnode (for IPv6) via e3c59d8 ctdb-daemon: Fix IP address comparisons for IPv6 addresses via d0b2375 ctdb-scripts: Wait until IPv6 addresses are not tentative via d4212bd ctdb-eventscripts: Specify broadcast optionally to ip addr add via 108b1be ctdb-daemon: Trust vnn-interface for an IP when releasing it via 6471541 ctdb-scripts: Make 10.interface IPv6-safe via c314ae0 ctdb-scripts: New functions ip6tables() and iptables_wrapper() via ed029ae ctdb-scripts: Add IPv6 addresses support in ip_maskbits_iface() via b41c1bd ctdb-utils: Update Nagios code to use ctdb -X via 0d61b61 ctdb-doc: Update examples to use ctdb -X via 550fb8c ctdb-tool: Fix ctdb -Y ifaces output to have trailing delimiters via 2c4de75 ctdb-tests: Update integration tests to use ctdb -X via 55df9c8 ctdb-tools: Update onnode and ctdb-diagnostics to use ctdb -X via 4940f19 ctdb-scripts: Update eventscripts to use ctdb -X instead of ctdb -Y via 7428f80 ctdb-tools: Add -X option for machine parsable output with separator '|' via 3b90e45 ctdb-tools: Add -x option to specify delimiter for machine readable output via fbacbb9 ctdb-tools: Produce machine readable output with new function printm() from abf867d inotify: Properly handle cross-dir renames https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a07af1bb56a76d1a7ab856547c801499fc17b21b Author: Martin Schwenke mar...@meltin.net Date: Wed Dec 3 12:10:07 2014 +1100 ctdb-tests: Need to drop public IPs in kill-failover tests These tests simulate a dead node rather than a CTDB failure, so drop IP addresses when killing a node to avoid problems with duplicates. To cope with a CTDB failure a watchdog would be needed to ensure that the public IPs are dropped when CTDB dies. Let's not do that now. Signed-off-by: Martin Schwenke mar...@meltin.net Reviewed-by: Amitay Isaacs ami...@gmail.com Autobuild-User(master): Martin Schwenke mart...@samba.org Autobuild-Date(master): Fri Dec 5 23:29:39 CET 2014 on sn-devel-104 commit 7f3f3b15d52c4047cbcb1c3e81f65675c8708f5f Author: Martin Schwenke mar...@meltin.net Date: Tue Dec 2 10:57:12 2014 +1100 ctdb-daemon: Gratuitous ARP equivalent for IPv6 is neighbor advertisement Not neighbour solicitation. See: https://tools.ietf.org/html/rfc4861#section-4.4 Signed-off-by: Martin Schwenke mar...@meltin.net Reviewed-by: Amitay Isaacs ami...@gmail.com commit 3a2c8bb906fac4e2611a28ead6b4290ddc93de54 Author: Martin Schwenke mar...@meltin.net Date: Wed Dec 3 12:09:12 2014 +1100 ctdb-tests: More debug on SSH failure Signed-off-by: Martin Schwenke mar...@meltin.net Reviewed-by: Amitay Isaacs ami...@gmail.com commit 49449f66fca52d5044d2e486570562df866adf57 Author: Martin Schwenke mar...@meltin.net Date: Mon Dec 1 13:30:29 2014 +1100 ctdb-tests: Make tcpdump output more verbose This helps with debugging. Signed-off-by: Martin Schwenke mar...@meltin.net Reviewed-by: Amitay Isaacs ami...@gmail.com commit a7e7d95de9cf09652cef63d65484bbb0faa42e1c Author: Martin Schwenke mar...@meltin.net Date: Sat Nov 29 20:01:20 2014 +1100 ctdb-tests: Use ip neigh command instead of arp Extend select_test_node_and_ips() to set $test_prefix in addition to $test_ip. Signed-off-by: Martin Schwenke mar...@meltin.net Reviewed-by: Amitay Isaacs ami...@gmail.com commit 0f3d9752c4677b2f3b5ee47a0b8f973b4260ef57 Author: Martin Schwenke mar...@meltin.net Date: Mon Dec 1 14:07:57 2014 +1100 ctdb-tests: Generalise the gratarp and tickle sniffing code for IPv6 Signed-off-by: Martin Schwenke mar...@meltin.net Reviewed-by: Amitay Isaacs ami...@gmail.com Pair-programmed-with:
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via ecd0e6e rwrap: Bump version to 1.1.0. via 5c0ada1 rwrap: Don't dereference NULL when skipping broken records. via 3b3fc1a rwrap: Support asking for A via CNAME via f5c156a rwrap: Recursively add additional data via aa78268 rwrap: Make the rwrap_fake_* functions only fake RRs. via 2782877 rwrap: CNAME record can recurse into A, or CNAME via 917c3f0 rwrap: SRV record can recurse into A or . via 0d128c5 rwrap: Use the rwrap_fake_rr structure instead of raw uint8_t pointers. via 154fa40 rwrap: Add data structures and functions to represent and manipulate RRs. via 253753c rwrap: Correctly calculate the response size and return it. via 849bfe0 rwrap: Handle trailing dot in dns names. via dab427e rwrap: Compare dns names case insensitive. via 8bf949f lib: Add resolv_wrapper version 1.0.0. via 70bbb1d selftest: Add the normal dns name as an alias for the main DC. via 9cde3ae testprogs: Set functional domain level to 2003. from a07af1b ctdb-tests: Need to drop public IPs in kill-failover tests https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit ecd0e6e985ff8719963e31e1395b9ccbd38d94e1 Author: Andreas Schneider a...@samba.org Date: Wed Dec 3 15:45:10 2014 +0100 rwrap: Bump version to 1.1.0. Signed-off-by: Andreas Schneider a...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org Autobuild-User(master): Andrew Bartlett abart...@samba.org Autobuild-Date(master): Sat Dec 6 01:54:12 CET 2014 on sn-devel-104 commit 5c0ada1d570175498a4b97628b6f1dc45a72109a Author: Jakub Hrozek jakub.hro...@gmail.com Date: Wed Dec 3 15:45:09 2014 +0100 rwrap: Don't dereference NULL when skipping broken records. CID: 83426 CID: 83425 Signed-off-by: Jakub Hrozek jakub.hro...@gmail.com Reviewed-by: Michael Adam ob...@samba.org Reviewed-by: Andreas Schneider a...@samba.org Signed-off-by: Andreas Schneider a...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org commit 3b3fc1a21830d136bc1e571d08913dbec5b06336 Author: Jakub Hrozek jakub.hro...@gmail.com Date: Wed Dec 3 15:45:08 2014 +0100 rwrap: Support asking for A via CNAME Adds support for querying for an A record using a name that only expands into a CNAME. Signed-off-by: Jakub Hrozek jakub.hro...@gmail.com Reviewed-by: Andreas Schneider a...@samba.org Reviewed-by: Guenther Deschner g...@samba.org Signed-off-by: Andreas Schneider a...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org commit f5c156aac20b468b4324114515e1a951e1304713 Author: Jakub Hrozek jakub.hro...@gmail.com Date: Wed Dec 3 15:45:07 2014 +0100 rwrap: Recursively add additional data Change how we construct the fake answer such that the header and question are added first, then the answers and finally additional data. Signed-off-by: Jakub Hrozek jakub.hro...@gmail.com Reviewed-by: Andreas Schneider a...@samba.org Reviewed-by: Guenther Deschner g...@samba.org Signed-off-by: Andreas Schneider a...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org commit aa78268a49062d3bd1cb907828a250a01ebbd59a Author: Jakub Hrozek jakub.hro...@gmail.com Date: Wed Dec 3 15:45:06 2014 +0100 rwrap: Make the rwrap_fake_* functions only fake RRs. The rwrap_fake_common() function did too much. Remove it and use separate functions to add fake header and question sections. The rwrap_fake_$RR functions will receive packet including the header and question and only add its RR data. This will allow recursive processing later. Signed-off-by: Jakub Hrozek jakub.hro...@gmail.com Reviewed-by: Andreas Schneider a...@samba.org Reviewed-by: Guenther Deschner g...@samba.org Signed-off-by: Andreas Schneider a...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org commit 27828774c3633389b5ce5397d8e25fab2e278624 Author: Jakub Hrozek jakub.hro...@gmail.com Date: Wed Dec 3 15:45:05 2014 +0100 rwrap: CNAME record can recurse into A, or CNAME Signed-off-by: Jakub Hrozek jakub.hro...@gmail.com Reviewed-by: Andreas Schneider a...@samba.org Reviewed-by: Guenther Deschner g...@samba.org Signed-off-by: Andreas Schneider a...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org commit 917c3f08440c302511bdf06b5ac11b42630bdd28 Author: Jakub Hrozek jakub.hro...@gmail.com Date: Wed Dec 3 15:45:04 2014 +0100 rwrap: SRV record can recurse into A or . When querying for a SRV record, we'll need to include A or records in additional section. Therefore, keep querying the host file until we can either recurse the A/ records or reach the recursion limit Signed-off-by: Jakub
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/2014-12-06-0513/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2014-12-06-0513/samba.stderr http://git.samba.org/autobuild.flakey/2014-12-06-0513/samba.stdout The top commit at the time of the failure was: commit ecd0e6e985ff8719963e31e1395b9ccbd38d94e1 Author: Andreas Schneider a...@samba.org Date: Wed Dec 3 15:45:10 2014 +0100 rwrap: Bump version to 1.1.0. Signed-off-by: Andreas Schneider a...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org Autobuild-User(master): Andrew Bartlett abart...@samba.org Autobuild-Date(master): Sat Dec 6 01:54:12 CET 2014 on sn-devel-104
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/2014-12-06-0813/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2014-12-06-0813/samba.stderr http://git.samba.org/autobuild.flakey/2014-12-06-0813/samba.stdout The top commit at the time of the failure was: commit ecd0e6e985ff8719963e31e1395b9ccbd38d94e1 Author: Andreas Schneider a...@samba.org Date: Wed Dec 3 15:45:10 2014 +0100 rwrap: Bump version to 1.1.0. Signed-off-by: Andreas Schneider a...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org Autobuild-User(master): Andrew Bartlett abart...@samba.org Autobuild-Date(master): Sat Dec 6 01:54:12 CET 2014 on sn-devel-104
