diff options
| author | Justin Tobler <jtobler@gitlab.com> | 2023-03-17 21:56:33 +0300 |
|---|---|---|
| committer | Justin Tobler <jtobler@gitlab.com> | 2023-03-17 21:56:33 +0300 |
| commit | e4822aea789a1a3865ea4bdf5fff738054790b0f (patch) | |
| tree | e82509f495642bb7e50e3b129500a96d3beae2c9 | |
| parent | 9c60a647ddfcf8b7f6964272ccc6ee7df32b242f (diff) | |
| parent | b54ad7922fb721b5fc767c0a221c50fb98b3855a (diff) | |
Merge branch 'wc/dont-wrap-statushandler' into 'master'
statushandler: Don't wrap context errors
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5530
Merged-by: Justin Tobler <jtobler@gitlab.com>
Approved-by: John Cai <jcai@gitlab.com>
Approved-by: Justin Tobler <jtobler@gitlab.com>
Co-authored-by: Will Chandler <wchandler@gitlab.com>
| -rw-r--r-- | internal/middleware/statushandler/statushandler.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/internal/middleware/statushandler/statushandler.go b/internal/middleware/statushandler/statushandler.go index 063389287..23d1431eb 100644 --- a/internal/middleware/statushandler/statushandler.go +++ b/internal/middleware/statushandler/statushandler.go @@ -32,9 +32,13 @@ func wrapCtxErr(ctx context.Context, err error) error { case err == nil: return nil case ctx.Err() == context.DeadlineExceeded: - return structerr.NewDeadlineExceeded("%w", err) + //nolint:gitaly-linters // Structerr will unwrap to the inner status, deliberately use '%v' + // to retain `DeadlineExceeded` status. + return structerr.NewDeadlineExceeded("%v", err) case ctx.Err() == context.Canceled: - return structerr.NewCanceled("%w", err) + //nolint:gitaly-linters // Structerr will unwrap to the inner status, deliberately use '%v' + // to return the `Canceled` status to clients. + return structerr.NewCanceled("%v", err) default: return structerr.NewInternal("%w", err) } |