thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clear autosync_timer when autosync_interval is set to 0

Browse Source 
Clear other timers similarly (but their interval can't be 0)
This commit is contained in:
Vitaliy Filippov
2026-06-20 01:50:44 +03:00
parent 826b35b369
commit cf3abdb9e3
1 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/osd/osd.cpp
+36 -15
View File
@@ -352,29 +352,50 @@ void osd_t::parse_config(bool init)
{ {
peering_state = peering_state | OSD_RECOVERING; peering_state = peering_state | OSD_RECOVERING;
} }
if (old_autosync_interval != autosync_interval && autosync_timer_id >= 0) if (old_autosync_interval != autosync_interval)
{ {
this->tfd->clear_timer(autosync_timer_id); if (autosync_timer_id >= 0)
autosync_timer_id = this->tfd->set_timer(autosync_interval*1000, true, [this](int timer_id)
{ {
autosync(); this->tfd->clear_timer(autosync_timer_id);
}); autosync_timer_id = -1;
}
if (autosync_interval != 0)
{
autosync_timer_id = this->tfd->set_timer(autosync_interval*1000, true, [this](int timer_id)
{
autosync();
});
}
} }
if (old_print_stats_interval != print_stats_interval && print_stats_timer_id >= 0) if (old_print_stats_interval != print_stats_interval)
{ {
tfd->clear_timer(print_stats_timer_id); if (print_stats_timer_id >= 0)
print_stats_timer_id = this->tfd->set_timer(print_stats_interval*1000, true, [this](int timer_id)
{ {
print_stats(); tfd->clear_timer(print_stats_timer_id);
}); print_stats_timer_id = -1;
}
if (print_stats_interval != 0)
{
print_stats_timer_id = this->tfd->set_timer(print_stats_interval*1000, true, [this](int timer_id)
{
print_stats();
});
}
} }
if (old_slow_log_interval != slow_log_interval && slow_log_timer_id >= 0) if (old_slow_log_interval != slow_log_interval)
{ {
tfd->clear_timer(slow_log_timer_id); if (slow_log_timer_id >= 0)
slow_log_timer_id = this->tfd->set_timer(slow_log_interval*1000, true, [this](int timer_id)
{ {
print_slow(); tfd->clear_timer(slow_log_timer_id);
}); slow_log_timer_id = -1;
}
if (slow_log_interval != 0)
{
slow_log_timer_id = this->tfd->set_timer(slow_log_interval*1000, true, [this](int timer_id)
{
print_slow();
});
}
} }
if (old_recovery_tune_interval != recovery_tune_interval) if (old_recovery_tune_interval != recovery_tune_interval)
{ {