svn commit: r1139893 - in /couchdb/trunk: etc/couchdb/default.ini.tpl.in src/couchdb/couch_replicator_utils.erl

[fd...@apache.org]

Author: fdmanana
Date: Sun Jun 26 18:12:33 2011
New Revision: 1139893

URL: http://svn.apache.org/viewvc?rev=1139893&view=rev
Log:
Update some replicator defaults

Use smaller worker batch size so that overall progress
is more steady. Also decrease connection pipeline size because
an error in one request will result in all other subsequent
requests in the same connection to be retried, making overall
progress slower - this is more visible when doing multiple
pull replications from the same server.


Modified:
    couchdb/trunk/etc/couchdb/default.ini.tpl.in
    couchdb/trunk/src/couchdb/couch_replicator_utils.erl

Modified: couchdb/trunk/etc/couchdb/default.ini.tpl.in
URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/default.ini.tpl.in?rev=1139893&r1=1139892&r2=1139893&view=diff
==============================================================================
--- couchdb/trunk/etc/couchdb/default.ini.tpl.in (original)
+++ couchdb/trunk/etc/couchdb/default.ini.tpl.in Sun Jun 26 18:12:33 2011
@@ -162,11 +162,11 @@ max_replication_retry_count = 10
 worker_processes = 4
 ; With lower batch sizes checkpoints are done more frequently. Lower batch sizes
 ; also reduce the total amount of used RAM memory.
-worker_batch_size = 1000
+worker_batch_size = 500
 ; Maximum number of HTTP connections and pipeline size (for each connection)
 ; per replication. These two settings have more impact on pull replications.
 http_connections = 20
-http_pipeline_size = 50
+http_pipeline_size = 1
 ; HTTP connection timeout per replication.
 ; Even for very fast/reliable networks it might need to be increased if a remote
 ; database is too busy.

Modified: couchdb/trunk/src/couchdb/couch_replicator_utils.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_replicator_utils.erl?rev=1139893&r1=1139892&r2=1139893&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_replicator_utils.erl (original)
+++ couchdb/trunk/src/couchdb/couch_replicator_utils.erl Sun Jun 26 18:12:33 2011
@@ -211,9 +211,9 @@ maybe_add_trailing_slash(Url) ->
 make_options(Props) ->
     Options = lists:ukeysort(1, convert_options(Props)),
     DefWorkers = couch_config:get("replicator", "worker_processes", "4"),
-    DefBatchSize = couch_config:get("replicator", "worker_batch_size", "1000"),
+    DefBatchSize = couch_config:get("replicator", "worker_batch_size", "500"),
     DefConns = couch_config:get("replicator", "http_connections", "20"),
-    DefPipeSize = couch_config:get("replicator", "http_pipeline_size", "50"),
+    DefPipeSize = couch_config:get("replicator", "http_pipeline_size", "1"),
     DefTimeout = couch_config:get("replicator", "connection_timeout", "30000"),
     {ok, DefSocketOptions} = couch_util:parse_term(
         couch_config:get("replicator", "socket_options",