RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-10 21:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #38121 into master

Browse Source 
* refs/pull/38121/head:
	client: do not unset the client_debug_inject_tick_delay

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2020-11-25 13:30:04 -08:00
commit ba055a743c
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/client/Client.cc
View File

@ -6525,13 +6525,6 @@ void Client::start_tick_thread()
auto t_interval = clock::duration(cct->_conf.get_val<sec>("client_tick_interval"));
auto d_interval = clock::duration(cct->_conf.get_val<sec>("client_debug_inject_tick_delay"));
// Clear the debug inject tick delay
if (unlikely(d_interval.count() > 0)) {
ldout(cct, 20) << "clear debug inject tick delay: " << d_interval << dendl;
ceph_assert(0 == cct->_conf.set_val("client_debug_inject_tick_delay", "0"));
cct->_conf.apply_changes(nullptr);
}
auto interval = std::max(t_interval, d_interval);
if (likely(since >= interval)) {
tick();