From 55dc5204058aa2537c9b96ef42cf3e6cbdac1e4b Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Tue, 13 Dec 2016 09:47:32 +0200 Subject: [PATCH] Revert "commitlog: close file after read, and not at stop" This reverts commit be9e419a3257ba10b95bc36a6808574ee3a56618. --- db/commitlog/commitlog.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/db/commitlog/commitlog.cc b/db/commitlog/commitlog.cc index afe2b5d115..87f7052f72 100644 --- a/db/commitlog/commitlog.cc +++ b/db/commitlog/commitlog.cc @@ -1601,7 +1601,7 @@ db::commitlog::read_log_file(file f, commit_load_reader_func next, position_type } future<> stop() { eof = true; - return make_ready_future<>(); + return fin.close(); } future<> read_header() { return fin.read_exactly(segment::descriptor_header_size).then([this](temporary_buffer buf) { @@ -1755,8 +1755,6 @@ db::commitlog::read_log_file(file f, commit_load_reader_func next, position_type throw segment_data_corruption_error("Data corruption", corrupt_size); } }); - }).finally([this] { - return fin.close(); }); } };