posix writablefile truncate

Summary:
we occasionally missing this call so the file size will be wrong
Closes https://github.com/facebook/rocksdb/pull/1894

Differential Revision: D4598446

Pulled By: lightmark

fbshipit-source-id: 42b6ef5
main
Aaron Gao 8 years ago committed by Facebook Github Bot
parent f0879e4c39
commit 286a36db7f
  1. 21
      db/db_test2.cc
  2. 26
      db/db_test_util.h
  3. 11
      util/io_posix.cc
  4. 6
      util/io_posix.h

@ -2277,6 +2277,27 @@ TEST_F(DBTest2, GetRaceFlush2) {
t1.join(); t1.join();
rocksdb::SyncPoint::GetInstance()->DisableProcessing(); rocksdb::SyncPoint::GetInstance()->DisableProcessing();
} }
TEST_F(DBTest2, DirectIO) {
if (!IsDirectIOSupported()) {
return;
}
Options options = CurrentOptions();
options.use_direct_reads = options.use_direct_writes = true;
options.allow_mmap_reads = options.allow_mmap_writes = false;
DestroyAndReopen(options);
ASSERT_OK(Put(Key(0), "a"));
ASSERT_OK(Put(Key(5), "a"));
ASSERT_OK(Flush());
ASSERT_OK(Put(Key(10), "a"));
ASSERT_OK(Put(Key(15), "a"));
ASSERT_OK(Flush());
ASSERT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
Reopen(options);
}
} // namespace rocksdb } // namespace rocksdb
int main(int argc, char** argv) { int main(int argc, char** argv) {

@ -231,6 +231,20 @@ class SpecialEnv : public EnvWrapper {
return base_->Append(data); return base_->Append(data);
} }
} }
Status PositionedAppend(const Slice& data, uint64_t offset) {
if (env_->table_write_callback_) {
(*env_->table_write_callback_)();
}
if (env_->drop_writes_.load(std::memory_order_acquire)) {
// Drop writes on the floor
return Status::OK();
} else if (env_->no_space_.load(std::memory_order_acquire)) {
return Status::NoSpace("No space left on device");
} else {
env_->bytes_written_ += data.size();
return base_->PositionedAppend(data, offset);
}
}
Status Truncate(uint64_t size) override { return base_->Truncate(size); } Status Truncate(uint64_t size) override { return base_->Truncate(size); }
Status Close() override { Status Close() override {
// SyncPoint is not supported in Released Windows Mode. // SyncPoint is not supported in Released Windows Mode.
@ -257,6 +271,9 @@ class SpecialEnv : public EnvWrapper {
Env::IOPriority GetIOPriority() override { Env::IOPriority GetIOPriority() override {
return base_->GetIOPriority(); return base_->GetIOPriority();
} }
bool use_direct_io() const override {
return base_->use_direct_io();
}
}; };
class ManifestFile : public WritableFile { class ManifestFile : public WritableFile {
public: public:
@ -358,7 +375,14 @@ class SpecialEnv : public EnvWrapper {
return Status::IOError("simulated write error"); return Status::IOError("simulated write error");
} }
Status s = target()->NewWritableFile(f, r, soptions); EnvOptions optimized = soptions;
if (strstr(f.c_str(), "MANIFEST") != nullptr ||
strstr(f.c_str(), "log") != nullptr) {
optimized.use_mmap_writes = false;
optimized.use_direct_writes = false;
}
Status s = target()->NewWritableFile(f, r, optimized);
if (s.ok()) { if (s.ok()) {
if (strstr(f.c_str(), ".sst") != nullptr) { if (strstr(f.c_str(), ".sst") != nullptr) {
r->reset(new SSTableFile(this, std::move(*r))); r->reset(new SSTableFile(this, std::move(*r)));

@ -656,6 +656,17 @@ Status PosixWritableFile::PositionedAppend(const Slice& data, uint64_t offset) {
return Status::OK(); return Status::OK();
} }
Status PosixWritableFile::Truncate(uint64_t size) {
Status s;
int r = ftruncate(fd_, size);
if (r < 0) {
s = IOError(filename_, errno);
} else {
filesize_ = size;
}
return s;
}
Status PosixWritableFile::Close() { Status PosixWritableFile::Close() {
Status s; Status s;

@ -98,9 +98,9 @@ class PosixWritableFile : public WritableFile {
const EnvOptions& options); const EnvOptions& options);
virtual ~PosixWritableFile(); virtual ~PosixWritableFile();
// Means Close() will properly take care of truncate // Need to implement this so the file is truncated correctly
// and it does not need any additional information // with direct I/O
virtual Status Truncate(uint64_t size) override { return Status::OK(); } virtual Status Truncate(uint64_t size) override;
virtual Status Close() override; virtual Status Close() override;
virtual Status Append(const Slice& data) override; virtual Status Append(const Slice& data) override;
virtual Status PositionedAppend(const Slice& data, uint64_t offset) override; virtual Status PositionedAppend(const Slice& data, uint64_t offset) override;

Loading…
Cancel
Save