Attachment 581496 Details for Bug 817968 – [4/4] service: fix auto-restart handling in service_start()

[patch] [4/4] service: fix auto-restart handling in service_start()

service-fix-auto-restart-handling-in-service_start.patch (text/plain), 1.45 KB, created by David Ward on 2012-05-01 23:17:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Ward

Created: 2012-05-01 23:17:23 UTC

Size: 1.45 KB

patch

obsolete

>From b18f4845c5496f19f27473a43226d377dabd6b31 Mon Sep 17 00:00:00 2001
>From: David Ward <david.ward@ll.mit.edu>
>Date: Sun, 29 Apr 2012 09:35:51 -0400
>Subject: [PATCH] service: fix auto-restart handling in service_start()
>
>Do not bypass the SERVICE_DEAD/SERVICE_FAILED state by manually issuing
>a start job while an automatic restart is pending.
>---
> src/service.c |   11 ++++++++++-
> 1 files changed, 10 insertions(+), 1 deletions(-)
>
>diff --git a/src/service.c b/src/service.c
>index 401c146..15664fc 100644
>--- a/src/service.c
>+++ b/src/service.c
>@@ -2423,7 +2423,16 @@ static int service_start(Unit *u) {
>             s->state == SERVICE_START_POST)
>                 return 0;
> 
>-        assert(s->state == SERVICE_DEAD || s->state == SERVICE_FAILED || s->state == SERVICE_AUTO_RESTART);
>+        /* A service that will be restarted must be stopped first to
>+         * trigger BindTo and/or OnFailure dependencies. If a user
>+         * does not want to wait for the holdoff time to elapse, the
>+         * service should be manually restarted, not started. */
>+        if (s->state == SERVICE_AUTO_RESTART) {
>+                log_warning("%s automatic restart is pending, must be stopped before issuing start request.", UNIT(s)->id);
>+                return -ECANCELED;
>+        }
>+
>+        assert(s->state == SERVICE_DEAD || s->state == SERVICE_FAILED);
> 
>         /* Make sure we don't enter a busy loop of some kind. */
>         r = service_start_limit_test(s);
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 817968: 581492 | 581494 | 581495 | 581496