default_write_temperature option (#12388)

Summary:
Currently SST files that aren't applicable to last_level_temperature nor file_temperature_age_thresholds are written with temperature kUnknown, which is a little weird and doesn't support CF-based tiering. The default_temperature option only affects how kUnknown is interpreted for stats.

This change adds a new per-CF option default_write_temperature that determines the temperature of new SST files when those other options do not apply.

Also made a change to ignore last_level_temperature with FIFO compaction, because I found that could lead to an infinite loop in compaction.

Needed follow-up: Fix temperature handling with external file ingestion

Pull Request resolved: https://github.com/facebook/rocksdb/pull/12388

Test Plan: unit tests extended appropriately. (Ignore whitespace changes when reviewing.)

Reviewed By: jowlyzhang

Differential Revision: D54266574

Pulled By: pdillinger

fbshipit-source-id: c9ec9a74dbf22be6e986f77f9689d05fea8ef0bb
This commit is contained in:
Peter Dillinger 2024-02-28 14:36:13 -08:00 committed by Facebook GitHub Bot
parent 5458eda5f0
commit 13ef21c22e
20 changed files with 266 additions and 146 deletions

View File

@ -411,6 +411,13 @@ ColumnFamilyOptions SanitizeOptions(const ImmutableDBOptions& db_options,
"periodic_compaction_seconds does not support FIFO compaction. You" "periodic_compaction_seconds does not support FIFO compaction. You"
"may want to set option TTL instead."); "may want to set option TTL instead.");
} }
if (result.last_level_temperature != Temperature::kUnknown) {
ROCKS_LOG_WARN(
db_options.info_log.get(),
"last_level_temperature is ignored with FIFO compaction. Consider "
"CompactionOptionsFIFO::file_temperature_age_thresholds.");
result.last_level_temperature = Temperature::kUnknown;
}
} }
// For universal compaction, `ttl` and `periodic_compaction_seconds` mean the // For universal compaction, `ttl` and `periodic_compaction_seconds` mean the

View File

@ -1850,13 +1850,14 @@ Status CompactionJob::OpenCompactionOutputFile(SubcompactionState* sub_compact,
// Pass temperature of the last level files to FileSystem. // Pass temperature of the last level files to FileSystem.
FileOptions fo_copy = file_options_; FileOptions fo_copy = file_options_;
Temperature temperature = sub_compact->compaction->output_temperature(); Temperature temperature = sub_compact->compaction->output_temperature();
// only set for the last level compaction and also it's not output to Temperature last_level_temp =
// penultimate level (when preclude_last_level feature is enabled) sub_compact->compaction->mutable_cf_options()->last_level_temperature;
if (temperature == Temperature::kUnknown && // Here last_level_temperature supersedes default_write_temperature, when
// enabled and applicable
if (last_level_temp != Temperature::kUnknown &&
sub_compact->compaction->is_last_level() && sub_compact->compaction->is_last_level() &&
!sub_compact->IsCurrentPenultimateLevel()) { !sub_compact->IsCurrentPenultimateLevel()) {
temperature = temperature = last_level_temp;
sub_compact->compaction->mutable_cf_options()->last_level_temperature;
} }
fo_copy.temperature = temperature; fo_copy.temperature = temperature;

View File

@ -377,7 +377,8 @@ Compaction* CompactionPicker::CompactFiles(
output_level, compact_options.output_file_size_limit, output_level, compact_options.output_file_size_limit,
mutable_cf_options.max_compaction_bytes, output_path_id, compression_type, mutable_cf_options.max_compaction_bytes, output_path_id, compression_type,
GetCompressionOptions(mutable_cf_options, vstorage, output_level), GetCompressionOptions(mutable_cf_options, vstorage, output_level),
Temperature::kUnknown, compact_options.max_subcompactions, mutable_cf_options.default_write_temperature,
compact_options.max_subcompactions,
/* grandparents */ {}, true); /* grandparents */ {}, true);
RegisterCompaction(c); RegisterCompaction(c);
return c; return c;
@ -664,7 +665,8 @@ Compaction* CompactionPicker::CompactRange(
compact_range_options.target_path_id, compact_range_options.target_path_id,
GetCompressionType(vstorage, mutable_cf_options, output_level, 1), GetCompressionType(vstorage, mutable_cf_options, output_level, 1),
GetCompressionOptions(mutable_cf_options, vstorage, output_level), GetCompressionOptions(mutable_cf_options, vstorage, output_level),
Temperature::kUnknown, compact_range_options.max_subcompactions, mutable_cf_options.default_write_temperature,
compact_range_options.max_subcompactions,
/* grandparents */ {}, /* is manual */ true, trim_ts, /* score */ -1, /* grandparents */ {}, /* is manual */ true, trim_ts, /* score */ -1,
/* deletion_compaction */ false, /* l0_files_might_overlap */ true, /* deletion_compaction */ false, /* l0_files_might_overlap */ true,
CompactionReason::kUnknown, CompactionReason::kUnknown,
@ -852,8 +854,9 @@ Compaction* CompactionPicker::CompactRange(
GetCompressionType(vstorage, mutable_cf_options, output_level, GetCompressionType(vstorage, mutable_cf_options, output_level,
vstorage->base_level()), vstorage->base_level()),
GetCompressionOptions(mutable_cf_options, vstorage, output_level), GetCompressionOptions(mutable_cf_options, vstorage, output_level),
Temperature::kUnknown, compact_range_options.max_subcompactions, mutable_cf_options.default_write_temperature,
std::move(grandparents), /* is manual */ true, trim_ts, /* score */ -1, compact_range_options.max_subcompactions, std::move(grandparents),
/* is manual */ true, trim_ts, /* score */ -1,
/* deletion_compaction */ false, /* l0_files_might_overlap */ true, /* deletion_compaction */ false, /* l0_files_might_overlap */ true,
CompactionReason::kUnknown, CompactionReason::kUnknown,
compact_range_options.blob_garbage_collection_policy, compact_range_options.blob_garbage_collection_policy,

View File

@ -116,7 +116,8 @@ Compaction* FIFOCompactionPicker::PickTTLCompaction(
Compaction* c = new Compaction( Compaction* c = new Compaction(
vstorage, ioptions_, mutable_cf_options, mutable_db_options, vstorage, ioptions_, mutable_cf_options, mutable_db_options,
std::move(inputs), 0, 0, 0, 0, kNoCompression, std::move(inputs), 0, 0, 0, 0, kNoCompression,
mutable_cf_options.compression_opts, Temperature::kUnknown, mutable_cf_options.compression_opts,
mutable_cf_options.default_write_temperature,
/* max_subcompactions */ 0, {}, /* is manual */ false, /* max_subcompactions */ 0, {}, /* is manual */ false,
/* trim_ts */ "", vstorage->CompactionScore(0), /* trim_ts */ "", vstorage->CompactionScore(0),
/* is deletion compaction */ true, /* l0_files_might_overlap */ true, /* is deletion compaction */ true, /* l0_files_might_overlap */ true,
@ -185,7 +186,8 @@ Compaction* FIFOCompactionPicker::PickSizeCompaction(
{comp_inputs}, 0, 16 * 1024 * 1024 /* output file size limit */, {comp_inputs}, 0, 16 * 1024 * 1024 /* output file size limit */,
0 /* max compaction bytes, not applicable */, 0 /* max compaction bytes, not applicable */,
0 /* output path ID */, mutable_cf_options.compression, 0 /* output path ID */, mutable_cf_options.compression,
mutable_cf_options.compression_opts, Temperature::kUnknown, mutable_cf_options.compression_opts,
mutable_cf_options.default_write_temperature,
0 /* max_subcompactions */, {}, /* is manual */ false, 0 /* max_subcompactions */, {}, /* is manual */ false,
/* trim_ts */ "", vstorage->CompactionScore(0), /* trim_ts */ "", vstorage->CompactionScore(0),
/* is deletion compaction */ false, /* is deletion compaction */ false,
@ -280,7 +282,8 @@ Compaction* FIFOCompactionPicker::PickSizeCompaction(
/* target_file_size */ 0, /* target_file_size */ 0,
/* max_compaction_bytes */ 0, /* max_compaction_bytes */ 0,
/* output_path_id */ 0, kNoCompression, /* output_path_id */ 0, kNoCompression,
mutable_cf_options.compression_opts, Temperature::kUnknown, mutable_cf_options.compression_opts,
mutable_cf_options.default_write_temperature,
/* max_subcompactions */ 0, {}, /* is manual */ false, /* max_subcompactions */ 0, {}, /* is manual */ false,
/* trim_ts */ "", vstorage->CompactionScore(0), /* trim_ts */ "", vstorage->CompactionScore(0),
/* is deletion compaction */ true, /* is deletion compaction */ true,
@ -414,6 +417,7 @@ Compaction* FIFOCompactionPicker::PickTemperatureChangeCompaction(
if (inputs[0].files.empty()) { if (inputs[0].files.empty()) {
return nullptr; return nullptr;
} }
assert(compaction_target_temp != Temperature::kLastTemperature);
Compaction* c = new Compaction( Compaction* c = new Compaction(
vstorage, ioptions_, mutable_cf_options, mutable_db_options, vstorage, ioptions_, mutable_cf_options, mutable_db_options,

View File

@ -550,7 +550,7 @@ Compaction* LevelCompactionBuilder::GetCompaction() {
GetCompressionType(vstorage_, mutable_cf_options_, output_level_, GetCompressionType(vstorage_, mutable_cf_options_, output_level_,
vstorage_->base_level()), vstorage_->base_level()),
GetCompressionOptions(mutable_cf_options_, vstorage_, output_level_), GetCompressionOptions(mutable_cf_options_, vstorage_, output_level_),
Temperature::kUnknown, mutable_cf_options_.default_write_temperature,
/* max_subcompactions */ 0, std::move(grandparents_), is_manual_, /* max_subcompactions */ 0, std::move(grandparents_), is_manual_,
/* trim_ts */ "", start_level_score_, false /* deletion_compaction */, /* trim_ts */ "", start_level_score_, false /* deletion_compaction */,
l0_files_might_overlap, compaction_reason_); l0_files_might_overlap, compaction_reason_);

View File

@ -870,7 +870,7 @@ Compaction* UniversalCompactionBuilder::PickCompactionToReduceSortedRuns(
output_level, 1, enable_compression), output_level, 1, enable_compression),
GetCompressionOptions(mutable_cf_options_, vstorage_, GetCompressionOptions(mutable_cf_options_, vstorage_,
output_level, enable_compression), output_level, enable_compression),
Temperature::kUnknown, mutable_cf_options_.default_write_temperature,
/* max_subcompactions */ 0, grandparents, /* max_subcompactions */ 0, grandparents,
/* is manual */ false, /* trim_ts */ "", score_, /* is manual */ false, /* trim_ts */ "", score_,
false /* deletion_compaction */, false /* deletion_compaction */,
@ -1204,7 +1204,7 @@ Compaction* UniversalCompactionBuilder::PickIncrementalForReduceSizeAmp(
true /* enable_compression */), true /* enable_compression */),
GetCompressionOptions(mutable_cf_options_, vstorage_, output_level, GetCompressionOptions(mutable_cf_options_, vstorage_, output_level,
true /* enable_compression */), true /* enable_compression */),
Temperature::kUnknown, mutable_cf_options_.default_write_temperature,
/* max_subcompactions */ 0, /* grandparents */ {}, /* is manual */ false, /* max_subcompactions */ 0, /* grandparents */ {}, /* is manual */ false,
/* trim_ts */ "", score_, false /* deletion_compaction */, /* trim_ts */ "", score_, false /* deletion_compaction */,
/* l0_files_might_overlap */ true, /* l0_files_might_overlap */ true,
@ -1347,7 +1347,7 @@ Compaction* UniversalCompactionBuilder::PickDeleteTriggeredCompaction() {
/* max_grandparent_overlap_bytes */ GetMaxOverlappingBytes(), path_id, /* max_grandparent_overlap_bytes */ GetMaxOverlappingBytes(), path_id,
GetCompressionType(vstorage_, mutable_cf_options_, output_level, 1), GetCompressionType(vstorage_, mutable_cf_options_, output_level, 1),
GetCompressionOptions(mutable_cf_options_, vstorage_, output_level), GetCompressionOptions(mutable_cf_options_, vstorage_, output_level),
Temperature::kUnknown, mutable_cf_options_.default_write_temperature,
/* max_subcompactions */ 0, grandparents, /* is manual */ false, /* max_subcompactions */ 0, grandparents, /* is manual */ false,
/* trim_ts */ "", score_, false /* deletion_compaction */, /* trim_ts */ "", score_, false /* deletion_compaction */,
/* l0_files_might_overlap */ true, /* l0_files_might_overlap */ true,
@ -1440,7 +1440,7 @@ Compaction* UniversalCompactionBuilder::PickCompactionWithSortedRunRange(
true /* enable_compression */), true /* enable_compression */),
GetCompressionOptions(mutable_cf_options_, vstorage_, output_level, GetCompressionOptions(mutable_cf_options_, vstorage_, output_level,
true /* enable_compression */), true /* enable_compression */),
Temperature::kUnknown, mutable_cf_options_.default_write_temperature,
/* max_subcompactions */ 0, /* grandparents */ {}, /* is manual */ false, /* max_subcompactions */ 0, /* grandparents */ {}, /* is manual */ false,
/* trim_ts */ "", score_, false /* deletion_compaction */, /* trim_ts */ "", score_, false /* deletion_compaction */,
/* l0_files_might_overlap */ true, compaction_reason); /* l0_files_might_overlap */ true, compaction_reason);

View File

@ -9164,6 +9164,9 @@ TEST_F(DBCompactionTest, CompactionWithChecksumHandoffManifest2) {
} }
TEST_F(DBCompactionTest, FIFOChangeTemperature) { TEST_F(DBCompactionTest, FIFOChangeTemperature) {
for (bool write_time_default : {false, true}) {
SCOPED_TRACE("write time default? " + std::to_string(write_time_default));
Options options = CurrentOptions(); Options options = CurrentOptions();
options.compaction_style = kCompactionStyleFIFO; options.compaction_style = kCompactionStyleFIFO;
options.num_levels = 1; options.num_levels = 1;
@ -9175,14 +9178,29 @@ TEST_F(DBCompactionTest, FIFOChangeTemperature) {
fifo_options.max_table_files_size = 100000000; fifo_options.max_table_files_size = 100000000;
options.compaction_options_fifo = fifo_options; options.compaction_options_fifo = fifo_options;
env_->SetMockSleep(); env_->SetMockSleep();
if (write_time_default) {
options.default_write_temperature = Temperature::kWarm;
}
// Should be ignored (TODO: fail?)
options.last_level_temperature = Temperature::kHot;
Reopen(options); Reopen(options);
int total_cold = 0; int total_cold = 0;
int total_warm = 0;
int total_hot = 0;
int total_unknown = 0;
ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack( ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
"NewWritableFile::FileOptions.temperature", [&](void* arg) { "NewWritableFile::FileOptions.temperature", [&](void* arg) {
Temperature temperature = *(static_cast<Temperature*>(arg)); Temperature temperature = *(static_cast<Temperature*>(arg));
if (temperature == Temperature::kCold) { if (temperature == Temperature::kCold) {
total_cold++; total_cold++;
} else if (temperature == Temperature::kWarm) {
total_warm++;
} else if (temperature == Temperature::kHot) {
total_hot++;
} else {
assert(temperature == Temperature::kUnknown);
total_unknown++;
} }
}); });
ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing(); ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();
@ -9205,6 +9223,11 @@ TEST_F(DBCompactionTest, FIFOChangeTemperature) {
ASSERT_OK(Flush()); ASSERT_OK(Flush());
ASSERT_OK(dbfull()->TEST_WaitForCompact()); ASSERT_OK(dbfull()->TEST_WaitForCompact());
if (write_time_default) {
// Also test dynamic option change
ASSERT_OK(db_->SetOptions({{"default_write_temperature", "kHot"}}));
}
ASSERT_OK(Put(Key(0), "value1")); ASSERT_OK(Put(Key(0), "value1"));
env_->MockSleepForSeconds(800); env_->MockSleepForSeconds(800);
ASSERT_OK(Put(Key(2), "value2")); ASSERT_OK(Put(Key(2), "value2"));
@ -9217,13 +9240,28 @@ TEST_F(DBCompactionTest, FIFOChangeTemperature) {
ColumnFamilyMetaData metadata; ColumnFamilyMetaData metadata;
db_->GetColumnFamilyMetaData(&metadata); db_->GetColumnFamilyMetaData(&metadata);
ASSERT_EQ(4, metadata.file_count); ASSERT_EQ(4, metadata.file_count);
if (write_time_default) {
ASSERT_EQ(Temperature::kHot, metadata.levels[0].files[0].temperature);
ASSERT_EQ(Temperature::kWarm, metadata.levels[0].files[1].temperature);
// Includes obsolete/deleted files moved to cold
ASSERT_EQ(total_warm, 3);
ASSERT_EQ(total_hot, 1);
// Includes non-SST DB files
ASSERT_GT(total_unknown, 0);
} else {
ASSERT_EQ(Temperature::kUnknown, metadata.levels[0].files[0].temperature); ASSERT_EQ(Temperature::kUnknown, metadata.levels[0].files[0].temperature);
ASSERT_EQ(Temperature::kUnknown, metadata.levels[0].files[1].temperature); ASSERT_EQ(Temperature::kUnknown, metadata.levels[0].files[1].temperature);
ASSERT_EQ(total_warm, 0);
ASSERT_EQ(total_hot, 0);
// Includes non-SST DB files
ASSERT_GT(total_unknown, 4);
}
ASSERT_EQ(Temperature::kCold, metadata.levels[0].files[2].temperature); ASSERT_EQ(Temperature::kCold, metadata.levels[0].files[2].temperature);
ASSERT_EQ(Temperature::kCold, metadata.levels[0].files[3].temperature); ASSERT_EQ(Temperature::kCold, metadata.levels[0].files[3].temperature);
ASSERT_EQ(2, total_cold); ASSERT_EQ(2, total_cold);
Destroy(options); Destroy(options);
}
} }
TEST_F(DBCompactionTest, DisableMultiManualCompaction) { TEST_F(DBCompactionTest, DisableMultiManualCompaction) {

View File

@ -1868,7 +1868,8 @@ Status DBImpl::ReFitLevel(ColumnFamilyData* cfd, int level, int target_level) {
, ,
LLONG_MAX /* max compaction bytes, not applicable */, LLONG_MAX /* max compaction bytes, not applicable */,
0 /* output path ID, not applicable */, mutable_cf_options.compression, 0 /* output path ID, not applicable */, mutable_cf_options.compression,
mutable_cf_options.compression_opts, Temperature::kUnknown, mutable_cf_options.compression_opts,
mutable_cf_options.default_write_temperature,
0 /* max_subcompactions, not applicable */, 0 /* max_subcompactions, not applicable */,
{} /* grandparents, not applicable */, false /* is manual */, {} /* grandparents, not applicable */, false /* is manual */,
"" /* trim_ts */, -1 /* score, not applicable */, "" /* trim_ts */, -1 /* score, not applicable */,

View File

@ -6904,16 +6904,28 @@ TEST_F(DBTest2, LastLevelTemperatureUniversal) {
} }
TEST_F(DBTest2, LastLevelStatistics) { TEST_F(DBTest2, LastLevelStatistics) {
for (bool write_time_default : {false, true}) {
SCOPED_TRACE("write time default? " + std::to_string(write_time_default));
Options options = CurrentOptions(); Options options = CurrentOptions();
options.last_level_temperature = Temperature::kWarm; options.last_level_temperature = Temperature::kWarm;
if (write_time_default) {
options.default_write_temperature = Temperature::kHot;
ASSERT_EQ(options.default_temperature, Temperature::kUnknown);
} else {
options.default_temperature = Temperature::kHot; options.default_temperature = Temperature::kHot;
ASSERT_EQ(options.default_write_temperature, Temperature::kUnknown);
}
options.level0_file_num_compaction_trigger = 2; options.level0_file_num_compaction_trigger = 2;
options.level_compaction_dynamic_level_bytes = true; options.level_compaction_dynamic_level_bytes = true;
options.statistics = CreateDBStatistics(); options.statistics = CreateDBStatistics();
Reopen(options); BlockBasedTableOptions bbto;
bbto.no_block_cache = true;
options.table_factory.reset(NewBlockBasedTableFactory(bbto));
DestroyAndReopen(options);
// generate 1 sst on level 0 // generate 1 sst on level 0
ASSERT_OK(Put("foo", "bar")); ASSERT_OK(Put("foo1", "bar"));
ASSERT_OK(Put("bar", "bar")); ASSERT_OK(Put("bar", "bar"));
ASSERT_OK(Flush()); ASSERT_OK(Flush());
ASSERT_EQ("bar", Get("bar")); ASSERT_EQ("bar", Get("bar"));
@ -6928,7 +6940,7 @@ TEST_F(DBTest2, LastLevelStatistics) {
ASSERT_EQ(options.statistics->getTickerCount(LAST_LEVEL_READ_COUNT), 0); ASSERT_EQ(options.statistics->getTickerCount(LAST_LEVEL_READ_COUNT), 0);
// 2nd flush to trigger compaction // 2nd flush to trigger compaction
ASSERT_OK(Put("foo", "bar")); ASSERT_OK(Put("foo2", "bar"));
ASSERT_OK(Put("bar", "bar")); ASSERT_OK(Put("bar", "bar"));
ASSERT_OK(Flush()); ASSERT_OK(Flush());
ASSERT_OK(dbfull()->TEST_WaitForCompact()); ASSERT_OK(dbfull()->TEST_WaitForCompact());
@ -6949,9 +6961,12 @@ TEST_F(DBTest2, LastLevelStatistics) {
options.statistics->getTickerCount(NON_LAST_LEVEL_READ_COUNT); options.statistics->getTickerCount(NON_LAST_LEVEL_READ_COUNT);
// 3rd flush to generate 1 sst on level 0 // 3rd flush to generate 1 sst on level 0
ASSERT_OK(Put("foo", "bar")); ASSERT_OK(Put("foo3", "bar"));
ASSERT_OK(Put("bar", "bar")); ASSERT_OK(Put("bar", "bar"));
ASSERT_OK(Flush()); ASSERT_OK(Flush());
ASSERT_EQ("bar", Get("foo1"));
ASSERT_EQ("bar", Get("foo2"));
ASSERT_EQ("bar", Get("foo3"));
ASSERT_EQ("bar", Get("bar")); ASSERT_EQ("bar", Get("bar"));
ASSERT_GT(options.statistics->getTickerCount(NON_LAST_LEVEL_READ_BYTES), ASSERT_GT(options.statistics->getTickerCount(NON_LAST_LEVEL_READ_BYTES),
@ -6966,6 +6981,9 @@ TEST_F(DBTest2, LastLevelStatistics) {
options.statistics->getTickerCount(WARM_FILE_READ_BYTES)); options.statistics->getTickerCount(WARM_FILE_READ_BYTES));
ASSERT_EQ(options.statistics->getTickerCount(LAST_LEVEL_READ_COUNT), ASSERT_EQ(options.statistics->getTickerCount(LAST_LEVEL_READ_COUNT),
options.statistics->getTickerCount(WARM_FILE_READ_COUNT)); options.statistics->getTickerCount(WARM_FILE_READ_COUNT));
// Control
ASSERT_NE(options.statistics->getTickerCount(LAST_LEVEL_READ_COUNT),
options.statistics->getTickerCount(NON_LAST_LEVEL_READ_COUNT));
// Not a realistic setting to make last level kWarm and default temp kCold. // Not a realistic setting to make last level kWarm and default temp kCold.
// This is just for testing default temp can be reset on reopen while the // This is just for testing default temp can be reset on reopen while the
@ -6974,18 +6992,39 @@ TEST_F(DBTest2, LastLevelStatistics) {
options.default_temperature = Temperature::kCold; options.default_temperature = Temperature::kCold;
ASSERT_OK(options.statistics->Reset()); ASSERT_OK(options.statistics->Reset());
Reopen(options); Reopen(options);
ASSERT_EQ("bar", Get("foo1"));
ASSERT_EQ("bar", Get("foo2"));
ASSERT_EQ("bar", Get("foo3"));
ASSERT_EQ("bar", Get("bar")); ASSERT_EQ("bar", Get("bar"));
ASSERT_EQ(0, options.statistics->getTickerCount(HOT_FILE_READ_BYTES)); if (write_time_default) {
// Unchanged
ASSERT_EQ(options.statistics->getTickerCount(NON_LAST_LEVEL_READ_BYTES),
options.statistics->getTickerCount(HOT_FILE_READ_BYTES));
ASSERT_EQ(options.statistics->getTickerCount(NON_LAST_LEVEL_READ_COUNT),
options.statistics->getTickerCount(HOT_FILE_READ_COUNT));
ASSERT_LT(0, options.statistics->getTickerCount(HOT_FILE_READ_BYTES));
ASSERT_EQ(0, options.statistics->getTickerCount(COLD_FILE_READ_BYTES));
} else {
// Changed (in how we map kUnknown)
ASSERT_EQ(options.statistics->getTickerCount(NON_LAST_LEVEL_READ_BYTES), ASSERT_EQ(options.statistics->getTickerCount(NON_LAST_LEVEL_READ_BYTES),
options.statistics->getTickerCount(COLD_FILE_READ_BYTES)); options.statistics->getTickerCount(COLD_FILE_READ_BYTES));
ASSERT_EQ(options.statistics->getTickerCount(NON_LAST_LEVEL_READ_COUNT), ASSERT_EQ(options.statistics->getTickerCount(NON_LAST_LEVEL_READ_COUNT),
options.statistics->getTickerCount(COLD_FILE_READ_COUNT)); options.statistics->getTickerCount(COLD_FILE_READ_COUNT));
ASSERT_EQ(0, options.statistics->getTickerCount(HOT_FILE_READ_BYTES));
ASSERT_LT(0, options.statistics->getTickerCount(COLD_FILE_READ_BYTES));
}
ASSERT_EQ(options.statistics->getTickerCount(LAST_LEVEL_READ_BYTES), ASSERT_EQ(options.statistics->getTickerCount(LAST_LEVEL_READ_BYTES),
options.statistics->getTickerCount(WARM_FILE_READ_BYTES)); options.statistics->getTickerCount(WARM_FILE_READ_BYTES));
ASSERT_EQ(options.statistics->getTickerCount(LAST_LEVEL_READ_COUNT), ASSERT_EQ(options.statistics->getTickerCount(LAST_LEVEL_READ_COUNT),
options.statistics->getTickerCount(WARM_FILE_READ_COUNT)); options.statistics->getTickerCount(WARM_FILE_READ_COUNT));
// Control
ASSERT_NE(options.statistics->getTickerCount(LAST_LEVEL_READ_COUNT),
options.statistics->getTickerCount(NON_LAST_LEVEL_READ_COUNT));
}
} }
TEST_F(DBTest2, CheckpointFileTemperature) { TEST_F(DBTest2, CheckpointFileTemperature) {

View File

@ -160,6 +160,8 @@ Status ExternalSstFileIngestionJob::Prepare(
TEST_SYNC_POINT_CALLBACK("ExternalSstFileIngestionJob::Prepare:CopyFile", TEST_SYNC_POINT_CALLBACK("ExternalSstFileIngestionJob::Prepare:CopyFile",
nullptr); nullptr);
// CopyFile also sync the new file. // CopyFile also sync the new file.
// FIXME: use sv->mutable_cf_options.default_write_temperature and
// sort out exact temperature handling
status = status =
CopyFile(fs_.get(), path_outside_db, path_inside_db, 0, CopyFile(fs_.get(), path_outside_db, path_inside_db, 0,
db_options_.use_fsync, io_tracer_, Temperature::kUnknown); db_options_.use_fsync, io_tracer_, Temperature::kUnknown);
@ -515,7 +517,8 @@ void ExternalSstFileIngestionJob::CreateEquivalentFileIngestingCompactions() {
, ,
LLONG_MAX /* max compaction bytes, not applicable */, LLONG_MAX /* max compaction bytes, not applicable */,
0 /* output path ID, not applicable */, mutable_cf_options.compression, 0 /* output path ID, not applicable */, mutable_cf_options.compression,
mutable_cf_options.compression_opts, Temperature::kUnknown, mutable_cf_options.compression_opts,
mutable_cf_options.default_write_temperature,
0 /* max_subcompaction, not applicable */, 0 /* max_subcompaction, not applicable */,
{} /* grandparents, not applicable */, false /* is manual */, {} /* grandparents, not applicable */, false /* is manual */,
"" /* trim_ts */, -1 /* score, not applicable */, "" /* trim_ts */, -1 /* score, not applicable */,

View File

@ -856,6 +856,8 @@ Status FlushJob::WriteLevel0Table() {
seqno_to_time_mapping_.CopyFromSeqnoRange(db_impl_seqno_to_time_mapping_, seqno_to_time_mapping_.CopyFromSeqnoRange(db_impl_seqno_to_time_mapping_,
smallest_seqno); smallest_seqno);
} }
meta_.temperature = mutable_cf_options_.default_write_temperature;
file_options_.temperature = meta_.temperature;
std::vector<BlobFileAddition> blob_file_additions; std::vector<BlobFileAddition> blob_file_additions;

View File

@ -157,7 +157,7 @@ class FlushJob {
// this job. All memtables in this column family with an ID smaller than or // this job. All memtables in this column family with an ID smaller than or
// equal to max_memtable_id_ will be selected for flush. // equal to max_memtable_id_ will be selected for flush.
uint64_t max_memtable_id_; uint64_t max_memtable_id_;
const FileOptions file_options_; FileOptions file_options_;
VersionSet* versions_; VersionSet* versions_;
InstrumentedMutex* db_mutex_; InstrumentedMutex* db_mutex_;
std::atomic<bool>* shutting_down_; std::atomic<bool>* shutting_down_;

View File

@ -462,7 +462,6 @@ IOStatus RandomAccessFileReader::MultiRead(const IOOptions& opts,
file_name(), read_reqs[i].result.size(), file_name(), read_reqs[i].result.size(),
read_reqs[i].offset); read_reqs[i].offset);
} }
RecordIOStats(stats_, file_temperature_, is_last_level_, RecordIOStats(stats_, file_temperature_, is_last_level_,
read_reqs[i].result.size()); read_reqs[i].result.size());
} }

View File

@ -803,20 +803,28 @@ struct AdvancedColumnFamilyOptions {
uint64_t sample_for_compression = 0; uint64_t sample_for_compression = 0;
// EXPERIMENTAL // EXPERIMENTAL
// The feature is still in development and is incomplete.
// If this option is set, when creating the last level files, pass this // If this option is set, when creating the last level files, pass this
// temperature to FileSystem used. Should be no-op for default FileSystem // temperature to FileSystem used. Should be no-op for default FileSystem
// and users need to plug in their own FileSystem to take advantage of it. // and users need to plug in their own FileSystem to take advantage of it.
// When using FIFO compaction, this option is ignored.
// //
// Dynamically changeable through the SetOptions() API // Dynamically changeable through the SetOptions() API
Temperature last_level_temperature = Temperature::kUnknown; Temperature last_level_temperature = Temperature::kUnknown;
// EXPERIMENTAL
// When no other option such as last_level_temperature determines the
// temperature of a new SST file, it will be written with this temperature,
// which can be set differently for each column family.
//
// Dynamically changeable through the SetOptions() API
Temperature default_write_temperature = Temperature::kUnknown;
// EXPERIMENTAL // EXPERIMENTAL
// When this field is set, all SST files without an explicitly set temperature // When this field is set, all SST files without an explicitly set temperature
// will be treated as if they have this temperature for file reading // will be treated as if they have this temperature for file reading
// accounting purpose, such as io statistics, io perf context. // accounting purpose, such as io statistics, io perf context.
// //
// Not dynamically changeable, change it requires db restart. // Not dynamically changeable; change requires DB restart.
Temperature default_temperature = Temperature::kUnknown; Temperature default_temperature = Temperature::kUnknown;
// EXPERIMENTAL // EXPERIMENTAL

View File

@ -449,6 +449,10 @@ static std::unordered_map<std::string, OptionTypeInfo>
{offsetof(struct MutableCFOptions, last_level_temperature), {offsetof(struct MutableCFOptions, last_level_temperature),
OptionType::kTemperature, OptionVerificationType::kNormal, OptionType::kTemperature, OptionVerificationType::kNormal,
OptionTypeFlags::kMutable}}, OptionTypeFlags::kMutable}},
{"default_write_temperature",
{offsetof(struct MutableCFOptions, default_write_temperature),
OptionType::kTemperature, OptionVerificationType::kNormal,
OptionTypeFlags::kMutable}},
{"enable_blob_files", {"enable_blob_files",
{offsetof(struct MutableCFOptions, enable_blob_files), {offsetof(struct MutableCFOptions, enable_blob_files),
OptionType::kBoolean, OptionVerificationType::kNormal, OptionType::kBoolean, OptionVerificationType::kNormal,

View File

@ -164,6 +164,7 @@ struct MutableCFOptions {
compression_opts(options.compression_opts), compression_opts(options.compression_opts),
bottommost_compression_opts(options.bottommost_compression_opts), bottommost_compression_opts(options.bottommost_compression_opts),
last_level_temperature(options.last_level_temperature), last_level_temperature(options.last_level_temperature),
default_write_temperature(options.default_write_temperature),
memtable_protection_bytes_per_key( memtable_protection_bytes_per_key(
options.memtable_protection_bytes_per_key), options.memtable_protection_bytes_per_key),
block_protection_bytes_per_key(options.block_protection_bytes_per_key), block_protection_bytes_per_key(options.block_protection_bytes_per_key),
@ -218,6 +219,7 @@ struct MutableCFOptions {
compression(Snappy_Supported() ? kSnappyCompression : kNoCompression), compression(Snappy_Supported() ? kSnappyCompression : kNoCompression),
bottommost_compression(kDisableCompressionOption), bottommost_compression(kDisableCompressionOption),
last_level_temperature(Temperature::kUnknown), last_level_temperature(Temperature::kUnknown),
default_write_temperature(Temperature::kUnknown),
memtable_protection_bytes_per_key(0), memtable_protection_bytes_per_key(0),
block_protection_bytes_per_key(0), block_protection_bytes_per_key(0),
sample_for_compression(0), sample_for_compression(0),
@ -309,6 +311,7 @@ struct MutableCFOptions {
CompressionOptions compression_opts; CompressionOptions compression_opts;
CompressionOptions bottommost_compression_opts; CompressionOptions bottommost_compression_opts;
Temperature last_level_temperature; Temperature last_level_temperature;
Temperature default_write_temperature;
uint32_t memtable_protection_bytes_per_key; uint32_t memtable_protection_bytes_per_key;
uint8_t block_protection_bytes_per_key; uint8_t block_protection_bytes_per_key;

View File

@ -93,6 +93,8 @@ AdvancedColumnFamilyOptions::AdvancedColumnFamilyOptions(const Options& options)
ttl(options.ttl), ttl(options.ttl),
periodic_compaction_seconds(options.periodic_compaction_seconds), periodic_compaction_seconds(options.periodic_compaction_seconds),
sample_for_compression(options.sample_for_compression), sample_for_compression(options.sample_for_compression),
last_level_temperature(options.last_level_temperature),
default_write_temperature(options.default_write_temperature),
default_temperature(options.default_temperature), default_temperature(options.default_temperature),
preclude_last_level_data_seconds( preclude_last_level_data_seconds(
options.preclude_last_level_data_seconds), options.preclude_last_level_data_seconds),

View File

@ -272,6 +272,7 @@ void UpdateColumnFamilyOptions(const MutableCFOptions& moptions,
cf_opts->sample_for_compression = moptions.sample_for_compression; cf_opts->sample_for_compression = moptions.sample_for_compression;
cf_opts->compression_per_level = moptions.compression_per_level; cf_opts->compression_per_level = moptions.compression_per_level;
cf_opts->last_level_temperature = moptions.last_level_temperature; cf_opts->last_level_temperature = moptions.last_level_temperature;
cf_opts->default_write_temperature = moptions.default_write_temperature;
cf_opts->memtable_max_range_deletions = moptions.memtable_max_range_deletions; cf_opts->memtable_max_range_deletions = moptions.memtable_max_range_deletions;
} }

View File

@ -553,6 +553,7 @@ TEST_F(OptionsSettableTest, ColumnFamilyOptionsAllFieldsSettable) {
"prepopulate_blob_cache=kDisable;" "prepopulate_blob_cache=kDisable;"
"bottommost_temperature=kWarm;" "bottommost_temperature=kWarm;"
"last_level_temperature=kWarm;" "last_level_temperature=kWarm;"
"default_write_temperature=kCold;"
"default_temperature=kHot;" "default_temperature=kHot;"
"preclude_last_level_data_seconds=86400;" "preclude_last_level_data_seconds=86400;"
"preserve_internal_time_seconds=86400;" "preserve_internal_time_seconds=86400;"

View File

@ -131,6 +131,7 @@ TEST_F(OptionsTest, GetOptionsFromMapTest) {
{"blob_file_starting_level", "1"}, {"blob_file_starting_level", "1"},
{"prepopulate_blob_cache", "kDisable"}, {"prepopulate_blob_cache", "kDisable"},
{"last_level_temperature", "kWarm"}, {"last_level_temperature", "kWarm"},
{"default_write_temperature", "kCold"},
{"default_temperature", "kHot"}, {"default_temperature", "kHot"},
{"persist_user_defined_timestamps", "true"}, {"persist_user_defined_timestamps", "true"},
{"memtable_max_range_deletions", "0"}, {"memtable_max_range_deletions", "0"},
@ -287,6 +288,7 @@ TEST_F(OptionsTest, GetOptionsFromMapTest) {
ASSERT_EQ(new_cf_opt.blob_file_starting_level, 1); ASSERT_EQ(new_cf_opt.blob_file_starting_level, 1);
ASSERT_EQ(new_cf_opt.prepopulate_blob_cache, PrepopulateBlobCache::kDisable); ASSERT_EQ(new_cf_opt.prepopulate_blob_cache, PrepopulateBlobCache::kDisable);
ASSERT_EQ(new_cf_opt.last_level_temperature, Temperature::kWarm); ASSERT_EQ(new_cf_opt.last_level_temperature, Temperature::kWarm);
ASSERT_EQ(new_cf_opt.default_write_temperature, Temperature::kCold);
ASSERT_EQ(new_cf_opt.default_temperature, Temperature::kHot); ASSERT_EQ(new_cf_opt.default_temperature, Temperature::kHot);
ASSERT_EQ(new_cf_opt.persist_user_defined_timestamps, true); ASSERT_EQ(new_cf_opt.persist_user_defined_timestamps, true);
ASSERT_EQ(new_cf_opt.memtable_max_range_deletions, 0); ASSERT_EQ(new_cf_opt.memtable_max_range_deletions, 0);
@ -2350,6 +2352,7 @@ TEST_F(OptionsOldApiTest, GetOptionsFromMapTest) {
{"blob_file_starting_level", "1"}, {"blob_file_starting_level", "1"},
{"prepopulate_blob_cache", "kDisable"}, {"prepopulate_blob_cache", "kDisable"},
{"last_level_temperature", "kWarm"}, {"last_level_temperature", "kWarm"},
{"default_write_temperature", "kCold"},
{"default_temperature", "kHot"}, {"default_temperature", "kHot"},
{"persist_user_defined_timestamps", "true"}, {"persist_user_defined_timestamps", "true"},
{"memtable_max_range_deletions", "0"}, {"memtable_max_range_deletions", "0"},
@ -2502,6 +2505,7 @@ TEST_F(OptionsOldApiTest, GetOptionsFromMapTest) {
ASSERT_EQ(new_cf_opt.blob_file_starting_level, 1); ASSERT_EQ(new_cf_opt.blob_file_starting_level, 1);
ASSERT_EQ(new_cf_opt.prepopulate_blob_cache, PrepopulateBlobCache::kDisable); ASSERT_EQ(new_cf_opt.prepopulate_blob_cache, PrepopulateBlobCache::kDisable);
ASSERT_EQ(new_cf_opt.last_level_temperature, Temperature::kWarm); ASSERT_EQ(new_cf_opt.last_level_temperature, Temperature::kWarm);
ASSERT_EQ(new_cf_opt.default_write_temperature, Temperature::kCold);
ASSERT_EQ(new_cf_opt.default_temperature, Temperature::kHot); ASSERT_EQ(new_cf_opt.default_temperature, Temperature::kHot);
ASSERT_EQ(new_cf_opt.persist_user_defined_timestamps, true); ASSERT_EQ(new_cf_opt.persist_user_defined_timestamps, true);
ASSERT_EQ(new_cf_opt.memtable_max_range_deletions, 0); ASSERT_EQ(new_cf_opt.memtable_max_range_deletions, 0);