From c1e4da3ea1e65cccf55ccdf095f6ecb485fea8f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?=
 <66256922+daniel-weisse@users.noreply.github.com>
Date: Thu, 20 Jun 2024 11:22:37 +0200
Subject: [PATCH] debugd: reset unit failed status before restarting (#3183)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniel Weiße <dw@edgeless.systems>
---
 debugd/internal/debugd/deploy/service.go      | 5 +++++
 debugd/internal/debugd/deploy/service_test.go | 4 ++++
 debugd/internal/debugd/deploy/wrappers.go     | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/debugd/internal/debugd/deploy/service.go b/debugd/internal/debugd/deploy/service.go
index edea5bf07..114e5da58 100644
--- a/debugd/internal/debugd/deploy/service.go
+++ b/debugd/internal/debugd/deploy/service.go
@@ -91,6 +91,8 @@ type dbusConn interface {
 	// StopUnitContext is similar to StartUnitContext, but stops the specified unit
 	// rather than starting it.
 	StopUnitContext(ctx context.Context, name string, mode string, ch chan<- string) (int, error)
+	// ResetFailedUnitContext resets the "failed" state of a unit.
+	ResetFailedUnitContext(ctx context.Context, name string) error
 	// RestartUnitContext restarts a service. If a service is restarted that isn't
 	// running it will be started.
 	RestartUnitContext(ctx context.Context, name string, mode string, ch chan<- string) (int, error)
@@ -122,6 +124,9 @@ func (s *ServiceManager) SystemdAction(ctx context.Context, request ServiceManag
 	case Stop:
 		_, err = conn.StopUnitContext(ctx, request.Unit, "replace", resultChan)
 	case Restart:
+		if err = conn.ResetFailedUnitContext(ctx, request.Unit); err != nil {
+			s.log.Error("Failed to reset unit failed state", "error", err.Error(), "unit", request.Unit)
+		}
 		_, err = conn.RestartUnitContext(ctx, request.Unit, "replace", resultChan)
 	case Reload:
 		err = conn.ReloadContext(ctx)
diff --git a/debugd/internal/debugd/deploy/service_test.go b/debugd/internal/debugd/deploy/service_test.go
index 394960c0a..f0b398333 100644
--- a/debugd/internal/debugd/deploy/service_test.go
+++ b/debugd/internal/debugd/deploy/service_test.go
@@ -356,6 +356,10 @@ func (c *fakeDbusConn) StopUnitContext(_ context.Context, name string, mode stri
 	return c.jobID, c.actionErr
 }
 
+func (c *fakeDbusConn) ResetFailedUnitContext(_ context.Context, _ string) error {
+	return nil
+}
+
 func (c *fakeDbusConn) RestartUnitContext(_ context.Context, name string, mode string, ch chan<- string) (int, error) {
 	c.inputs = append(c.inputs, dbusConnActionInput{name: name, mode: mode})
 	ch <- c.result
diff --git a/debugd/internal/debugd/deploy/wrappers.go b/debugd/internal/debugd/deploy/wrappers.go
index f072308d9..1c5acaee3 100644
--- a/debugd/internal/debugd/deploy/wrappers.go
+++ b/debugd/internal/debugd/deploy/wrappers.go
@@ -38,6 +38,10 @@ func (c *dbusConnWrapper) StopUnitContext(ctx context.Context, name string, mode
 	return c.conn.StopUnitContext(ctx, name, mode, ch)
 }
 
+func (c *dbusConnWrapper) ResetFailedUnitContext(ctx context.Context, name string) error {
+	return c.conn.ResetFailedUnitContext(ctx, name)
+}
+
 func (c *dbusConnWrapper) RestartUnitContext(ctx context.Context, name string, mode string, ch chan<- string) (int, error) {
 	return c.conn.RestartUnitContext(ctx, name, mode, ch)
 }