diff options
| author | Tim Watson <tim@rabbitmq.com> | 2012-10-17 16:48:40 +0100 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2012-10-17 16:48:40 +0100 |
| commit | 2e2abcb3616d0a0d37d479739c80f1cbc00a051b (patch) | |
| tree | dab87df8b073ce422ff673d7d057d15e50c19a0b /src | |
| parent | 6111d956cd72b9f600424f65cccd2a13a5ab57bb (diff) | |
| download | rabbitmq-server-git-2e2abcb3616d0a0d37d479739c80f1cbc00a051b.tar.gz | |
oops
Diffstat (limited to 'src')
| -rw-r--r-- | src/gm_soak_test.erl | 5 | ||||
| -rw-r--r-- | src/gm_speed_test.erl | 5 | ||||
| -rw-r--r-- | src/gm_tests.erl | 15 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_coordinator.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 5 |
5 files changed, 20 insertions, 14 deletions
diff --git a/src/gm_soak_test.erl b/src/gm_soak_test.erl index 5fbfc22371..f49ed94bc9 100644 --- a/src/gm_soak_test.erl +++ b/src/gm_soak_test.erl @@ -106,8 +106,9 @@ spawn_member() -> %% start up delay of no more than 10 seconds timer:sleep(random:uniform(10000)), {ok, Pid} = gm:start_link( - ?MODULE, ?MODULE, [], - fun rabbit_misc:execute_mnesia_transaction/1), + ?MODULE, ?MODULE, + fun rabbit_misc:execute_mnesia_transaction/1, + []), Start = random:uniform(10000), send_loop(Pid, Start, Start + random:uniform(10000)), gm:leave(Pid), diff --git a/src/gm_speed_test.erl b/src/gm_speed_test.erl index 84d4ab2fb1..fd9bd79e4b 100644 --- a/src/gm_speed_test.erl +++ b/src/gm_speed_test.erl @@ -44,8 +44,9 @@ terminate(Owner, _Reason) -> %% other wile_e_coyote(Time, WriteUnit) -> - {ok, Pid} = gm:start_link(?MODULE, ?MODULE, self(), - fun rabbit_misc:execute_mnesia_transaction/1), + {ok, Pid} = gm:start_link(?MODULE, ?MODULE, + fun rabbit_misc:execute_mnesia_transaction/1, + self()), receive joined -> ok end, timer:sleep(1000), %% wait for all to join timer:send_after(Time, stop), diff --git a/src/gm_tests.erl b/src/gm_tests.erl index a9c0ba9035..7a4a11a3f4 100644 --- a/src/gm_tests.erl +++ b/src/gm_tests.erl @@ -77,8 +77,9 @@ test_member_death() -> with_two_members( fun (Pid, Pid2) -> {ok, Pid3} = gm:start_link( - ?MODULE, ?MODULE, self(), - fun rabbit_misc:execute_mnesia_transaction/1), + ?MODULE, ?MODULE, + fun rabbit_misc:execute_mnesia_transaction/1, + self()), passed = receive_joined(Pid3, [Pid, Pid2, Pid3], timeout_joining_gm_group_3), passed = receive_birth(Pid, Pid3, timeout_waiting_for_birth_3_1), @@ -130,12 +131,14 @@ test_broadcast_fun(Fun) -> with_two_members(Fun) -> ok = gm:create_tables(), - {ok, Pid} = gm:start_link(?MODULE, ?MODULE, self(), - fun rabbit_misc:execute_mnesia_transaction/1), + {ok, Pid} = gm:start_link(?MODULE, ?MODULE, + fun rabbit_misc:execute_mnesia_transaction/1, + self()), passed = receive_joined(Pid, [Pid], timeout_joining_gm_group_1), - {ok, Pid2} = gm:start_link(?MODULE, ?MODULE, self(), - fun rabbit_misc:execute_mnesia_transaction/1), + {ok, Pid2} = gm:start_link(?MODULE, ?MODULE, + fun rabbit_misc:execute_mnesia_transaction/1, + self()), passed = receive_joined(Pid2, [Pid, Pid2], timeout_joining_gm_group_2), passed = receive_birth(Pid, Pid2, timeout_waiting_for_birth_2), diff --git a/src/rabbit_mirror_queue_coordinator.erl b/src/rabbit_mirror_queue_coordinator.erl index bcb6192a4c..daa247dfb7 100644 --- a/src/rabbit_mirror_queue_coordinator.erl +++ b/src/rabbit_mirror_queue_coordinator.erl @@ -328,8 +328,8 @@ init([#amqqueue { name = QueueName } = Q, GM, DeathFun, DepthFun]) -> undefined -> {ok, GM2} = gm:start_link( QueueName, ?MODULE, - [self()], - fun rabbit_misc:execute_mnesia_transaction/1), + fun rabbit_misc:execute_mnesia_transaction/1, + [self()]), receive {joined, GM2, _Members} -> ok end, diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index d0efe37adc..627630afe6 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -99,8 +99,9 @@ init(Q = #amqqueue { name = QName }) -> %% above. %% process_flag(trap_exit, true), %% amqqueue_process traps exits too. - {ok, GM} = gm:start_link(QName, ?MODULE, [self()], - fun rabbit_misc:execute_mnesia_transaction/1), + {ok, GM} = gm:start_link(QName, ?MODULE, + fun rabbit_misc:execute_mnesia_transaction/1, + [self()]), receive {joined, GM} -> ok end, Self = self(), Node = node(), |