From: Sage Weil <sage@inktank.com>
Date: Mon, 11 Feb 2013 03:52:13 +0000 (-0800)
Subject: os/FileStore: do not tolerate ENOENT on collection_add
X-Git-Tag: v0.58~96^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d8891d5add44637c31268a4c4f1b21877e151d32;p=ceph.git

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 44f3b571960e..bfd9137c99ed 100644
--- 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;