diff options
| author | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-05-04 16:41:17 +0100 |
|---|---|---|
| committer | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-05-04 16:41:17 +0100 |
| commit | 2a37146f9958d131ff76379977b9f2b6f4e32398 (patch) | |
| tree | 72d5fa4063b26fd265158c6e97ce918f6c19e0b3 /src/rabbit_upgrade.erl | |
| parent | 3fce3ee273299686a0e562377472b99c8d6c2728 (diff) | |
| download | rabbitmq-server-2a37146f9958d131ff76379977b9f2b6f4e32398.tar.gz | |
re-added a boolean parameter to init_db to prevent upgrading
Diffstat (limited to 'src/rabbit_upgrade.erl')
| -rw-r--r-- | src/rabbit_upgrade.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index d5fa0d69..25efb91a 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -66,11 +66,11 @@ %% into the boot process by prelaunch before the mnesia application is %% started. By the time Mnesia is started the upgrades have happened %% (on the primary), or Mnesia has been reset (on the secondary) and -%% rabbit_mnesia:init_db/2 can then make the node rejoin the cluster +%% rabbit_mnesia:init_db/3 can then make the node rejoin the cluster %% in the normal way. %% %% The non-mnesia upgrades are then triggered by -%% rabbit_mnesia:init_db/2. Of course, it's possible for a given +%% rabbit_mnesia:init_db/3. Of course, it's possible for a given %% upgrade process to only require Mnesia upgrades, or only require %% non-Mnesia upgrades. In the latter case no Mnesia resets and %% reclusterings occur. @@ -230,7 +230,7 @@ secondary_upgrade(AllNodes) -> false -> AllNodes -- [node()] end, rabbit_misc:ensure_ok(mnesia:start(), cannot_start_mnesia), - ok = rabbit_mnesia:init_db(ClusterNodes, true), + ok = rabbit_mnesia:init_db(ClusterNodes, true, false), ok = rabbit_version:record_desired_for_scope(mnesia), ok. |