From d01056555a20964d474c27bf0d29c0e29937f7a0 Mon Sep 17 00:00:00 2001
From: Aditya Ramani <a_ramani@apple.com>
Date: Fri, 5 Jan 2024 13:19:12 -0800
Subject: [PATCH] Handle failure when stopping a sandbox

Signed-off-by: Aditya Ramani <a_ramani@apple.com>
---
 plugins/sandbox/controller.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/sandbox/controller.go b/plugins/sandbox/controller.go
index f833e62a2..b72393f8a 100644
--- a/plugins/sandbox/controller.go
+++ b/plugins/sandbox/controller.go
@@ -201,12 +201,18 @@ func (c *controllerLocal) Stop(ctx context.Context, sandboxID string, opts ...sa
 	}
 
 	svc, err := c.getSandbox(ctx, sandboxID)
+	if errdefs.IsNotFound(err) {
+		return nil
+	}
 	if err != nil {
 		return err
 	}
 
 	if _, err := svc.StopSandbox(ctx, req); err != nil {
-		return fmt.Errorf("failed to stop sandbox: %w", errdefs.FromGRPC(err))
+		err = errdefs.FromGRPC(err)
+		if !errdefs.IsNotFound(err) && !errdefs.IsUnavailable(err) {
+			return fmt.Errorf("failed to stop sandbox: %w", err)
+		}
 	}
 
 	return nil