MB-47561 pass config into build_nodes_info_fun, which eliminates

...extra ns_config:get call from /pools/default handler

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

Author: vzasade

src/diag_handler.erl

@@ -476,7 +476,9 @@ handle_just_diag(Req, Extra) ->
 
     Infos = [["nodes_info = ~p",
               ns_cluster:sanitize_node_info(
-                menelaus_web_node:build_nodes_info(true, normal, unstable, misc:localhost()))],
+                menelaus_web_node:build_nodes_info(
+                  true, normal, unstable,
+                  misc:localhost(), ns_config:get()))],
              ["buckets = ~p", ns_config_log:sanitize(Buckets)]],
 
     [begin

src/menelaus_web_buckets.erl

@@ -108,8 +108,10 @@ handle_bucket_list(Req) ->
                     _ -> for_ui
                 end,
     SkipMap = proplists:get_value("skipMap", mochiweb_request:parse_qs(Req)) =:= "true",
+    Config = ns_config:get(),
     BucketsInfo = [build_bucket_info(Name, undefined, InfoLevel, LocalAddr,
-                                     may_expose_bucket_auth(Name, Req), SkipMap)
+                                     may_expose_bucket_auth(Name, Req), SkipMap,
+                                     Config)
                    || Name <- BucketNames],
     reply_json(Req, BucketsInfo).
 
@@ -121,12 +123,15 @@ handle_bucket_info(_PoolId, Id, Req) ->
     SkipMap = proplists:get_value("skipMap", mochiweb_request:parse_qs(Req)) =:= "true",
     reply_json(Req, build_bucket_info(Id, undefined, InfoLevel,
                                       menelaus_util:local_addr(Req),
-                                      may_expose_bucket_auth(Id, Req), SkipMap)).
+                                      may_expose_bucket_auth(Id, Req), SkipMap,
+                                      ns_config:get())).
 
-build_bucket_node_infos(BucketName, BucketConfig, InfoLevel0, LocalAddr) ->
+build_bucket_node_infos(BucketName, BucketConfig, InfoLevel0, LocalAddr,
+                        Config) ->
     {InfoLevel, Stability} = convert_info_level(InfoLevel0),
     %% Only list nodes this bucket is mapped to
-    F = menelaus_web_node:build_nodes_info_fun(false, InfoLevel, Stability, LocalAddr),
+    F = menelaus_web_node:build_nodes_info_fun(
+          false, InfoLevel, Stability, LocalAddr, Config),
     Nodes = ns_bucket:get_servers(BucketConfig),
     %% NOTE: there's potential inconsistency here between BucketConfig
     %% and (potentially more up-to-date) vbuckets dict. Given that
@@ -257,13 +262,14 @@ build_durability_min_level(BucketConfig) ->
     end.
 
 build_bucket_info(Id, undefined, InfoLevel, LocalAddr, MayExposeAuth,
-                  SkipMap) ->
-    {ok, BucketConfig} = ns_bucket:get_bucket(Id),
+                  SkipMap, Config) ->
+    {ok, BucketConfig} = ns_bucket:get_bucket(Id, Config),
     build_bucket_info(Id, BucketConfig, InfoLevel, LocalAddr, MayExposeAuth,
-                      SkipMap);
+                      SkipMap, Config);
 build_bucket_info(Id, BucketConfig, InfoLevel, LocalAddr, MayExposeAuth,
-                  SkipMap) ->
-    Nodes = build_bucket_node_infos(Id, BucketConfig, InfoLevel, LocalAddr),
+                  SkipMap, Config) ->
+    Nodes = build_bucket_node_infos(Id, BucketConfig, InfoLevel, LocalAddr,
+                                    Config),
     StatsUri = bin_concat_path(["pools", "default", "buckets", Id, "stats"]),
     StatsDirectoryUri = iolist_to_binary([StatsUri, <<"Directory">>]),
     NodeStatsListURI = bin_concat_path(["pools", "default", "buckets", Id, "nodes"]),
@@ -481,11 +487,13 @@ handle_sasl_buckets_streaming(_PoolId, Req) ->
 handle_bucket_info_streaming(_PoolId, Id, Req) ->
     LocalAddr = menelaus_util:local_addr(Req),
     F = fun(_Stability, _UpdateID) ->
-                case ns_bucket:get_bucket(Id) of
+                Config = ns_config:get(),
+                case ns_bucket:get_bucket(Id, Config) of
                     {ok, BucketConfig} ->
                         Info = build_bucket_info(
                                  Id, BucketConfig, streaming, LocalAddr,
-                                 may_expose_bucket_auth(Id, Req), false),
+                                 may_expose_bucket_auth(Id, Req), false,
+                                 Config),
                         {just_write, Info};
                     not_present ->
                         exit(normal)

src/menelaus_web_groups.erl

@@ -35,10 +35,12 @@ build_group_uri(GroupPList) ->
     build_group_uri(proplists:get_value(uuid, GroupPList)).
 
 handle_server_groups(Req) ->
-    {value, Groups} = ns_config:search(server_groups),
+    Config = ns_config:get(),
+    {value, Groups} = ns_config:search(Config, server_groups),
     LocalAddr = menelaus_util:local_addr(Req),
     CanIncludeOtpCookie = menelaus_auth:has_permission({[admin, internal], all}, Req),
-    Fun = menelaus_web_node:build_nodes_info_fun(CanIncludeOtpCookie, normal, unstable, LocalAddr),
+    Fun = menelaus_web_node:build_nodes_info_fun(
+            CanIncludeOtpCookie, normal, unstable, LocalAddr, Config),
     J = [begin
              UUIDBin = proplists:get_value(uuid, G),
              L = [{name, proplists:get_value(name, G)},

src/menelaus_web_node.erl

@@ -28,9 +28,10 @@
 
 -export([handle_node/2,
          build_full_node_info/2,
+         build_full_node_info/3,
          build_memory_quota_info/1,
-         build_nodes_info_fun/4,
-         build_nodes_info/4,
+         build_nodes_info_fun/5,
+         build_nodes_info/5,
          build_node_hostname/3,
          handle_bucket_node_list/2,
          handle_bucket_node_info/3,
@@ -92,7 +93,11 @@ location_prop_to_json({state, ok}) -> {state, ok};
 location_prop_to_json(KV) -> KV.
 
 build_full_node_info(Node, LocalAddr) ->
-    {struct, KV} = (build_nodes_info_fun(true, normal, unstable, LocalAddr))(Node, undefined),
+    build_full_node_info(ns_config:get(), Node, LocalAddr).
+
+build_full_node_info(Config, Node, LocalAddr) ->
+    Fun = build_nodes_info_fun(true, normal, unstable, LocalAddr, Config),
+    {struct, KV} = Fun(Node, undefined),
     NodeStatus = ns_doctor:get_node(Node),
     StorageConf = ns_storage_conf:storage_conf_from_node_status(Node, NodeStatus),
     R = {struct, storage_conf_to_json(StorageConf)},
@@ -104,7 +109,7 @@ build_full_node_info(Node, LocalAddr) ->
                                                   || {Path, SizeKBytes, UsagePercent} <- DiskData]}]}},
               {storageTotals, {struct, [{Type, {struct, PropList}}
                                         || {Type, PropList} <- ns_storage_conf:nodes_storage_info([Node])]}},
-              {storage, R}] ++ KV ++ build_memory_quota_info(ns_config:latest()),
+              {storage, R}] ++ KV ++ build_memory_quota_info(Config),
     {struct, lists:filter(fun (X) -> X =/= undefined end,
                                    Fields)}.
 
@@ -116,9 +121,10 @@ build_memory_quota_info(Config) ->
               {memory_quota:service_to_json_name(Service), Quota}
       end, memory_quota:aware_services(CompatVersion)).
 
-build_nodes_info(CanIncludeOtpCookie, InfoLevel, Stability, LocalAddr) ->
-    F = build_nodes_info_fun(CanIncludeOtpCookie, InfoLevel, Stability, LocalAddr),
-    [F(N, undefined) || N <- ns_node_disco:nodes_wanted()].
+build_nodes_info(CanIncludeOtpCookie, InfoLevel, Stability, LocalAddr, Config) ->
+    F = build_nodes_info_fun(CanIncludeOtpCookie, InfoLevel, Stability,
+                             LocalAddr, Config),
+    [F(N, undefined) || N <- ns_node_disco:nodes_wanted(Config)].
 
 %% builds health/warmup status of given node (w.r.t. given Bucket if
 %% not undefined)
@@ -153,10 +159,10 @@ build_node_status(Node, Bucket, InfoNode, BucketsAll) ->
             <<"unhealthy">>
     end.
 
-build_nodes_info_fun(CanIncludeOtpCookie, InfoLevel, Stability, LocalAddr) ->
+build_nodes_info_fun(CanIncludeOtpCookie, InfoLevel, Stability, LocalAddr,
+                     Config) ->
     OtpCookie = list_to_binary(atom_to_list(erlang:get_cookie())),
     NodeStatuses = ns_doctor:get_nodes(),
-    Config = ns_config:get(),
     BucketsAll = ns_bucket:get_buckets(Config),
     fun(WantENode, Bucket) ->
             InfoNode = ns_doctor:get_node(WantENode, NodeStatuses),

src/menelaus_web_pools.erl

@@ -191,9 +191,9 @@ do_build_pool_info(Id, InfoLevel, Stability, LocalAddr) ->
     UUID = menelaus_web:get_uuid(),
 
     CanIncludeOtpCookie = InfoLevel =:= admin orelse InfoLevel =:= internal,
-    Nodes = menelaus_web_node:build_nodes_info(CanIncludeOtpCookie, InfoLevel,
-                                               Stability, LocalAddr),
     Config = ns_config:get(),
+    Nodes = menelaus_web_node:build_nodes_info(CanIncludeOtpCookie, InfoLevel,
+                                               Stability, LocalAddr, Config),
 
     TasksURI = bin_concat_path(["pools", Id, "tasks"],
                                [{"v", ns_doctor:get_tasks_version()}]),
@@ -537,10 +537,10 @@ cluster_info_props(Req) ->
       end},
      {buckets, fun extract_bucket_specific_data/1},
      {nodes,
-      fun () ->
+      fun (Cfg) ->
               [begin
                    {struct, Props} = menelaus_web_node:build_full_node_info(
-                                       N, local_addr(Req)),
+                                       Cfg, N, local_addr(Req)),
                    glean_node_details(Props)
                end || N <- ns_node_disco:nodes_wanted()]
       end}].