X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/863570108a2c901a8eff22dc8a9bc72635ba7b95..fd717a88835be62ae1b5c4b1ecd74c21cab0e744:/services/keepstore/azure_blob_volume.go diff --git a/services/keepstore/azure_blob_volume.go b/services/keepstore/azure_blob_volume.go index b21f68d683..43cf83a07e 100644 --- a/services/keepstore/azure_blob_volume.go +++ b/services/keepstore/azure_blob_volume.go @@ -8,7 +8,6 @@ import ( "fmt" "io" "io/ioutil" - "log" "net/http" "os" "regexp" @@ -18,6 +17,7 @@ import ( "time" "git.curoverse.com/arvados.git/sdk/go/arvados" + log "github.com/Sirupsen/logrus" "github.com/curoverse/azure-sdk-for-go/storage" ) @@ -285,7 +285,7 @@ func (v *AzureBlobVolume) get(loc string, buf []byte) (int, error) { } // Compare the given data with existing stored data. -func (v *AzureBlobVolume) Compare(loc string, expect []byte) error { +func (v *AzureBlobVolume) Compare(ctx context.Context, loc string, expect []byte) error { trashed, _, err := v.checkTrashed(loc) if err != nil { return err @@ -298,11 +298,11 @@ func (v *AzureBlobVolume) Compare(loc string, expect []byte) error { return v.translateError(err) } defer rdr.Close() - return compareReaderWithBuf(rdr, expect, loc[:32]) + return compareReaderWithBuf(ctx, rdr, expect, loc[:32]) } // Put stores a Keep block as a block blob in the container. -func (v *AzureBlobVolume) Put(loc string, block []byte) error { +func (v *AzureBlobVolume) Put(ctx context.Context, loc string, block []byte) error { if v.ReadOnly { return MethodDisabledError }