From: Samuel Just <rexludorum@gmail.com>
Date: Wed, 21 Mar 2012 03:09:28 +0000 (-0700)
Subject: FileStore: whitelist COLLECTION_MOVE on replay
X-Git-Tag: v0.44.1~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=23313ee6b7dc4c0879b9d7e44d8d73507b237730;p=ceph.git

FileStore: whitelist COLLECTION_MOVE on replay

Signed-off-by: Samuel Just <rexludorum@gmail.com>
---

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 7f198dfd8f4..f6025ab00a6 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -2725,6 +2725,10 @@ unsigned FileStore::_do_transaction(Transaction& t, uint64_t op_seq, int trans_n
 	  dout(10) << "tolerating EEXIST during journal replay since btrfs_snap is not enabled" << dendl;
 	  ok = true;
 	}
+	if (r == -EEXIST && op == Transaction::OP_COLL_MOVE) {
+	  dout(10) << "tolerating EEXIST during journal replay since btrfs_snap is not enabled" << dendl;
+	  ok = true;
+	}
 	if (r == -ERANGE) {
 	  dout(10) << "tolerating ERANGE on replay" << dendl;
 	  ok = true;