Skip to content

Fix: Limit the sorting files based on max_compaction_jobs instead of kNumberFilesToSort to reduce write amplification #14156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ProtoYun wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −12
Open

Fix: Limit the sorting files based on max_compaction_jobs instead of kNumberFilesToSort to reduce write amplification #14156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions db/version_set.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3339,11 +3339,12 @@ void VersionStorageInfo::GenerateLevelFilesBrief() {

void VersionStorageInfo::PrepareForVersionAppend(
const ImmutableOptions& immutable_options,
const MutableCFOptions& mutable_cf_options) {
const MutableCFOptions& mutable_cf_options, uint32_t max_compation_job) {
ComputeCompensatedSizes();
UpdateNumNonEmptyLevels();
CalculateBaseBytes(immutable_options, mutable_cf_options);
UpdateFilesByCompactionPri(immutable_options, mutable_cf_options);
UpdateFilesByCompactionPri(immutable_options, mutable_cf_options,
max_compation_job);
GenerateFileIndexer();
GenerateLevelFilesBrief();
GenerateLevel0NonOverlapping();
Expand All @@ -3361,7 +3362,9 @@ void Version::PrepareAppend(const ReadOptions& read_options,
UpdateAccumulatedStats(read_options);
}

storage_info_.PrepareForVersionAppend(cfd_->ioptions(), mutable_cf_options_);
int max_compation_job = env_->GetBackgroundThreads(Env::Priority::LOW);
storage_info_.PrepareForVersionAppend(cfd_->ioptions(), mutable_cf_options_,
max_compation_job);
}

bool Version::MaybeInitializeFileMetaData(const ReadOptions& read_options,
Expand Down Expand Up @@ -4208,8 +4211,8 @@ namespace {
void SortFileByOverlappingRatio(
const InternalKeyComparator& icmp, const std::vector<FileMetaData*>& files,
const std::vector<FileMetaData*>& next_level_files, SystemClock* clock,
int level, int num_non_empty_levels, uint64_t ttl,
std::vector<Fsize>* temp) {
int level, int num_non_empty_levels, uint64_t ttl, std::vector<Fsize>* temp,
uint32_t max_compaction_job) {
std::unordered_map<uint64_t, uint64_t> file_to_order;
auto next_level_it = next_level_files.begin();

Expand Down Expand Up @@ -4250,9 +4253,10 @@ void SortFileByOverlappingRatio(
ttl_boost_score;
}

size_t num_to_sort = temp->size() > VersionStorageInfo::kNumberFilesToSort
? VersionStorageInfo::kNumberFilesToSort
: temp->size();
size_t num_to_sort =
(max_compaction_job > temp->size() || max_compaction_job == 0)
? temp->size()
: max_compaction_job;

std::partial_sort(
temp->begin(), temp->begin() + num_to_sort, temp->end(),
Expand Down Expand Up @@ -4332,7 +4336,8 @@ void SortFileByRoundRobin(const InternalKeyComparator& icmp,
} // anonymous namespace

void VersionStorageInfo::UpdateFilesByCompactionPri(
const ImmutableOptions& ioptions, const MutableCFOptions& options) {
const ImmutableOptions& ioptions, const MutableCFOptions& options,
uint32_t max_compaction_job) {
if (compaction_style_ == kCompactionStyleNone ||
compaction_style_ == kCompactionStyleFIFO ||
compaction_style_ == kCompactionStyleUniversal) {
Expand Down Expand Up @@ -4379,7 +4384,8 @@ void VersionStorageInfo::UpdateFilesByCompactionPri(
case kMinOverlappingRatio:
SortFileByOverlappingRatio(*internal_comparator_, files_[level],
files_[level + 1], ioptions.clock, level,
num_non_empty_levels_, options.ttl, &temp);
num_non_empty_levels_, options.ttl, &temp,
max_compaction_job);
break;
case kRoundRobin:
SortFileByRoundRobin(*internal_comparator_, &compact_cursor_,
Expand Down
6 changes: 4 additions & 2 deletions db/version_set.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ class VersionStorageInfo {
void AddBlobFile(std::shared_ptr<BlobFileMetaData> blob_file_meta);

void PrepareForVersionAppend(const ImmutableOptions& immutable_options,
const MutableCFOptions& mutable_cf_options);
const MutableCFOptions& mutable_cf_options,
uint32_t max_compation_job = 0);

// REQUIRES: PrepareForVersionAppend has been called
void SetFinalized();
Expand Down Expand Up @@ -648,7 +649,8 @@ class VersionStorageInfo {
void CalculateBaseBytes(const ImmutableOptions& ioptions,
const MutableCFOptions& options);
void UpdateFilesByCompactionPri(const ImmutableOptions& immutable_options,
const MutableCFOptions& mutable_cf_options);
const MutableCFOptions& mutable_cf_options,
uint32_t max_compaction_job);

void GenerateFileIndexer() {
file_indexer_.UpdateIndex(&arena_, num_non_empty_levels_, files_);
Expand Down