MB-8415 set minum num_threads back to 2 and set default to 3

Change-Id: Ib82f15f31155dd8f9e4f37073b27115f300549d2 Reviewed-on: http://review.couchbase.org/26796 Reviewed-by: Jin Lim <jin@couchbase.com> Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com> Tested-by: Jin Lim <jin@couchbase.com>
membase · Jun 8, 2013 · e99c897 · e99c897
1 parent 5afa759
commit e99c897
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/priv/public/index.html b/priv/public/index.html
@@ -1760,7 +1760,7 @@ <h1><span class="when-editing">Configure Bucket</span><span class="when-creating
       <legend>Disk Read-Write Concurrency</legend>
 
       <label class="for-threads-number">
-        <span>Provision number of reader/writer workers:</span><input name="threadsNumber" class="focusme" size="1" maxlength="1"/><span style="margin-left: 0.5em;">(Min = 1, Max = 8)</span><br><i class="error-container err-threadsNumber"></i>
+        <span>Provision number of reader/writer workers:</span><input name="threadsNumber" class="focusme" size="1" maxlength="1"/><span style="margin-left: 0.5em;">(Min = 2, Max = 8)</span><br><i class="error-container err-threadsNumber"></i>
       </label>
     </fieldset> <!-- .persistent-only -->
 
@@ -2568,7 +2568,7 @@ <h2>Replicas</h2>
         <h2>Disk Read-Write Concurrency</h2>
 
         <label class="for-threads-number">
-          <span>Provision number of reader/writer workers:</span><input name="threadsNumber" class="focusme" size="1" maxlength="1"/><span style="margin-left: 0.5em;">(Min = 1, Max = 8)</span><br><i class="error-container err-threadsNumber"></i>
+          <span>Provision number of reader/writer workers:</span><input name="threadsNumber" class="focusme" size="1" maxlength="1"/><span style="margin-left: 0.5em;">(Min = 2, Max = 8)</span><br><i class="error-container err-threadsNumber"></i>
         </label>
       </div><!-- .persistent-only -->
 

diff --git a/src/menelaus_web_buckets.erl b/src/menelaus_web_buckets.erl
@@ -191,7 +191,7 @@ build_bucket_info(PoolId, Id, BucketConfig, InfoLevel, LocalAddr) ->
                  stable -> BucketCaps;
                  normal ->
                      [{replicaNumber, ns_bucket:num_replicas(BucketConfig)},
-                      {threadsNumber, proplists:get_value(num_threads, BucketConfig, 2)},
+                      {threadsNumber, proplists:get_value(num_threads, BucketConfig, 3)},
                       {quota, {struct, [{ram, ns_bucket:ram_quota(BucketConfig)},
                                         {rawRAM, ns_bucket:raw_ram_quota(BucketConfig)}]}},
                       {basicStats, {struct, menelaus_stats:basic_stats(Id)}}
@@ -919,15 +919,15 @@ parse_validate_flush_enabled("1") -> {ok, flush_enabled, true};
 parse_validate_flush_enabled(_ReplicaValue) -> {error, flushEnabled, <<"flushEnabled can only be 1 or 0">>}.
 
 parse_validate_threads_number(undefined) ->
-    {ok, num_threads, 2};
+    {ok, num_threads, 3};
 parse_validate_threads_number(NumThreads) ->
-    case menelaus_util:parse_validate_number(NumThreads, 1, 8) of
+    case menelaus_util:parse_validate_number(NumThreads, 2, 8) of
         invalid ->
             {error, threadsNumber,
-             <<"The number of threads must be an integer between 1 and 8">>};
+             <<"The number of threads must be an integer between 2 and 8">>};
         too_small ->
             {error, threadsNumber,
-             <<"The number of threads can't be less than 1">>};
+             <<"The number of threads can't be less than 2">>};
         too_large ->
             {error, threadsNumber,
              <<"The number of threads can't be greater than 8">>};

diff --git a/src/ns_bucket.erl b/src/ns_bucket.erl
@@ -99,7 +99,7 @@ config_string(BucketName) ->
                 CouchPort = ns_config:search_node_prop(Config, memcached, mccouch_port, 11213),
                 AccessLog = filename:join(DBSubDir, "access.log"),
                 NumVBuckets = proplists:get_value(num_vbuckets, BucketConfig),
-                NumThreads = proplists:get_value(num_threads, BucketConfig, 2),
+                NumThreads = proplists:get_value(num_threads, BucketConfig, 3),
                 %% MemQuota is our per-node bucket memory limit
                 CFG =
                     io_lib:format(

diff --git a/src/samples_loader_tasks.erl b/src/samples_loader_tasks.erl
@@ -172,4 +172,4 @@ create_sample_bucket(Name) ->
                                         {auth_type, sasl},
                                         {sasl_password, []},
                                         {ram_quota, 100 * 1024 * 1024},
-                                        {num_threads, 2}]).
+                                        {num_threads, 3}]).