mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-12 19:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: avoid fsyncing output stream twice

Browse Source 
For some reason, I added a fsync call when the file underlying the
stream gets truncated. That happens when flushing a file, which
size isn't aligned to the requested DMA buffer.
Instead, fsync should only be called when closing the stream, so this
patch changes the code to do that.

Signed-off-by: Raphael S. Carvalho <raphaelsc@cloudius-systems.com>
This commit is contained in:
Raphael S. Carvalho
2015-06-07 15:13:22 +03:00
committed by Avi Kivity
parent 89115e8da2
commit d864da71fc
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/fstream.cc
View File

@@ -111,9 +111,7 @@ public:
return _file->dma_write(pos, p, buf_size).then(
[this, buf = std::move(buf), truncate] (size_t size) {
if (truncate) {
return _file->truncate(_pos).then([this] {
return _file->flush();
});
return _file->truncate(_pos);
}
return make_ready_future<>();
});

6
tests/fstream_test.cc
View File

@@ -52,7 +52,7 @@ SEASTAR_TEST_CASE(test_fstream) {
buf[4095] = ']';
w->out.write(buf, 4096).then([buf, w] {
::free(buf);
return w->out.flush();
return make_ready_future<>();
}).then([w] {
auto buf = static_cast<char*>(::malloc(8192));
memset(buf, 0, 8192);
@@ -61,7 +61,7 @@ SEASTAR_TEST_CASE(test_fstream) {
buf[8191] = ']';
return w->out.write(buf, 8192).then([buf, w] {
::free(buf);
return w->out.flush();
return w->out.close().then([w] {});
});
}).then([] {
return engine().open_file_dma("testfile.tmp", open_flags::ro);
@@ -105,7 +105,7 @@ SEASTAR_TEST_CASE(test_fstream_unaligned) {
buf[39] = ']';
w->out.write(buf, 40).then([buf, w] {
::free(buf);
return w->out.flush().then([w] {});
return w->out.close().then([w] {});
}).then([] {
return engine().open_file_dma("testfile.tmp", open_flags::ro);
}).then([] (file f) {