diff options
Diffstat (limited to 'src/backend/postmaster/startup.c')
| -rw-r--r-- | src/backend/postmaster/startup.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/src/backend/postmaster/startup.c b/src/backend/postmaster/startup.c index 5c856c5261b..f99186eab7d 100644 --- a/src/backend/postmaster/startup.c +++ b/src/backend/postmaster/startup.c @@ -314,22 +314,11 @@ startup_progress_timeout_handler(void) startup_progress_timer_expired = true; } -void -disable_startup_progress_timeout(void) -{ - /* Feature is disabled. */ - if (log_startup_progress_interval == 0) - return; - - disable_timeout(STARTUP_PROGRESS_TIMEOUT, false); - startup_progress_timer_expired = false; -} - /* * Set the start timestamp of the current operation and enable the timeout. */ void -enable_startup_progress_timeout(void) +begin_startup_progress_phase(void) { TimestampTz fin_time; @@ -337,6 +326,8 @@ enable_startup_progress_timeout(void) if (log_startup_progress_interval == 0) return; + disable_timeout(STARTUP_PROGRESS_TIMEOUT, false); + startup_progress_timer_expired = false; startup_progress_phase_start_time = GetCurrentTimestamp(); fin_time = TimestampTzPlusMilliseconds(startup_progress_phase_start_time, log_startup_progress_interval); @@ -345,21 +336,6 @@ enable_startup_progress_timeout(void) } /* - * A thin wrapper to first disable and then enable the startup progress - * timeout. - */ -void -begin_startup_progress_phase(void) -{ - /* Feature is disabled. */ - if (log_startup_progress_interval == 0) - return; - - disable_startup_progress_timeout(); - enable_startup_progress_timeout(); -} - -/* * Report whether startup progress timeout has occurred. Reset the timer flag * if it did, set the elapsed time to the out parameters and return true, * otherwise return false. |