From 0a5a2ad9394dc66de80da17d3cee63fee217d670 Mon Sep 17 00:00:00 2001
From: Davin McCall <davmac@davmac.org>
Date: Thu, 29 Jun 2017 18:55:41 +0100
Subject: [PATCH] smooth recovery: wait for dependencies to start before
 relaunch.

If pinned started, dependencies may be stopped; the smooth recovery
process should wait for dependencies to start before trying to re-launch
the service process.
---
 src/service.cc | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/service.cc b/src/service.cc
index d997617..6c249df 100644
--- a/src/service.cc
+++ b/src/service.cc
@@ -204,9 +204,6 @@ void process_service::handle_exit_status(int exit_status) noexcept
 
 void base_process_service::do_smooth_recovery() noexcept
 {
-    // TODO if we are pinned-started then we should probably check
-    //      that dependencies have started before trying to re-start the
-    //      service process.
     if (! restart_ps_process()) {
         emergency_stop();
         services->process_queues();
@@ -527,9 +524,12 @@ void service_record::do_propagation() noexcept
 
 void service_record::execute_transition() noexcept
 {
-    if (service_state == service_state_t::STARTING) {
+    // state is STARTED with restarting set true if we are running a smooth recovery.
+    if (service_state == service_state_t::STARTING || (service_state == service_state_t::STARTED
+            && restarting)) {
         if (start_check_dependencies(false)) {
-            all_deps_started(false);
+            bool have_console = service_state == service_state_t::STARTED && onstart_flags.runs_on_console;
+            all_deps_started(have_console);
         }
     }
     else if (service_state == service_state_t::STOPPING) {
@@ -560,7 +560,8 @@ void service_record::do_start() noexcept
 
 void service_record::dependencyStarted() noexcept
 {
-    if (service_state == service_state_t::STARTING && waiting_for_deps) {
+    if ((service_state == service_state_t::STARTING || service_state == service_state_t::STARTED)
+            && waiting_for_deps) {
         services->addToStartQueue(this);
     }
 }
@@ -1347,6 +1348,15 @@ void base_process_service::do_restart() noexcept
     bool on_console = service_state == service_state_t::STARTING
             ? onstart_flags.starts_on_console : onstart_flags.runs_on_console;
 
+    if (service_state == service_state_t::STARTING) {
+        // for a smooth recovery, we want to check dependencies are available before actually
+        // starting:
+        if (! start_check_dependencies(false)) {
+            waiting_for_deps = true;
+            return;
+        }
+    }
+
     if (! start_ps_process(exec_arg_parts, on_console)) {
         restarting = false;
         if (service_state == service_state_t::STARTING) {
-- 
2.25.1