From 421ad8b25462e155a471a0e2bbcb68d219446314 Mon Sep 17 00:00:00 2001
From: miagilepner <mia.epner@hashicorp.com>
Date: Fri, 8 Nov 2024 17:01:18 +0000
Subject: [PATCH] backport of commit 09747c5d6620c785c153b6903776eb570de5d268

---
 vault/request_handling.go      | 13 ++++++++-----
 vault/request_handling_test.go | 11 ++++++++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/vault/request_handling.go b/vault/request_handling.go
index 61dece3ce315..02964cfaa31a 100644
--- a/vault/request_handling.go
+++ b/vault/request_handling.go
@@ -2121,11 +2121,14 @@ func isRetryableRPCError(ctx context.Context, err error) bool {
 	case codes.Unavailable:
 		return true
 	case codes.Canceled:
-		// if the request context is canceled, we want to return false
-		// but if the request context hasn't been canceled, then there was
-		// either an EOF or the RPC client context has been canceled which
-		// should be retried
-		return ctx.Err() == nil
+		// if the request context is canceled through a deadline exceeded, we
+		// want to return false. But otherwise, there could have been an EOF or
+		// the RPC client context has been canceled which should be retried
+		ctxErr := ctx.Err()
+		if ctxErr == nil {
+			return true
+		}
+		return !errors.Is(ctxErr, context.DeadlineExceeded)
 	case codes.Unknown:
 		// sometimes a missing HTTP content-type error can happen when multiple
 		// HTTP statuses have been written. This can happen when the error
diff --git a/vault/request_handling_test.go b/vault/request_handling_test.go
index 566c061ea362..633ed22fd70b 100644
--- a/vault/request_handling_test.go
+++ b/vault/request_handling_test.go
@@ -489,6 +489,9 @@ func TestRequestHandling_SecretLeaseMetric(t *testing.T) {
 func TestRequestHandling_isRetryableRPCError(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	cancel()
+
+	deadlineCtx, deadlineCancel := context.WithDeadline(context.Background(), time.Now().Add(-1*time.Second))
+	defer deadlineCancel()
 	testCases := []struct {
 		name string
 		ctx  context.Context
@@ -496,9 +499,15 @@ func TestRequestHandling_isRetryableRPCError(t *testing.T) {
 		want bool
 	}{
 		{
-			name: "req context canceled",
+			name: "req context canceled, not deadline",
 			ctx:  ctx,
 			err:  status.Error(codes.Canceled, "context canceled"),
+			want: true,
+		},
+		{
+			name: "req context deadline exceeded",
+			ctx:  deadlineCtx,
+			err:  status.Error(codes.Canceled, "context canceled"),
 			want: false,
 		},
 		{