mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-29 19:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "utils: minor fixes in the loading_cache class" from Vlad

Browse Source 
"This series aims to fix the "serving invalid (old) values" issue in the
loading_cache (issue #2590) by arming the timer with a period that equals
min(expire, refresh).

We are still trying to optimize the main case where 'expire' is
significantly longer than 'refresh' period.

We don't want to add any additional logic in the fast path and this
series gives the immediate solution for the issue above while not adding
any additional CPU cycle to the fast path."

* 'loading_cache_short_expired-v2' of https://github.com/vladzcloudius/scylla:
  utils::loading_cache: arm the timer with a period equal to min(_expire, _update)
  utils::loading_cache: make a timer use a loading_cache_clock_type clock as a source
This commit is contained in:
Paweł Dziepak
2017-07-13 16:58:53 +01:00
parent 45e23d8090 76ea74f3fd
commit ec689b2fe1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/loading_cache.hh
View File

@@ -182,8 +182,9 @@ public:
throw exceptions::configuration_exception("loading_cache: caching is enabled but refresh period and/or max_size are zero");
}
_timer_period = std::min(_expiry, _refresh);
_timer.set_callback([this] { on_timer(); });
_timer.arm(_refresh);
_timer.arm(_timer_period);
}
~loading_cache() {
@@ -364,7 +365,7 @@ private:
return now();
}).finally([this, timer_start_tp] {
_logger.trace("on_timer(): rearming");
_timer.arm(timer_start_tp + _refresh);
_timer.arm(timer_start_tp + _timer_period);
});
}
@@ -376,9 +377,10 @@ private:
size_t _max_size;
std::chrono::milliseconds _expiry;
std::chrono::milliseconds _refresh;
loading_cache_clock_type::duration _timer_period;
logging::logger& _logger;
std::function<future<Tp>(const Key&)> _load;
timer<lowres_clock> _timer;
timer<loading_cache_clock_type> _timer;
};
}