commitlog: close file after read, and not at stop

There are other code paths that may interrupt the read in the middle
and bypass stop. It's safer this way.

Signed-off-by: Glauber Costa <glauber@scylladb.com>
Message-Id: <8c32ca2777ce2f44462d141fd582848ac7cf832d.1479477360.git.glauber@scylladb.com>
(cherry picked from commit 60b7d35f15)
This commit is contained in:
Glauber Costa
2016-11-18 08:56:01 -05:00
committed by Pekka Enberg
parent 127152e0a7
commit 3b7f646f88

View File

@@ -1590,7 +1590,7 @@ db::commitlog::read_log_file(file f, commit_load_reader_func next, position_type
}
future<> stop() {
eof = true;
return fin.close();
return make_ready_future<>();
}
future<> read_header() {
return fin.read_exactly(segment::descriptor_header_size).then([this](temporary_buffer<char> buf) {
@@ -1744,6 +1744,8 @@ 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();
});
}
};