bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

sstable_directory: Split delete_with_pending_deletion_log()

Browse Source 
The helper consists of three parts -- prepare the deletion log, unlink
sstables and drop the deletion log. For testing the first part is needed
as a separate step, so here's this split.

It renders two nested async contexts, but it will change soon.

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>
This commit is contained in:
Pavel Emelyanov
2023-11-30 14:20:45 +03:00
parent bae6f3387f
commit ed043e5762
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sstables/sstable_directory.cc
View File

@@ -545,8 +545,8 @@ bool sstable_directory::compare_sstable_storage_prefix(const sstring& prefix_a,
return size_a == size_b && sstring::traits_type::compare(prefix_a.begin(), prefix_b.begin(), size_a) == 0;
}
future<> sstable_directory::delete_with_pending_deletion_log(std::vector<shared_sstable> ssts) {
return seastar::async([ssts = std::move(ssts)] {
future<std::pair<sstring, sstring>> sstable_directory::create_pending_deletion_log(const std::vector<shared_sstable>& ssts) {
return seastar::async([&ssts] {
shared_sstable first = nullptr;
min_max_tracker<generation_type> gen_tracker;
@@ -601,11 +601,18 @@ future<> sstable_directory::delete_with_pending_deletion_log(std::vector<shared_
sstlog.warn("Error while writing {}: {}. Ignoring.", pending_delete_log, std::current_exception());
}
return std::make_pair<sstring, sstring>(std::move(pending_delete_log), first->_storage->prefix());
});
}
future<> sstable_directory::delete_with_pending_deletion_log(std::vector<shared_sstable> ssts) {
return seastar::async([ssts = std::move(ssts)] {
auto [ pending_delete_log, sst_directory] = create_pending_deletion_log(ssts).get0();
parallel_for_each(ssts, [] (shared_sstable sst) {
return sst->unlink(sstables::storage::sync_dir::no);
}).get();
sync_directory(first->_storage->prefix()).get();
sync_directory(sst_directory).get();
// Once all sstables are deleted, the log file can be removed.
// Note: the log file will be removed also if unlink failed to remove

4
sstables/sstable_directory.hh
View File

@@ -277,6 +277,10 @@ public:
//
// This function only solves the second problem for now.
static future<> delete_with_pending_deletion_log(std::vector<shared_sstable> ssts);
// Creates the deletion log for atomic deletion of sstables (helper for the
// above function that's also used by tests)
// Returns a pair of "logilfe name" and "directory with sstables"
static future<std::pair<sstring, sstring>> create_pending_deletion_log(const std::vector<shared_sstable>& ssts);
static bool compare_sstable_storage_prefix(const sstring& a, const sstring& b) noexcept;
};