You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/08/11 23:16:10 UTC
[1/3] couchdb commit: updated refs/heads/windsor-merge to 36c806f
Repository: couchdb
Updated Branches:
refs/heads/windsor-merge 02bd48a97 -> 36c806f0d
Include the node in log messages
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/99a5a0ba
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/99a5a0ba
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/99a5a0ba
Branch: refs/heads/windsor-merge
Commit: 99a5a0ba9f964d0e91b49f7408c0191a861fbc9c
Parents: 02bd48a
Author: Paul J. Davis <pa...@gmail.com>
Authored: Mon Aug 11 14:02:20 2014 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Mon Aug 11 14:02:20 2014 -0500
----------------------------------------------------------------------
rel/files/sys.config | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/99a5a0ba/rel/files/sys.config
----------------------------------------------------------------------
diff --git a/rel/files/sys.config b/rel/files/sys.config
index e9a7bd2..6bfc775 100644
--- a/rel/files/sys.config
+++ b/rel/files/sys.config
@@ -17,7 +17,13 @@
{handlers, [
{lager_console_backend, [debug, {
lager_default_formatter,
- [date, " ", time," [",severity,"] ",pid, " ", message, "\n"]
+ [
+ date, " ", time,
+ " [", severity, "] ",
+ node, " ", pid, " ",
+ message,
+ "\n"
+ ]
}]}
]}
]}
[2/3] couchdb commit: updated refs/heads/windsor-merge to 36c806f
Posted by da...@apache.org.
Disabling this assertion until we figure out lager
The change to lager changed how w configure logging in CouchDB. We'll
need to figure out if we want to update things so that we can configure
lager from the INI files at which point we can either reenable this test
or remove it.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e01e3a4f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e01e3a4f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e01e3a4f
Branch: refs/heads/windsor-merge
Commit: e01e3a4f742222327dc84e0f0ba6818c11ed4213
Parents: 99a5a0b
Author: Paul J. Davis <pa...@gmail.com>
Authored: Mon Aug 11 14:13:56 2014 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Mon Aug 11 14:13:56 2014 -0500
----------------------------------------------------------------------
share/www/script/test/config.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e01e3a4f/share/www/script/test/config.js
----------------------------------------------------------------------
diff --git a/share/www/script/test/config.js b/share/www/script/test/config.js
index 193aa89..37b339b 100644
--- a/share/www/script/test/config.js
+++ b/share/www/script/test/config.js
@@ -53,7 +53,7 @@ couchTests.config = function(debug) {
T(config.couchdb.database_dir);
T(config.daemons.httpd);
T(config.httpd_global_handlers._config);
- T(config.log.level);
+ // T(config.log.level);
T(config.query_servers.javascript);
// test that settings can be altered, and that an undefined whitelist allows any change
[3/3] couchdb commit: updated refs/heads/windsor-merge to 36c806f
Posted by da...@apache.org.
Fix replication.js test
Tweak hard coded assumptions about update_seq ordering for documents
posted to _bulk_updates. See the comment in replication.js for more
information.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/36c806f0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/36c806f0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/36c806f0
Branch: refs/heads/windsor-merge
Commit: 36c806f0d57631093f65745eec98b3d3cd49d893
Parents: e01e3a4
Author: Paul J. Davis <pa...@gmail.com>
Authored: Mon Aug 11 16:15:16 2014 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Mon Aug 11 16:15:16 2014 -0500
----------------------------------------------------------------------
share/www/script/test/replication.js | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/36c806f0/share/www/script/test/replication.js
----------------------------------------------------------------------
diff --git a/share/www/script/test/replication.js b/share/www/script/test/replication.js
index 7e4ecc1..eba2d58 100644
--- a/share/www/script/test/replication.js
+++ b/share/www/script/test/replication.js
@@ -700,11 +700,24 @@ couchTests.replication = function(debug) {
TEquals(true, repResult.history instanceof Array);
TEquals(1, repResult.history.length);
- // NOT 31 (31 is db seq for last doc - the ddoc, which was not replicated)
- TEquals(30, repResult.source_last_seq);
+ // We (incorrectly) don't record update sequences for things
+ // that don't pass the changse feed filter. Historically the
+ // last document to pass was the second to last doc which has
+ // an update sequence of 30. Work that has been applied to avoid
+ // conflicts from duplicate IDs breaking _bulk_docs updates added
+ // a sort to the logic which changes this. Now the last document
+ // to pass has an doc id of "8" and is at update_seq 29 (because only
+ // "9" and the design doc are after it).
+ //
+ // In the future the fix ought to be that we record that update
+ // sequence of the database. BigCouch has some existing work on
+ // this in the clustered case because if you have very few documents
+ // that pass the filter then (given single node's behavior) you end
+ // up having to rescan a large portion of the database.
+ TEquals(29, repResult.source_last_seq);
TEquals(0, repResult.history[0].start_last_seq);
- TEquals(30, repResult.history[0].end_last_seq);
- TEquals(30, repResult.history[0].recorded_seq);
+ TEquals(29, repResult.history[0].end_last_seq);
+ TEquals(29, repResult.history[0].recorded_seq);
// 16 => 15 docs with even integer field + 1 doc with string field "7"
TEquals(16, repResult.history[0].missing_checked);
TEquals(16, repResult.history[0].missing_found);