Fix Azure issue where 404 not recognized (#5399)

pull/5403/head
Travis Patterson 3 years ago committed by GitHub
parent 64589d0339
commit 7378b697f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      pkg/storage/chunk/azure/blob_storage_client.go
  2. 25
      pkg/storage/chunk/azure/blob_storage_client_test.go

@ -286,6 +286,13 @@ func (c *BlobStorageConfig) Validate() error {
// IsObjectNotFoundErr returns true if error means that object is not found. Relevant to GetObject and DeleteObject operations.
func (b *BlobStorage) IsObjectNotFoundErr(err error) bool {
// Some versions of the SDK return a pointer, cover both cases
// to be sure
var e azblob.StorageError
return errors.As(err, &e) && e.ErrorCode == azblob.StorageErrorCodeBlobNotFound
if errors.As(err, &e) {
return e.ErrorCode == azblob.StorageErrorCodeBlobNotFound
}
var ep *azblob.StorageError
return errors.As(err, &ep) && ep.ErrorCode == azblob.StorageErrorCodeBlobNotFound
}

@ -3,11 +3,14 @@ package azure
import (
"bytes"
"context"
"fmt"
"net/http"
"strings"
"testing"
"time"
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
"github.com/stretchr/testify/require"
"go.uber.org/atomic"
@ -96,3 +99,25 @@ func Test_Hedging(t *testing.T) {
})
}
}
func Test_IsObjectNotFoundErr(t *testing.T) {
c, err := NewBlobStorage(
&BlobStorageConfig{
AccountName: "account",
Environment: azureGlobal,
MaxRetries: 0,
},
metrics,
hedging.Config{})
require.NoError(t, err)
storageError := azblob.StorageError{
ErrorCode: azblob.StorageErrorCodeBlobNotFound,
}
err = fmt.Errorf("wrapping error %w", &storageError)
require.True(t, c.IsObjectNotFoundErr(err))
err = fmt.Errorf("wrapping error %w", storageError)
require.True(t, c.IsObjectNotFoundErr(err))
}

Loading…
Cancel
Save