os/FileStore: do not tolerate ENOENT on collection_add

If we get ENOENT on a collection_add that is a bad thing; do not ignore
the error.  This was hiding #4071 for some time.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 44f3b571960efd5b77037b43cac7ee922b42c1fd..bfd9137c99ed31e7968591df3a00fc51b6bd4cce 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -2610,7 +2610,8 @@ unsigned FileStore::_do_transaction(Transaction& t, uint64_t op_seq, int trans_n
 
       if (r == -ENOENT && !(op == Transaction::OP_CLONERANGE ||
                            op == Transaction::OP_CLONE ||
-                           op == Transaction::OP_CLONERANGE2))
+                           op == Transaction::OP_CLONERANGE2 ||
+                           op == Transaction::OP_COLL_ADD))
        // -ENOENT is normally okay
        // ...including on a replayed OP_RMCOLL with !stable_commits
        ok = true;