summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-02-10 19:52:13 -0800
committerSamuel Just <sam.just@inktank.com>2013-02-12 10:15:03 -0800
commitd8891d5add44637c31268a4c4f1b21877e151d32 (patch)
tree6fdf387a65a1a71d2fe3e42ae75d0a39d03373cc
parent66ddffb721eb137d9859caee0b0a4c6b88a7692c (diff)
downloadceph-d8891d5add44637c31268a4c4f1b21877e151d32.tar.gz
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>
-rw-r--r--src/os/FileStore.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 44f3b571960..bfd9137c99e 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;