From 4a984f533e1db3f1bb927f98ecb399843bf69ee3 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 14 Aug 2019 11:51:25 +0100 Subject: [PATCH] remove forceDrainMsDelay as soon as a pod is marked as being killed we should start draining --- services/real-time/app.coffee | 17 +++++------------ .../real-time/config/settings.defaults.coffee | 2 -- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/services/real-time/app.coffee b/services/real-time/app.coffee index 8b3486dc0a..50f7eb975b 100644 --- a/services/real-time/app.coffee +++ b/services/real-time/app.coffee @@ -110,17 +110,10 @@ shutdownCleanly = (signal) -> shutdownCleanly(signal) , 10000 -forceDrain = -> - logger.log {delay_ms:Settings.forceDrainMsDelay}, "starting force drain after timeout" - setTimeout ()-> - logger.log "starting drain over #{Settings.shutdownDrainTimeWindow} mins" - DrainManager.startDrainTimeWindow(io, Settings.shutdownDrainTimeWindow) - , Settings.forceDrainMsDelay - shutDownInProgress = false -if Settings.forceDrainMsDelay? - Settings.forceDrainMsDelay = parseInt(Settings.forceDrainMsDelay, 10) - logger.log forceDrainMsDelay: Settings.forceDrainMsDelay,"forceDrainMsDelay enabled" +if Settings.shutdownDrainTimeWindow? + Settings.forceDrainMsDelay = parseInt(Settings.shutdownDrainTimeWindow, 10) + logger.log shutdownDrainTimeWindow: Settings.shutdownDrainTimeWindow,"shutdownDrainTimeWindow enabled" for signal in ['SIGINT', 'SIGHUP', 'SIGQUIT', 'SIGUSR1', 'SIGUSR2', 'SIGTERM', 'SIGABRT'] process.on signal, -> if shutDownInProgress @@ -128,9 +121,9 @@ if Settings.forceDrainMsDelay? return else shutDownInProgress = true - logger.log signal: signal, "received interrupt, cleaning up" + logger.log signal: signal, "received interrupt, starting drain over #{Settings.shutdownDrainTimeWindow} mins" + DrainManager.startDrainTimeWindow(io, Settings.shutdownDrainTimeWindow) shutdownCleanly(signal) - forceDrain() diff --git a/services/real-time/config/settings.defaults.coffee b/services/real-time/config/settings.defaults.coffee index b48de98981..6fe0f4bd1e 100644 --- a/services/real-time/config/settings.defaults.coffee +++ b/services/real-time/config/settings.defaults.coffee @@ -48,8 +48,6 @@ settings = max_doc_length: 2 * 1024 * 1024 # 2mb - forceDrainMsDelay: process.env['FORCE_DRAIN_MS_DELAY'] or false - shutdownDrainTimeWindow: process.env['SHUTDOWN_DRAIN_TIME_WINDOW'] or 9 continualPubsubTraffic: process.env['CONTINUAL_PUBSUB_TRAFFIC'] or false