Skip to content

Commit

Permalink
fix: Update AWS storage timeout error for Go 1.23 behavior (#14226)
Browse files Browse the repository at this point in the history
  • Loading branch information
paul1r authored Sep 23, 2024
1 parent 30afd21 commit a4642b5
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pkg/storage/chunk/client/aws/s3_storage_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,9 @@ func (a *S3ObjectClient) IsStorageTimeoutErr(err error) bool {
// TODO(dannyk): move these out to be generic
// context errors are all client-side
if isContextErr(err) {
return false
// Go 1.23 changed the type of the error returned by the http client when a timeout occurs
// while waiting for headers. This is a server side timeout.
return strings.Contains(err.Error(), "Client.Timeout")
}

// connection misconfiguration, or writing on a closed connection
Expand Down

0 comments on commit a4642b5

Please sign in to comment.