Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vrrp: fix track process reinitialize fork delay timer #2427

Merged
merged 1 commit into from
Jun 5, 2024
Merged

vrrp: fix track process reinitialize fork delay timer #2427

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions keepalived/core/track_process.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ check_process_termination(pid_t pid)
tpr->terminate_timer_thread = thread_add_timer(master, process_lost_quorum_timer_thread, tpr, tpr->terminate_delay);
#ifdef _TRACK_PROCESS_DEBUG_
if (do_track_process_debug_detail)
log_message(LOG_INFO, "Adding timer %d for %s termination", tpr->fork_delay, tpr->pname);
log_message(LOG_INFO, "Adding timer %d for %s termination", tpr->terminate_delay, tpr->pname);
#endif
continue;
}
Expand Down Expand Up @@ -893,8 +893,9 @@ reinitialise_track_processes(void)
, tpr->sav_num_cur_proc
, tpr->num_cur_proc);
if (tpr->fork_delay)
tpr->fork_timer_thread = thread_add_timer(master, process_gained_quorum_timer_thread, tpr, tpr->terminate_delay);
process_update_track_process_status(tpr, true);
tpr->fork_timer_thread = thread_add_timer(master, process_gained_quorum_timer_thread, tpr, tpr->fork_delay);
else
process_update_track_process_status(tpr, true);
} else {
if (__test_bit(LOG_DETAIL_BIT, &debug))
log_message(LOG_INFO, "Process %s, number of current processes changed"
Expand All @@ -909,8 +910,6 @@ reinitialise_track_processes(void)
}
}
}

return;
}

static void
Expand Down
Loading