diff options
| -rw-r--r-- | src/file_handle_cache.erl | 2 | ||||
| -rw-r--r-- | src/gm.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_cli.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_limiter.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_mode_exactly.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_password.erl | 5 | ||||
| -rw-r--r-- | test/priority_queue_SUITE.erl | 2 | ||||
| -rw-r--r-- | test/unit_inbroker_SUITE.erl | 2 |
8 files changed, 8 insertions, 17 deletions
diff --git a/src/file_handle_cache.erl b/src/file_handle_cache.erl index ec2d82186a..2b69f39b04 100644 --- a/src/file_handle_cache.erl +++ b/src/file_handle_cache.erl @@ -1477,7 +1477,7 @@ notify_age(CStates, AverageAge) -> notify_age0(Clients, CStates, Required) -> case [CState || CState <- CStates, CState#cstate.callback =/= undefined] of [] -> ok; - Notifications -> S = random:uniform(length(Notifications)), + Notifications -> S = rand_compat:uniform(length(Notifications)), {L1, L2} = lists:split(S, Notifications), notify(Clients, Required, L2 ++ L1) end. diff --git a/src/gm.erl b/src/gm.erl index dc47b93a5b..176e14537f 100644 --- a/src/gm.erl +++ b/src/gm.erl @@ -536,9 +536,6 @@ forget_group(GroupName) -> init([GroupName, Module, Args, TxnFun]) -> put(process_name, {?MODULE, GroupName}), - _ = random:seed(erlang:phash2([node()]), - time_compat:monotonic_time(), - time_compat:unique_integer()), Self = make_member(GroupName), gen_server2:cast(self(), join), {ok, #state { self = Self, @@ -1069,7 +1066,7 @@ join_group(Self, GroupName, #gm_group { members = Members } = Group, TxnFun) -> prune_or_create_group(Self, GroupName, TxnFun), TxnFun); Alive -> - Left = lists:nth(random:uniform(length(Alive)), Alive), + Left = lists:nth(rand_compat:uniform(length(Alive)), Alive), Handler = fun () -> join_group( diff --git a/src/rabbit_cli.erl b/src/rabbit_cli.erl index d1229c32f9..6b35482217 100644 --- a/src/rabbit_cli.erl +++ b/src/rabbit_cli.erl @@ -147,7 +147,7 @@ main(ParseFun, DoFun, UsageMod) -> start_distribution_anon(0, LastError) -> {error, LastError}; start_distribution_anon(TriesLeft, _) -> - NameCandidate = list_to_atom(rabbit_misc:format("rabbitmq-cli-~2..0b", [rabbit_misc:random(100)])), + NameCandidate = list_to_atom(rabbit_misc:format("rabbitmq-cli-~2..0b", [rand_compat:uniform(100)])), case net_kernel:start([NameCandidate, name_type()]) of {ok, _} = Result -> Result; diff --git a/src/rabbit_limiter.erl b/src/rabbit_limiter.erl index 94620416d6..203e309b02 100644 --- a/src/rabbit_limiter.erl +++ b/src/rabbit_limiter.erl @@ -432,7 +432,7 @@ notify_queues(State = #lim{ch_pid = ChPid, queues = Queues}) -> %% We randomly vary the position of queues in the list, %% thus ensuring that each queue has an equal chance of %% being notified first. - {L1, L2} = lists:split(random:uniform(L), QList), + {L1, L2} = lists:split(rand_compat:uniform(L), QList), [[ok = rabbit_amqqueue:resume(Q, ChPid) || Q <- L3] || L3 <- [L2, L1]], ok diff --git a/src/rabbit_mirror_queue_mode_exactly.erl b/src/rabbit_mirror_queue_mode_exactly.erl index 4721ad6136..593f0a4138 100644 --- a/src/rabbit_mirror_queue_mode_exactly.erl +++ b/src/rabbit_mirror_queue_mode_exactly.erl @@ -45,10 +45,7 @@ suggested_queue_nodes(Count, MNode, SNodes, _SSNodes, Poss) -> end}. shuffle(L) -> - random:seed(erlang:phash2([node()]), - time_compat:monotonic_time(), - time_compat:unique_integer()), - {_, L1} = lists:unzip(lists:keysort(1, [{random:uniform(), N} || N <- L])), + {_, L1} = lists:unzip(lists:keysort(1, [{rand_compat:uniform(), N} || N <- L])), L1. validate_policy(N) when is_integer(N) andalso N > 0 -> diff --git a/src/rabbit_password.erl b/src/rabbit_password.erl index d5b0945de9..b7987df1d8 100644 --- a/src/rabbit_password.erl +++ b/src/rabbit_password.erl @@ -35,10 +35,7 @@ hash(HashingMod, Cleartext) -> <<SaltBin/binary, Hash/binary>>. generate_salt() -> - random:seed(erlang:phash2([node()]), - time_compat:monotonic_time(), - time_compat:unique_integer()), - Salt = random:uniform(16#ffffffff), + Salt = rand_compat:uniform(16#ffffffff), <<Salt:32>>. salted_hash(Salt, Cleartext) -> diff --git a/test/priority_queue_SUITE.erl b/test/priority_queue_SUITE.erl index 46fafd89f7..05853ebc1f 100644 --- a/test/priority_queue_SUITE.erl +++ b/test/priority_queue_SUITE.erl @@ -546,7 +546,7 @@ publish_payload(Ch, Q, PPds) -> amqp_channel:wait_for_confirms(Ch). publish_many(_Ch, _Q, 0) -> ok; -publish_many( Ch, Q, N) -> publish1(Ch, Q, random:uniform(5)), +publish_many( Ch, Q, N) -> publish1(Ch, Q, rand_compat:uniform(5)), publish_many(Ch, Q, N - 1). publish1(Ch, Q, P) -> diff --git a/test/unit_inbroker_SUITE.erl b/test/unit_inbroker_SUITE.erl index e20f63ba8b..e9ecbf5444 100644 --- a/test/unit_inbroker_SUITE.erl +++ b/test/unit_inbroker_SUITE.erl @@ -1316,7 +1316,7 @@ maybe_switch_queue_mode(VQ) -> random_queue_mode() -> Modes = [lazy, default], - lists:nth(random:uniform(length(Modes)), Modes). + lists:nth(rand_compat:uniform(length(Modes)), Modes). pub_res({_, VQS}) -> VQS; |