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/02/07 05:57:30 UTC
[1/6] couchdb commit: updated refs/heads/1843-feature-bigcouch to
bf75f47
Updated Branches:
refs/heads/1843-feature-bigcouch 9bc60be52 -> bf75f4729 (forced update)
Avoid iterating pipe handles for latency
Aparrently the line iterator on these pipe objects introduces a bit of
latency. The delayed_commits test breaks if the server doesn't restart
within a second so this is the fix.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f2393c0e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f2393c0e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f2393c0e
Branch: refs/heads/1843-feature-bigcouch
Commit: f2393c0e51904f5db31a7cc54ccc8b6c1bd99f3a
Parents: 59abf55
Author: Paul J. Davis <pa...@gmail.com>
Authored: Thu Feb 6 17:31:59 2014 -0600
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Thu Feb 6 21:09:31 2014 -0600
----------------------------------------------------------------------
test/javascript/run | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f2393c0e/test/javascript/run
----------------------------------------------------------------------
diff --git a/test/javascript/run b/test/javascript/run
index fa7f391..e120d72 100755
--- a/test/javascript/run
+++ b/test/javascript/run
@@ -55,9 +55,13 @@ def run_couchjs(test):
stdout = sp.PIPE,
stderr = sys.stderr
)
- for line in p.stdout:
+ while True:
+ line = p.stdout.readline()
+ if not line:
+ break
if line.strip() == "restart":
- print "reboot_nodes()"
+ sys.stdout.write("reboot_nodes()" + os.linesep)
+ sys.stdout.flush()
else:
sys.stderr.write(line)
p.wait()
[3/6] couchdb commit: updated refs/heads/1843-feature-bigcouch to
bf75f47
Posted by da...@apache.org.
Reload the configuration for each tests
I accidentally lost this in a rebase or merge somewhere.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/59abf55f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/59abf55f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/59abf55f
Branch: refs/heads/1843-feature-bigcouch
Commit: 59abf55f0f5857f60cc93f68cd459a765102a654
Parents: e1d27bb
Author: Paul J. Davis <pa...@gmail.com>
Authored: Thu Feb 6 17:30:13 2014 -0600
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Thu Feb 6 21:09:31 2014 -0600
----------------------------------------------------------------------
test/javascript/cli_runner.js | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/59abf55f/test/javascript/cli_runner.js
----------------------------------------------------------------------
diff --git a/test/javascript/cli_runner.js b/test/javascript/cli_runner.js
index 6688bae..b63d1e7 100644
--- a/test/javascript/cli_runner.js
+++ b/test/javascript/cli_runner.js
@@ -18,6 +18,7 @@
* test object, return an error.
*/
function runTest() {
+ CouchDB.reloadConfig();
var count = 0;
var start = new Date().getTime();
[4/6] couchdb commit: updated refs/heads/1843-feature-bigcouch to
bf75f47
Posted by da...@apache.org.
Reenable the stats aggregator
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e1d27bbb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e1d27bbb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e1d27bbb
Branch: refs/heads/1843-feature-bigcouch
Commit: e1d27bbb094727ce617977cacffbc02eeab9f139
Parents: 5c1dfb7
Author: Paul J. Davis <pa...@gmail.com>
Authored: Thu Feb 6 17:29:19 2014 -0600
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Thu Feb 6 21:09:31 2014 -0600
----------------------------------------------------------------------
rel/overlay/etc/default.ini | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e1d27bbb/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index f40619f..56e5dcb 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -53,6 +53,7 @@ external_manager={couch_external_manager, start_link, []}
query_servers={couch_proc_manager, start_link, []}
httpd={couch_httpd, start_link, []}
stats_collector={couch_stats_collector, start, []}
+stats_aggregator={couch_stats_aggregator, start, []}
uuids={couch_uuids, start, []}
auth_cache={couch_auth_cache, start_link, []}
vhosts={couch_httpd_vhost, start_link, []}
[5/6] couchdb commit: updated refs/heads/1843-feature-bigcouch to
bf75f47
Posted by da...@apache.org.
Lower case results look better
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4cc6b4ee
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4cc6b4ee
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4cc6b4ee
Branch: refs/heads/1843-feature-bigcouch
Commit: 4cc6b4ee8fa6b05fb8a49d70526c6c29a6e5f0fd
Parents: f2393c0
Author: Paul J. Davis <pa...@gmail.com>
Authored: Thu Feb 6 22:40:20 2014 -0600
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Thu Feb 6 22:40:20 2014 -0600
----------------------------------------------------------------------
test/javascript/run | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4cc6b4ee/test/javascript/run
----------------------------------------------------------------------
diff --git a/test/javascript/run b/test/javascript/run
index e120d72..9b90cc7 100755
--- a/test/javascript/run
+++ b/test/javascript/run
@@ -66,9 +66,9 @@ def run_couchjs(test):
sys.stderr.write(line)
p.wait()
if p.returncode == 0:
- sys.stderr.write("OK" + os.linesep)
+ sys.stderr.write("pass" + os.linesep)
else:
- sys.stderr.write("FAIL" + os.linesep)
+ sys.stderr.write("fail" + os.linesep)
sys.stderr.flush()
@@ -89,12 +89,14 @@ def main():
elif os.path.isfile(name):
tests.append(name)
else:
- name = os.path.join("share/www/script/test", name)
- if os.path.isfile(name):
- tests.append(name)
- elif os.path.isfile(name + ".js"):
- tests.append(name + ".js")
-
+ pname = os.path.join("share/www/script/test", name)
+ if os.path.isfile(pname):
+ tests.append(pname)
+ elif os.path.isfile(pname + ".js"):
+ tests.append(pname + ".js")
+ else:
+ sys.stderr.write("Unknown test: " + name + os.linesep)
+ exit(1)
for test in tests:
run_couchjs(test)
[6/6] couchdb commit: updated refs/heads/1843-feature-bigcouch to
bf75f47
Posted by da...@apache.org.
Align the pass/fail messages
Just trying to fill idle time while watching the test suite run.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/bf75f472
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/bf75f472
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/bf75f472
Branch: refs/heads/1843-feature-bigcouch
Commit: bf75f472973189e1cabfea7b417dfcfa9683a265
Parents: 4cc6b4e
Author: Paul J. Davis <pa...@gmail.com>
Authored: Thu Feb 6 22:56:56 2014 -0600
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Thu Feb 6 22:56:56 2014 -0600
----------------------------------------------------------------------
test/javascript/run | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/bf75f472/test/javascript/run
----------------------------------------------------------------------
diff --git a/test/javascript/run b/test/javascript/run
index 9b90cc7..a0f1112 100755
--- a/test/javascript/run
+++ b/test/javascript/run
@@ -45,8 +45,9 @@ SCRIPTS = """
RUNNER = "test/javascript/cli_runner.js"
-def run_couchjs(test):
- sys.stderr.write(test + " ... ")
+def run_couchjs(test, longname):
+ padding = (longname - len(test)) * " "
+ sys.stderr.write(test + " " + padding)
sys.stderr.flush()
cmd = [COUCHJS, "-H"] + SCRIPTS + [test, RUNNER]
p = sp.Popen(
@@ -97,8 +98,9 @@ def main():
else:
sys.stderr.write("Unknown test: " + name + os.linesep)
exit(1)
+ longname = max(map(len, tests))
for test in tests:
- run_couchjs(test)
+ run_couchjs(test, longname)
[2/6] couchdb commit: updated refs/heads/1843-feature-bigcouch to
bf75f47
Posted by da...@apache.org.
Enable coffescript on dev/run nodes
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/5c1dfb7a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/5c1dfb7a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/5c1dfb7a
Branch: refs/heads/1843-feature-bigcouch
Commit: 5c1dfb7af1f109b176624cee46fa3f002b89dd8c
Parents: 3688eab
Author: Paul J. Davis <pa...@gmail.com>
Authored: Thu Feb 6 17:28:54 2014 -0600
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Thu Feb 6 21:09:31 2014 -0600
----------------------------------------------------------------------
dev/run | 10 +++++++++-
rel/overlay/etc/default.ini | 3 ++-
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5c1dfb7a/dev/run
----------------------------------------------------------------------
diff --git a/dev/run b/dev/run
index 1e40eb1..fc76476 100755
--- a/dev/run
+++ b/dev/run
@@ -62,9 +62,14 @@ def hack_default_ini(opts, node, args, contents):
# Replace couchjs command
couchjs = os.path.join(COUCHDB, "src", "couch", "priv", "couchjs")
mainjs = os.path.join(COUCHDB, "share", "server", "main.js")
+ coffeejs = os.path.join(COUCHDB, "share", "server", "main-coffee.js")
+
repl = "javascript = %s %s" % (couchjs, mainjs)
contents = re.sub("(?m)^javascript.*$", repl, contents)
+ repl = "coffeescript = %s %s" % (couchjs, coffeejs)
+ contents = re.sub("(?m)^coffeescript.*$", repl, contents)
+
return contents
@@ -203,7 +208,10 @@ def reboot_nodes():
def run_command(cmd):
p = sp.Popen(cmd, shell=True, stdout=sp.PIPE, stderr=sys.stderr)
- for line in p.stdout:
+ while True:
+ line = p.stdout.readline()
+ if not line:
+ break
try:
eval(line)
except:
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5c1dfb7a/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index be1745d..f40619f 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -41,7 +41,8 @@ timeout = 600 ; number of seconds before automatic logout
auth_cache_size = 50 ; size is number of cache entries
[query_servers]
-javascript = {{prefix}}/bin/couchjs {{prefix}}/share/couchjs/main.js
+javascript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main.js
+coffeescript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js
[query_server_config]
reduce_limit = true