From 6f77e63b1548c84e135cb6aec782feef38db654a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 11 Aug 2016 12:28:57 -0400 Subject: [PATCH] os/bluestore/BlueFS: do not op_file_update deleted files Make truncate and preallocate no-op if the file has been deleted. Otherwise we may get an op_file_update *after* the op_file_remove in the log, confusing replay. Signed-off-by: Sage Weil --- src/os/bluestore/BlueFS.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc index 8fe5e80463d17..408898ee53099 100644 --- a/src/os/bluestore/BlueFS.cc +++ b/src/os/bluestore/BlueFS.cc @@ -1298,7 +1298,10 @@ int BlueFS::_truncate(FileWriter *h, uint64_t offset) { dout(10) << __func__ << " 0x" << std::hex << offset << std::dec << " file " << h->file->fnode << dendl; - + if (h->file->deleted) { + dout(10) << __func__ << " deleted, no-op" << dendl; + return 0; + } // truncate off unflushed data? if (h->pos < offset && h->pos + h->buffer.length() > offset) { @@ -1417,6 +1420,10 @@ int BlueFS::_preallocate(FileRef f, uint64_t off, uint64_t len) { dout(10) << __func__ << " file " << f->fnode << " 0x" << std::hex << off << "~" << len << std::dec << dendl; + if (f->deleted) { + dout(10) << __func__ << " deleted, no-op" << dendl; + return 0; + } uint64_t allocated = f->fnode.get_allocated(); if (off + len > allocated) { uint64_t want = off + len - allocated;