MB-47561 eliminate extra ns_config:get from ns_storage_comf:do_cluster_storage_info

Change-Id: I10f50cd3d1327b8a989c4e17e60778aebae4dd70
Reviewed-on: http://review.couchbase.org/c/ns_server/+/158071
Tested-by: Artem Stemkovski <[email protected]>
Well-Formed: Restriction Checker
Reviewed-by: Aliaksey Artamonau <[email protected]>

Author: vzasade

src/menelaus_web_buckets.erl

@@ -261,6 +261,14 @@ build_durability_min_level(BucketConfig) ->
             <<"persistToMajority">>
     end.
 
+build_storage_totals(Config) ->
+    StorageTotals =
+        [{Key, {struct, StoragePList}}
+         || {Key, StoragePList} <-
+                ns_storage_conf:cluster_storage_info(Config)],
+
+    {storageTotals, {struct, StorageTotals}}.
+
 build_bucket_info(Id, undefined, InfoLevel, LocalAddr, MayExposeAuth,
                   SkipMap, Config) ->
     {ok, BucketConfig} = ns_bucket:get_bucket(Id, Config),
@@ -292,14 +300,12 @@ build_bucket_info(Id, BucketConfig, InfoLevel, LocalAddr, MayExposeAuth,
                  _ ->
                      BasicStats0 = menelaus_stats:basic_stats(Id),
 
-                     BasicStats = case InfoLevel of
-                                      for_ui ->
-                                          StorageTotals = [{Key, {struct, StoragePList}}
-                                                           || {Key, StoragePList} <- ns_storage_conf:cluster_storage_info()],
-
-                                          [{storageTotals, {struct, StorageTotals}} | BasicStats0];
-                                      _ -> BasicStats0
-                                  end,
+                     BasicStats =
+                         case InfoLevel of
+                             for_ui ->
+                                 [build_storage_totals(Config) | BasicStats0];
+                             _ -> BasicStats0
+                         end,
 
                      BucketParams =
                          [{replicaNumber, ns_bucket:num_replicas(BucketConfig)},
@@ -553,12 +559,14 @@ init_bucket_validation_context(IsNew, BucketName, Req) ->
     init_bucket_validation_context(IsNew, BucketName, ValidateOnly, IgnoreWarnings).
 
 init_bucket_validation_context(IsNew, BucketName, ValidateOnly, IgnoreWarnings) ->
-    init_bucket_validation_context(IsNew, BucketName,
-                                   ns_bucket:get_buckets(),
-                                   extended_cluster_storage_info(),
-                                   ValidateOnly, IgnoreWarnings,
-                                   cluster_compat_mode:get_compat_version(),
-                                   cluster_compat_mode:is_enterprise()).
+    Config = ns_config:get(),
+    init_bucket_validation_context(
+      IsNew, BucketName,
+      ns_bucket:get_buckets(Config),
+      extended_cluster_storage_info(Config),
+      ValidateOnly, IgnoreWarnings,
+      cluster_compat_mode:get_compat_version(Config),
+      cluster_compat_mode:is_enterprise()).
 
 init_bucket_validation_context(IsNew, BucketName, AllBuckets, ClusterStorageTotals,
                                ValidateOnly, IgnoreWarnings,
@@ -1588,9 +1596,10 @@ parse_validate_conflict_resolution_type(_Other) ->
     {error, conflictResolutionType,
      <<"Conflict resolution type must be 'seqno' or 'lww'">>}.
 
-extended_cluster_storage_info() ->
-    [{nodesCount, length(ns_cluster_membership:service_active_nodes(kv))}
-     | ns_storage_conf:cluster_storage_info()].
+extended_cluster_storage_info(Config) ->
+    [{nodesCount,
+      length(ns_cluster_membership:service_active_nodes(Config, kv))}
+     | ns_storage_conf:cluster_storage_info(Config)].
 
 
 handle_compact_bucket(_PoolId, Bucket, Req) ->

src/menelaus_web_node.erl

@@ -107,8 +107,11 @@ build_full_node_info(Config, Node, LocalAddr) ->
                                                             {sizeKBytes, SizeKBytes},
                                                             {usagePercent, UsagePercent}]}
                                                   || {Path, SizeKBytes, UsagePercent} <- DiskData]}]}},
-              {storageTotals, {struct, [{Type, {struct, PropList}}
-                                        || {Type, PropList} <- ns_storage_conf:nodes_storage_info([Node])]}},
+              {storageTotals,
+               {struct,
+                [{Type, {struct, PropList}}
+                 || {Type, PropList} <- ns_storage_conf:nodes_storage_info(
+                                          [Node], Config)]}},
               {storage, R}] ++ KV ++ build_memory_quota_info(Config),
     {struct, lists:filter(fun (X) -> X =/= undefined end,
                                    Fields)}.

src/menelaus_web_pools.erl

@@ -231,7 +231,7 @@ do_build_pool_info(Id, InfoLevel, Stability, LocalAddr) ->
          menelaus_web_node:build_memory_quota_info(Config),
          build_ui_params(InfoLevel),
          build_internal_params(InfoLevel),
-         build_unstable_params(Stability)],
+         build_unstable_params(Stability, Config)],
     {struct, lists:flatten(PropList)}.
 
 build_rebalance_params(Id, UUID) ->
@@ -265,12 +265,13 @@ build_ui_params(for_ui) ->
 build_ui_params(_) ->
     [].
 
-build_unstable_params(stable) ->
+build_unstable_params(stable, _) ->
     [];
-build_unstable_params(unstable) ->
+build_unstable_params(unstable, Config) ->
     [{storageTotals,
       {[{Key, {StoragePList}} ||
-           {Key, StoragePList} <- ns_storage_conf:cluster_storage_info()]}}].
+           {Key, StoragePList} <-
+               ns_storage_conf:cluster_storage_info(Config)]}}].
 
 build_buckets_info(Config, Id, UUID, Nodes) ->
      BucketsVer =

src/menelaus_web_samples.erl

@@ -105,8 +105,9 @@ validate_post_sample_buckets(Samples) ->
     end.
 
 check_quota(Samples) ->
-    NodesCount = length(ns_cluster_membership:service_active_nodes(kv)),
-    StorageInfo = ns_storage_conf:cluster_storage_info(),
+    Config = ns_config:get(),
+    NodesCount = length(ns_cluster_membership:service_active_nodes(Config, kv)),
+    StorageInfo = ns_storage_conf:cluster_storage_info(Config),
     RamQuotas = proplists:get_value(ram, StorageInfo),
     QuotaUsed = proplists:get_value(quotaUsed, RamQuotas),
     QuotaTotal = proplists:get_value(quotaTotal, RamQuotas),

src/ns_storage_conf.erl

@@ -38,7 +38,7 @@
          this_node_java_home/0,
          update_java_home/1]).
 
--export([cluster_storage_info/0, nodes_storage_info/1]).
+-export([cluster_storage_info/1, nodes_storage_info/2]).
 
 -export([extract_disk_stats_for_path/2]).
 
@@ -440,15 +440,15 @@ extract_disk_totals(DiskPaths, DiskStats) ->
     {DiskTotal, DiskUsed}.
 
 %% returns cluster_storage_info for subset of nodes
-nodes_storage_info(NodeNames) ->
+nodes_storage_info(NodeNames, Config) ->
     NodesDict = ns_doctor:get_nodes(),
     NodesInfos = lists:foldl(fun (N, A) ->
                                      case dict:find(N, NodesDict) of
                                          {ok, V} -> [{N, V} | A];
                                          _ -> A
                                      end
                              end, [], NodeNames),
-    do_cluster_storage_info(NodesInfos).
+    do_cluster_storage_info(NodesInfos, Config).
 
 %% returns cluster storage info. This is aggregation of various
 %% storage related metrics across active nodes of cluster.
@@ -466,8 +466,10 @@ nodes_storage_info(NodeNames) ->
 %% quotaUsed - amount of quota already allocated
 %%
 %% usedByData - amount of this resource used by our data
-cluster_storage_info() ->
-    nodes_storage_info(ns_cluster_membership:service_active_nodes(kv)).
+cluster_storage_info(Config) ->
+    nodes_storage_info(
+      ns_cluster_membership:service_active_nodes(Config, kv),
+      Config).
 
 extract_subprop(NodeInfos, Key, SubKey) ->
     [proplists:get_value(SubKey, proplists:get_value(Key, NodeInfo, [])) ||
@@ -483,9 +485,8 @@ interesting_stats_total_rec([ThisStats | RestStats], Key, Acc) ->
             interesting_stats_total_rec(RestStats, Key, Acc + V)
     end.
 
-do_cluster_storage_info([]) -> [];
-do_cluster_storage_info(NodeInfos) ->
-    Config = ns_config:get(),
+do_cluster_storage_info([], _) -> [];
+do_cluster_storage_info(NodeInfos, Config) ->
     NodesCount = length(NodeInfos),
     RAMQuotaUsedPerNode = memory_quota:get_total_buckets_ram_quota(Config),
     RAMQuotaUsed = RAMQuotaUsedPerNode * NodesCount,