Skip to content

Commit ed56aa3

Browse files
committed
Rename erlang_lock_retries to internal_lock_retries
since we don't want to expose implementation details to the configuration names. ag erlang_lock_retries --ignore logs -l | xargs sed -I '' -e 's/erlang_lock_retries/internal_lock_retries/g'
1 parent 1e7c6f4 commit ed56aa3

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

deps/rabbit/priv/schema/rabbit.schema

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,7 @@ end}.
970970
%%
971971
%% Currently used in classic, k8s, and aws peer discovery backends.
972972

973-
{mapping, "cluster_formation.erlang_lock_retries", "rabbit.cluster_formation.erlang_lock_retries",
973+
{mapping, "cluster_formation.internal_lock_retries", "rabbit.cluster_formation.internal_lock_retries",
974974
[
975975
{datatype, integer},
976976
{validators, ["non_zero_positive_integer"]}

deps/rabbit/src/rabbit_peer_discovery_classic_config.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ lock(Node) ->
3939
LockId = {rabbit_nodes:cookie_hash(), Node},
4040
Retries = case application:get_env(rabbit, cluster_formation) of
4141
{ok, PropList} ->
42-
proplists:get_value(erlang_lock_retries, PropList, ?DEFAULT_LOCK_RETRIES);
42+
proplists:get_value(internal_lock_retries, PropList, ?DEFAULT_LOCK_RETRIES);
4343
undefined ->
4444
?DEFAULT_LOCK_RETRIES
4545
end,

deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -553,9 +553,9 @@ tcp_listen_options.exit_on_close = false",
553553
[],
554554
[]},
555555

556-
{cluster_formation_erlang_lock_retries,
557-
"cluster_formation.erlang_lock_retries = 10",
558-
[{rabbit,[{cluster_formation,[{erlang_lock_retries,10}]}]}],
556+
{cluster_formation_internal_lock_retries,
557+
"cluster_formation.internal_lock_retries = 10",
558+
[{rabbit,[{cluster_formation,[{internal_lock_retries,10}]}]}],
559559
[]},
560560

561561
{cluster_formation_dns,

deps/rabbit/test/peer_discovery_classic_config_SUITE.erl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ init_per_testcase(successful_discovery = Testcase, Config) ->
6969
{rabbit, [
7070
{cluster_nodes, {NodeNamesWithHostname, disc}},
7171
{cluster_formation, [
72-
{erlang_lock_retries, 10}
72+
{internal_lock_retries, 10}
7373
]}
7474
]}),
7575
rabbit_ct_helpers:run_steps(Config3,
@@ -100,7 +100,7 @@ init_per_testcase(successful_discovery_with_a_subset_of_nodes_coming_online = Te
100100
]},
101101
{cluster_nodes, {NodeNamesWithHostname, disc}},
102102
{cluster_formation, [
103-
{erlang_lock_retries, 10}
103+
{internal_lock_retries, 10}
104104
]}
105105
]}),
106106
rabbit_ct_helpers:run_steps(Config3,
@@ -117,7 +117,7 @@ init_per_testcase(no_nodes_configured = Testcase, Config) ->
117117
{rabbit, [
118118
{cluster_nodes, {[], disc}},
119119
{cluster_formation, [
120-
{erlang_lock_retries, 10}
120+
{internal_lock_retries, 10}
121121
]}
122122
]}),
123123
rabbit_ct_helpers:run_steps(Config3,

deps/rabbitmq_peer_discovery_aws/test/unit_SUITE.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ lock_single_node(_Config) ->
8181
?assertEqual(ok, rabbit_peer_discovery_aws:unlock(LockId)).
8282

8383
lock_multiple_nodes(_Config) ->
84-
application:set_env(rabbit, cluster_formation, [{erlang_lock_retries, 2}]),
84+
application:set_env(rabbit, cluster_formation, [{internal_lock_retries, 2}]),
8585
LocalNode = node(),
8686
OtherNode = other@host,
8787
meck:expect(rabbit_peer_discovery_aws, list_nodes, 0, {ok, {[OtherNode, LocalNode], disc}}),

deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_util.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ lock_id(Node) ->
437437
lock_retries() ->
438438
case application:get_env(rabbit, cluster_formation) of
439439
{ok, PropList} ->
440-
proplists:get_value(erlang_lock_retries, PropList, ?DEFAULT_LOCK_RETRIES);
440+
proplists:get_value(internal_lock_retries, PropList, ?DEFAULT_LOCK_RETRIES);
441441
undefined ->
442442
?DEFAULT_LOCK_RETRIES
443443
end.

deps/rabbitmq_peer_discovery_k8s/test/rabbitmq_peer_discovery_k8s_SUITE.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ lock_single_node(_Config) ->
151151
?assertEqual(ok, rabbit_peer_discovery_k8s:unlock(LockId)).
152152

153153
lock_multiple_nodes(_Config) ->
154-
application:set_env(rabbit, cluster_formation, [{erlang_lock_retries, 2}]),
154+
application:set_env(rabbit, cluster_formation, [{internal_lock_retries, 2}]),
155155
LocalNode = node(),
156156
OtherNode = other@host,
157157
meck:expect(rabbit_peer_discovery_k8s, list_nodes1, 0, {ok, [OtherNode, LocalNode]}),

0 commit comments

Comments
 (0)