mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-31 20:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

sstable: Move seal_sstable() to storage

Browse Source 
Now the sstable sealing is split into storage part, internal-state part
and the seal-with-backup kick.

This move makes remove_temp_dir() private.

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>
This commit is contained in:
Pavel Emelyanov
2022-12-05 16:39:06 +03:00
parent 334d231f56
commit 136a8681e0
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sstables/sstables.cc
View File

@@ -964,19 +964,19 @@ void sstable::write_toc(const io_priority_class& pc) {
sstable_write_io_check(sync_directory, _storage.dir).get();
}
future<> sstable::seal_sstable() {
future<> sstable::filesystem_storage::seal(const sstable& sst) {
// SSTable sealing is about renaming temporary TOC file after guaranteeing
// that each component reached the disk safely.
co_await _storage.remove_temp_dir();
auto dir_f = co_await open_checked_directory(_write_error_handler, _storage.dir);
co_await remove_temp_dir();
auto dir_f = co_await open_checked_directory(sst._write_error_handler, dir);
// Guarantee that every component of this sstable reached the disk.
co_await sstable_write_io_check([&] { return dir_f.flush(); });
co_await sst.sstable_write_io_check([&] { return dir_f.flush(); });
// Rename TOC because it's no longer temporary.
co_await sstable_write_io_check(rename_file, filename(component_type::TemporaryTOC), filename(component_type::TOC));
co_await sstable_write_io_check([&] { return dir_f.flush(); });
co_await sstable_write_io_check([&] { return dir_f.close(); });
co_await sst.sstable_write_io_check(rename_file, sst.filename(component_type::TemporaryTOC), sst.filename(component_type::TOC));
co_await sst.sstable_write_io_check([&] { return dir_f.flush(); });
co_await sst.sstable_write_io_check([&] { return dir_f.close(); });
// If this point was reached, sstable should be safe in disk.
sstlog.debug("SSTable with generation {} of {}.{} was sealed successfully.", _generation, _schema->ks_name(), _schema->cf_name());
sstlog.debug("SSTable with generation {} of {}.{} was sealed successfully.", sst._generation, sst._schema->ks_name(), sst._schema->cf_name());
}
void sstable::write_crc(const checksum& c) {
@@ -1748,7 +1748,7 @@ bool sstable::may_contain_rows(const query::clustering_row_ranges& ranges) const
future<> sstable::seal_sstable(bool backup)
{
return seal_sstable().then([this, backup] {
return _storage.seal(*this).then([this, backup] {
if (_marked_for_deletion == mark_for_deletion::implicit) {
_marked_for_deletion = mark_for_deletion::none;
}

4
sstables/sstables.hh
View File

@@ -483,10 +483,11 @@ public:
private:
future<> check_create_links_replay(const sstable& sst, const sstring& dst_dir, generation_type dst_gen, const std::vector<std::pair<sstables::component_type, sstring>>& comps) const;
future<> remove_temp_dir();
public:
future<> create_links_common(const sstable& sst, sstring dst_dir, generation_type dst_gen, mark_for_removal mark_for_removal) const;
future<> remove_temp_dir();
future<> seal(const sstable& sst);
};
private:
@@ -603,7 +604,6 @@ private:
void generate_toc(compressor_ptr c, double filter_fp_chance);
void write_toc(const io_priority_class& pc);
future<> seal_sstable();
future<> read_compression(const io_priority_class& pc);
void write_compression(const io_priority_class& pc);