Skip to content

Commit f68862e

Browse files
committed
MB-47561 do not call ns_config:get from ns_bucket:failover_warnings
Change-Id: I828e687fc1abb849711dfa18f09ebc4305dbd92a Reviewed-on: http://review.couchbase.org/c/ns_server/+/158237 Well-Formed: Restriction Checker Tested-by: Artem Stemkovski <[email protected]> Reviewed-by: Aliaksey Artamonau <[email protected]>
1 parent ed91a43 commit f68862e

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

src/menelaus_web_pools.erl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ do_build_pool_info(Id, InfoLevel, Stability, LocalAddr) ->
229229
{clusterName, list_to_binary(get_cluster_name())},
230230
{balanced, ns_cluster_membership:is_balanced()},
231231
menelaus_web_node:build_memory_quota_info(Config),
232-
build_ui_params(InfoLevel),
232+
build_ui_params(InfoLevel, Config),
233233
build_internal_params(InfoLevel),
234234
build_unstable_params(Stability, Config)],
235235
{struct, lists:flatten(PropList)}.
@@ -257,12 +257,12 @@ build_internal_params(internal) ->
257257
build_internal_params(_) ->
258258
[].
259259

260-
build_ui_params(for_ui) ->
261-
[{failoverWarnings, ns_bucket:failover_warnings()},
260+
build_ui_params(for_ui, Config) ->
261+
[{failoverWarnings, ns_bucket:failover_warnings(Config)},
262262
{saslauthdEnabled, cluster_compat_mode:is_saslauthd_enabled()},
263263
{uiSessionTimeout,
264264
ns_config:read_key_fast(ui_session_timeout, undefined)}];
265-
build_ui_params(_) ->
265+
build_ui_params(_, _) ->
266266
[].
267267

268268
build_unstable_params(stable, _) ->

src/ns_bucket.erl

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
credentials/1,
3333
delete_bucket/1,
3434
durability_min_level/1,
35-
failover_warnings/0,
35+
failover_warnings/1,
3636
get_bucket/1,
3737
get_bucket/2,
3838
get_bucket_from_configs/2,
@@ -306,10 +306,9 @@ failover_safety_rec(BaseSafety, ExtraSafety, [BucketConfig | RestConfigs], Activ
306306
failover_safety_rec(NewBaseSafety, NewExtraSafety,
307307
RestConfigs, ActiveNodes, LiveNodes).
308308

309-
-spec failover_warnings() -> [failoverNeeded | rebalanceNeeded | hardNodesNeeded | softNodesNeeded].
310-
failover_warnings() ->
311-
Config = ns_config:get(),
312-
309+
-spec failover_warnings(ns_config()) -> [failoverNeeded | rebalanceNeeded |
310+
hardNodesNeeded | softNodesNeeded].
311+
failover_warnings(Config) ->
313312
ActiveNodes = ns_cluster_membership:service_active_nodes(Config, kv),
314313
LiveNodes = ns_cluster_membership:service_actual_nodes(Config, kv),
315314
{BaseSafety0, ExtraSafety}

0 commit comments

Comments
 (0)