After a crash, don't restart workers with BGW_NEVER_RESTART.

Amit Khandekar

diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index c22066fad2a2d35499a817ceb1f17ae193d62952..87347c3f3eaf6cbb984dc2e577314dfc42be42d5 100644 (file)
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -420,9 +420,9 @@ BackgroundWorkerStopNotifications(pid_t pid)
 /*
  * Reset background worker crash state.
  *
- * We assume that, after a crash-and-restart cycle, background workers should
- * be restarted immediately, instead of waiting for bgw_restart_time to
- * elapse.
+ * We assume that, after a crash-and-restart cycle, background workers without
+ * the never-restart flag should be restarted immediately, instead of waiting
+ * for bgw_restart_time to elapse.
  */
 void
 ResetBackgroundWorkerCrashTimes(void)
@@ -434,7 +434,14 @@ ResetBackgroundWorkerCrashTimes(void)
        RegisteredBgWorker *rw;
 
        rw = slist_container(RegisteredBgWorker, rw_lnode, iter.cur);
-       rw->rw_crashed_at = 0;
+
+       /*
+        * For workers that should not be restarted, we don't want to lose
+        * the information that they have crashed; otherwise, they would be
+        * restarted, which is wrong.
+        */
+       if (rw->rw_worker.bgw_restart_time != BGW_NEVER_RESTART)
+           rw->rw_crashed_at = 0;
    }
 }