From 56c88f8d6548c8d5e8f6a3bda6bf3d700a21d57f Mon Sep 17 00:00:00 2001 From: Yuval Ariel Date: Thu, 8 Feb 2024 11:33:43 +0200 Subject: [PATCH 1/4] write controller report setting delay only with multiple loggers --- db/write_controller.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/db/write_controller.cc b/db/write_controller.cc index 64e4acd5a3..ce5487d6f4 100644 --- a/db/write_controller.cc +++ b/db/write_controller.cc @@ -149,6 +149,10 @@ void WriteController::HandleNewDelayReq(void* client_id, { std::lock_guard logger_lock(loggers_map_mu_); + // The below WARN msg is intended only when the WC is shared among loggers. + if (loggers_to_client_ids_map_.size() == 1) { + return; + } for (auto& logger_and_clients : loggers_to_client_ids_map_) { ROCKS_LOG_WARN(logger_and_clients.first.get(), "WC setting delay of %" PRIu64 From 1deb1180fb0912558a7e4692fbee910ba3c7d3a1 Mon Sep 17 00:00:00 2001 From: Yuval Ariel Date: Sun, 11 Feb 2024 16:48:53 +0200 Subject: [PATCH 2/4] Update HISTORY.md for 2.8.0 --- HISTORY.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index e08c640192..0f6a749d95 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,16 @@ # Speedb Change Log ## Unreleased + +### New Features + +### Enhancements + +### Bug Fixes + +### Miscellaneous + +## Incaberry 2.8.0 (31/1/2024) Based on RocksDB 8.6.7 ### New Features @@ -38,7 +48,7 @@ RocksDB has a value of 10 by default and we've added the option to randomize the * Options: Set level_compaction_dynamic_level_bytes as false by default. This flag is not working properly with Speedb. see https://github.com/speedb-io/speedb/issues/786 for more details. * zlib: Update links to zlib 1.3 in CI and Makefile since the link in zlib.net is dead. -## Hazlenut 2.7.0 (27/10/2023) +## Hazelnut 2.7.0 (27/10/2023) Based on RocksDB 8.1.1 ### New Features From 6f29ba55db94b442ff093704d5a6be6c1001b562 Mon Sep 17 00:00:00 2001 From: Yuval Ariel Date: Sun, 11 Feb 2024 17:52:10 +0200 Subject: [PATCH 3/4] update history --- HISTORY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/HISTORY.md b/HISTORY.md index 0f6a749d95..9fae3f39ca 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -9,6 +9,7 @@ ### Bug Fixes ### Miscellaneous +* WriteController logging: Remove redundant reports when WC is not shared between dbs ## Incaberry 2.8.0 (31/1/2024) Based on RocksDB 8.6.7 From b53323e1300c1a8c75448fb951b314bd8997409f Mon Sep 17 00:00:00 2001 From: Yuval Ariel Date: Mon, 12 Feb 2024 13:59:41 +0200 Subject: [PATCH 4/4] fixed cf delay msgs to be more informative --- db/column_family.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/db/column_family.cc b/db/column_family.cc index 7be55f5569..1d8e7499e7 100644 --- a/db/column_family.cc +++ b/db/column_family.cc @@ -1123,8 +1123,8 @@ WriteStallCondition ColumnFamilyData::RecalculateWriteStallConditions( ROCKS_LOG_WARN( ioptions_.logger, "[%s] Stalling writes because we have %d immutable memtables " - "(waiting for flush), max_write_buffer_number is set to %d " - "rate %" PRIu64, + "(waiting for flush), max_write_buffer_number is set to %d. " + "delayed write rate: %" PRIu64, name_.c_str(), imm()->NumNotFlushed(), mutable_cf_options.max_write_buffer_number, write_controller->delayed_write_rate()); @@ -1146,8 +1146,8 @@ WriteStallCondition ColumnFamilyData::RecalculateWriteStallConditions( 1); } ROCKS_LOG_WARN(ioptions_.logger, - "[%s] Stalling writes because we have %d level-0 files " - "rate %" PRIu64, + "[%s] Stalling writes because we have %d level-0 files. " + "delayed write rate: %" PRIu64, name_.c_str(), vstorage->l0_delay_trigger_count(), write_controller->delayed_write_rate()); } else if (write_stall_condition == WriteStallCondition::kDelayed && @@ -1175,7 +1175,7 @@ WriteStallCondition ColumnFamilyData::RecalculateWriteStallConditions( ROCKS_LOG_WARN( ioptions_.logger, "[%s] Stalling writes because of estimated pending compaction " - "bytes %" PRIu64 " rate %" PRIu64, + "bytes %" PRIu64 ". delayed write rate: %" PRIu64, name_.c_str(), vstorage->estimated_compaction_needed_bytes(), write_controller->delayed_write_rate()); } else {