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 7f198dfd8f49a129b85a05f0bb467c125a5b2164..f6025ab00a625a940cf118975c6f1e0e77edc7b1 100644 (file)
--- 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;