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

timeout_config: correct the misconfigured {truncate, other}_timeout

Browse Source 
this change fixes the regression introduced by
ebf5e138e8, which

* initialized `truncate_timeout_in_ms` with
  `counter_write_request_timeout_in_ms`,
* returns `cas_timeout_in_ms` in the place of
  `other_timeout_in_ms`.

in this change, these two misconfigurations are fixed.

Fixes #13633
Signed-off-by: Kefu Chai <kefu.chai@scylladb.com>

Closes #13639
This commit is contained in:
Kefu Chai
2023-04-24 10:12:11 +08:00
committed by Botond Dénes
parent 2c91728d8a
commit 4f21755c98
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
timeout_config.cc
View File

@@ -20,7 +20,7 @@ updateable_timeout_config::updateable_timeout_config(const db::config& cfg)
, write_timeout_in_ms(cfg.write_request_timeout_in_ms)
, range_read_timeout_in_ms(cfg.range_request_timeout_in_ms)
, counter_write_timeout_in_ms(cfg.counter_write_request_timeout_in_ms)
, truncate_timeout_in_ms(cfg.counter_write_request_timeout_in_ms)
, truncate_timeout_in_ms(cfg.truncate_request_timeout_in_ms)
, cas_timeout_in_ms(cfg.cas_contention_timeout_in_ms)
, other_timeout_in_ms(cfg.request_timeout_in_ms)
{}
@@ -33,6 +33,6 @@ timeout_config updateable_timeout_config::current_values() const {
std::chrono::milliseconds(counter_write_timeout_in_ms),
std::chrono::milliseconds(truncate_timeout_in_ms),
std::chrono::milliseconds(cas_timeout_in_ms),
std::chrono::milliseconds(cas_timeout_in_ms),
std::chrono::milliseconds(other_timeout_in_ms),
};
}