Skip to content

Commit b103c26

Browse files
committed
MB-47561 do not call ns_config:get in ns_rebalancer
Change-Id: Idabe2303c71e0050d6de4a40072bc0c5ca38b4fc Reviewed-on: http://review.couchbase.org/c/ns_server/+/158069 Well-Formed: Restriction Checker Reviewed-by: Aliaksey Artamonau <[email protected]> Tested-by: Artem Stemkovski <[email protected]>
1 parent 319b9dc commit b103c26

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

src/ns_rebalancer.erl

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,7 @@ validate_autofailover_bucket(BucketConfig, Nodes) ->
9191
end.
9292

9393
generate_vbucket_map_options(KeepNodes, BucketConfig) ->
94-
Config = ns_config:get(),
95-
generate_vbucket_map_options(KeepNodes, BucketConfig, Config).
96-
97-
generate_vbucket_map_options(KeepNodes, BucketConfig, Config) ->
98-
Tags = case ns_config:search(Config, server_groups) of
94+
Tags = case ns_config:search(server_groups) of
9995
false ->
10096
undefined;
10197
{value, ServerGroups} ->
@@ -782,11 +778,9 @@ do_unbalanced(Map, Servers) ->
782778
end, [MastersCounts, ReplicasCounts]).
783779

784780
map_options_changed(BucketConfig) ->
785-
Config = ns_config:get(),
786-
787781
Servers = ns_bucket:get_servers(BucketConfig),
788782

789-
Opts = generate_vbucket_map_options(Servers, BucketConfig, Config),
783+
Opts = generate_vbucket_map_options(Servers, BucketConfig),
790784
OptsHash = proplists:get_value(map_opts_hash, BucketConfig),
791785
case OptsHash of
792786
undefined ->

0 commit comments

Comments
 (0)