summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Harrop <rob@rabbitmq.com>2011-04-06 12:34:28 +0100
committerRob Harrop <rob@rabbitmq.com>2011-04-06 12:34:28 +0100
commit038aa54e50a6197f4b7546da0e18fa3692a96821 (patch)
treefb2a6fbfb1ece7b2b1d8d7e156e64fa76a7c8616
parente292e8db2c9437375a2157fd3c7b6c4da0cf1d2b (diff)
parentae329cdb93b355bc73824d46245a5ee077be1644 (diff)
downloadrabbitmq-server-git-038aa54e50a6197f4b7546da0e18fa3692a96821.tar.gz
Merge with default
-rw-r--r--src/rabbit_msg_store.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl
index 656881423d..3f4162cdd9 100644
--- a/src/rabbit_msg_store.erl
+++ b/src/rabbit_msg_store.erl
@@ -1891,7 +1891,10 @@ copy_messages(WorkList, InitOffset, FinalOffset, SourceHdl, DestinationHdl,
force_recovery(BaseDir, Store) ->
Dir = filename:join(BaseDir, atom_to_list(Store)),
- ok = file:delete(filename:join(Dir, ?CLEAN_FILENAME)),
+ case file:delete(filename:join(Dir, ?CLEAN_FILENAME)) of
+ ok -> ok;
+ {error, enoent} -> ok
+ end,
recover_crashed_compactions(BaseDir),
ok.