diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-12-01 15:15:40 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-12-01 15:15:40 +0000 |
| commit | 872bbd4f15843d445b6020bc240b571fccebfbd3 (patch) | |
| tree | 4b86b6f8e3d7de97d7db825d31e94ac34004acdb | |
| parent | b4c357b17e350d753ece7921741640b02f1f5331 (diff) | |
| download | rabbitmq-server-git-872bbd4f15843d445b6020bc240b571fccebfbd3.tar.gz | |
Swap location of backup and regular config files. A bit less logical, but we need them to be in the right place when starting for big-bang upgrades to work.
| -rw-r--r-- | src/rabbit_mnesia_rename.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_mnesia_rename.erl b/src/rabbit_mnesia_rename.erl index fcd1a595c7..786f911559 100644 --- a/src/rabbit_mnesia_rename.erl +++ b/src/rabbit_mnesia_rename.erl @@ -83,7 +83,6 @@ maybe_finish(AllNodes) -> finish(FromNode, ToNode, AllNodes) -> case node() of ToNode -> - [{ok, _} = file:copy(new_conf_path(F), F) || F <- config_files()], case rabbit_upgrade:nodes_running(AllNodes) of [] -> finish_primary(FromNode, ToNode); _ -> finish_secondary(FromNode, ToNode, AllNodes) @@ -92,6 +91,7 @@ finish(FromNode, ToNode, AllNodes) -> rabbit_log:info( "Abandoning rename from ~s to ~s since we are still ~s~n", [FromNode, ToNode, FromNode]), + [{ok, _} = file:copy(backup_of_conf(F), F) || F <- config_files()], delete_rename_files(); _ -> %% Boot will almost certainly fail but we might as @@ -149,7 +149,7 @@ config_files() -> [rabbit_node_monitor:running_nodes_filename(), rabbit_node_monitor:cluster_status_filename()]. -new_conf_path(Path) -> +backup_of_conf(Path) -> filename:join([filename:dirname(Path), temp_dir_name(), filename:basename(Path)]). @@ -159,8 +159,8 @@ convert_config_files(NodeMap) -> convert_config_file(NodeMap, Path) -> {ok, Term} = rabbit_file:read_term_file(Path), - ok = rabbit_file:write_term_file( - new_conf_path(Path), update_term(NodeMap, Term)). + {ok, _} = file:copy(Path, backup_of_conf(Path)), + ok = rabbit_file:write_term_file(Path, update_term(NodeMap, Term)). lookup_node(OldNode, NodeMap) -> case dict:find(OldNode, NodeMap) of |