MB-33410: Increase max bucket limit to 30.

The latest certification testing indicates that the limit on the
maximum number of buckets supported in a cluster can be safely
increased to 30.

Change-Id: I00a802eee44b24d236073f697a15201aaaf8f6f2
Reviewed-on: http://review.couchbase.org/106472
Tested-by: Ajit Yagaty <[email protected]>
Well-Formed: Build Bot <[email protected]>
Reviewed-by: Artem Stemkovski <[email protected]>

Author: ajityagaty

include/ns_common.hrl

@@ -59,6 +59,7 @@
 
 -define(VBMAP_HISTORY_SIZE, 10).
 -define(NUM_NS_MEMCACHED_DATA_INSTANCES, 4).
+-define(MAX_BUCKETS_SUPPORTED, 30).
 
 -define(DEFAULT_LOG_FILENAME, "info.log").
 -define(ERRORS_LOG_FILENAME, "error.log").

src/menelaus_web_buckets.erl

@@ -681,7 +681,7 @@ do_bucket_create(Req, Name, ParsedProps) ->
     end.
 
 do_bucket_create(Req, Name, Params, Ctx) ->
-    MaxBuckets = ns_config:read_key_fast(max_bucket_count, 10),
+    MaxBuckets = ns_bucket:get_max_buckets(),
     case length(Ctx#bv_ctx.all_buckets) >= MaxBuckets of
         true ->
             {{struct, [{'_', iolist_to_binary(io_lib:format("Cannot create more than ~w buckets", [MaxBuckets]))}]}, 400};

src/menelaus_web_pools.erl

@@ -212,7 +212,7 @@ do_build_pool_info(Id, InfoLevel, Stability, LocalAddr) ->
          build_controllers(UUID),
          build_rebalance_params(Id, UUID),
          {nodeStatusesUri, <<"/nodeStatuses">>},
-         {maxBucketCount, ns_config:read_key_fast(max_bucket_count, 10)},
+         {maxBucketCount, ns_bucket:get_max_buckets()},
          {autoCompactionSettings,
           menelaus_web_autocompaction:build_global_settings(Config)},
          {tasks, {struct, [{uri, TasksURI}]}},

src/menelaus_web_settings.erl

@@ -130,7 +130,7 @@ conf(internal) ->
      {rebalance_moves_before_compaction, rebalanceMovesBeforeCompaction, 64, get_number(1, 1024)},
      {{couchdb, max_parallel_indexers}, maxParallelIndexers, <<>>, get_number(1, 1024)},
      {{couchdb, max_parallel_replica_indexers}, maxParallelReplicaIndexers, <<>>, get_number(1, 1024)},
-     {max_bucket_count, maxBucketCount, 10, get_number(1, 8192)},
+     {max_bucket_count, maxBucketCount, ?MAX_BUCKETS_SUPPORTED, get_number(1, 8192)},
      {{request_limit, rest}, restRequestLimit, undefined, get_number(0, 99999, undefined)},
      {{request_limit, capi}, capiRequestLimit, undefined, get_number(0, 99999, undefined)},
      {drop_request_memory_threshold_mib, dropRequestMemoryThresholdMiB, undefined,

src/ns_bucket.erl

@@ -86,9 +86,11 @@
          bucket_view_nodes/1,
          bucket_config_view_nodes/1,
          get_num_vbuckets/0,
+         get_max_buckets/0,
          config_upgrade_to_50/1,
          config_upgrade_to_51/1,
-         config_upgrade_to_55/1]).
+         config_upgrade_to_55/1,
+         config_upgrade_to_madhatter/1]).
 
 
 %%%===================================================================
@@ -527,6 +529,9 @@ validate_bucket_config(BucketName, NewConfig) ->
             {error, {invalid_bucket_name, BucketName}}
     end.
 
+get_max_buckets() ->
+    ns_config:read_key_fast(max_bucket_count, ?MAX_BUCKETS_SUPPORTED).
+
 get_num_vbuckets() ->
     case ns_config:search(couchbase_num_vbuckets_default) of
         false ->
@@ -918,6 +923,14 @@ config_upgrade_to_55(Config) ->
           end, Buckets),
     [{set, buckets, [{configs, NewBuckets}]}].
 
+config_upgrade_to_madhatter(Config) ->
+    MaxBuckets = case ns_config:search(Config, max_bucket_count) of
+                     false ->
+                         ?MAX_BUCKETS_SUPPORTED;
+                     {value, V} ->
+                         erlang:max(V, ?MAX_BUCKETS_SUPPORTED)
+                 end,
+    [{set, max_bucket_count, MaxBuckets}].
 
 -ifdef(TEST).
 min_live_copies_test() ->

src/ns_config_default.erl

@@ -109,7 +109,7 @@ default() ->
      {{node, node(), is_enterprise}, IsEnterprise},
      {{node, node(), saslauthd_enabled}, SASLAuthdEnabled},
      {index_aware_rebalance_disabled, false},
-     {max_bucket_count, 10},
+     {max_bucket_count, ?MAX_BUCKETS_SUPPORTED},
      {autocompaction, [{database_fragmentation_threshold, {30, undefined}},
                        {view_fragmentation_threshold, {30, undefined}}]},
      {set_view_update_daemon,

src/ns_online_config_upgrader.erl

@@ -97,7 +97,8 @@ upgrade(?VERSION_55, _Config) ->
 upgrade(?VERSION_60, Config) ->
     {?VERSION_MADHATTER,
      menelaus_web_auto_failover:config_upgrade_to_madhatter(Config) ++
-     menelaus_alert:config_upgrade_to_madhatter(Config)}.
+         menelaus_alert:config_upgrade_to_madhatter(Config) ++
+         ns_bucket:config_upgrade_to_madhatter(Config)}.
 
 add_index_ram_alert_limit(Config) ->
     {value, Current} = ns_config:search(Config, alert_limits),