X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/90d84d8578b760b493ac76b22c42bc284868bc0c..99e43aaefc4a76908fd5f649edf0512c3800e021:/services/keepstore/s3_volume.go diff --git a/services/keepstore/s3_volume.go b/services/keepstore/s3_volume.go index 22a38e2085..bd79d49e16 100644 --- a/services/keepstore/s3_volume.go +++ b/services/keepstore/s3_volume.go @@ -2,21 +2,17 @@ // // SPDX-License-Identifier: AGPL-3.0 -package main +package keepstore import ( "bytes" "context" - "crypto/sha256" "encoding/base64" "encoding/hex" "encoding/json" "errors" "fmt" "io" - "io/ioutil" - "log" - "net/http" "os" "regexp" "strings" @@ -24,29 +20,147 @@ import ( "sync/atomic" "time" - "git.curoverse.com/arvados.git/sdk/go/arvados" - "github.com/AdRoll/goamz/aws" - "github.com/AdRoll/goamz/s3" + "git.arvados.org/arvados.git/sdk/go/arvados" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws/awserr" + "github.com/aws/aws-sdk-go-v2/aws/defaults" + "github.com/aws/aws-sdk-go-v2/aws/ec2metadata" + "github.com/aws/aws-sdk-go-v2/aws/ec2rolecreds" + "github.com/aws/aws-sdk-go-v2/aws/endpoints" + "github.com/aws/aws-sdk-go-v2/service/s3" + "github.com/aws/aws-sdk-go-v2/service/s3/s3manager" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" ) func init() { - driver["S3"] = newS3Volume + driver["S3"] = news3Volume } -func newS3Volume(cluster *arvados.Cluster, volume arvados.Volume, logger logrus.FieldLogger, metrics *volumeMetricsVecs) (Volume, error) { - v := &S3Volume{cluster: cluster, volume: volume, logger: logger, metrics: metrics} - err := json.Unmarshal(volume.DriverParameters, &v) +const ( + s3DefaultReadTimeout = arvados.Duration(10 * time.Minute) + s3DefaultConnectTimeout = arvados.Duration(time.Minute) + maxClockSkew = 600 * time.Second + nearlyRFC1123 = "Mon, 2 Jan 2006 15:04:05 GMT" + s3downloaderPartSize = 5 * 1024 * 1024 + s3downloaderReadConcurrency = 13 + s3uploaderPartSize = 5 * 1024 * 1024 + s3uploaderWriteConcurrency = 5 +) + +var ( + errS3TrashDisabled = fmt.Errorf("trash function is disabled because Collections.BlobTrashLifetime=0 and DriverParameters.UnsafeDelete=false") + s3AWSKeepBlockRegexp = regexp.MustCompile(`^[0-9a-f]{32}$`) + s3AWSZeroTime time.Time +) + +// s3Volume implements Volume using an S3 bucket. +type s3Volume struct { + arvados.S3VolumeDriverParameters + AuthToken string // populated automatically when IAMRole is used + AuthExpiration time.Time // populated automatically when IAMRole is used + + cluster *arvados.Cluster + volume arvados.Volume + logger logrus.FieldLogger + metrics *volumeMetricsVecs + bufferPool *bufferPool + bucket *s3Bucket + region string + startOnce sync.Once +} + +// s3bucket wraps s3.bucket and counts I/O and API usage stats. The +// wrapped bucket can be replaced atomically with SetBucket in order +// to update credentials. +type s3Bucket struct { + bucket string + svc *s3.Client + stats s3awsbucketStats + mu sync.Mutex +} + +func (v *s3Volume) isKeepBlock(s string) (string, bool) { + if v.PrefixLength > 0 && len(s) == v.PrefixLength+33 && s[:v.PrefixLength] == s[v.PrefixLength+1:v.PrefixLength*2+1] { + s = s[v.PrefixLength+1:] + } + return s, s3AWSKeepBlockRegexp.MatchString(s) +} + +// Return the key used for a given loc. If PrefixLength==0 then +// key("abcdef0123") is "abcdef0123", if PrefixLength==3 then key is +// "abc/abcdef0123", etc. +func (v *s3Volume) key(loc string) string { + if v.PrefixLength > 0 && v.PrefixLength < len(loc)-1 { + return loc[:v.PrefixLength] + "/" + loc + } else { + return loc + } +} + +func news3Volume(params newVolumeParams) (volume, error) { + v := &s3Volume{ + cluster: params.Cluster, + volume: params.ConfigVolume, + metrics: params.MetricsVecs, + bufferPool: params.BufferPool, + } + err := json.Unmarshal(params.ConfigVolume.DriverParameters, v) if err != nil { return nil, err } - return v, v.check() + v.logger = params.Logger.WithField("Volume", v.DeviceID()) + return v, v.check("") +} + +func (v *s3Volume) translateError(err error) error { + if _, ok := err.(*aws.RequestCanceledError); ok { + return context.Canceled + } else if aerr, ok := err.(awserr.Error); ok { + if aerr.Code() == "NotFound" { + return os.ErrNotExist + } else if aerr.Code() == "NoSuchKey" { + return os.ErrNotExist + } + } + return err +} + +// safeCopy calls CopyObjectRequest, and checks the response to make +// sure the copy succeeded and updated the timestamp on the +// destination object +// +// (If something goes wrong during the copy, the error will be +// embedded in the 200 OK response) +func (v *s3Volume) safeCopy(dst, src string) error { + input := &s3.CopyObjectInput{ + Bucket: aws.String(v.bucket.bucket), + ContentType: aws.String("application/octet-stream"), + CopySource: aws.String(v.bucket.bucket + "/" + src), + Key: aws.String(dst), + } + + req := v.bucket.svc.CopyObjectRequest(input) + resp, err := req.Send(context.Background()) + + err = v.translateError(err) + if os.IsNotExist(err) { + return err + } else if err != nil { + return fmt.Errorf("PutCopy(%q ← %q): %s", dst, v.bucket.bucket+"/"+src, err) + } + + if resp.CopyObjectResult.LastModified == nil { + return fmt.Errorf("PutCopy succeeded but did not return a timestamp: %q: %s", resp.CopyObjectResult.LastModified, err) + } else if time.Now().Sub(*resp.CopyObjectResult.LastModified) > maxClockSkew { + return fmt.Errorf("PutCopy succeeded but returned an old timestamp: %q: %s", resp.CopyObjectResult.LastModified, resp.CopyObjectResult.LastModified) + } + return nil } -func (v *S3Volume) check() error { - if v.Bucket == "" || v.AccessKey == "" || v.SecretKey == "" { - return errors.New("DriverParameters: Bucket, AccessKey, and SecretKey must be provided") +func (v *s3Volume) check(ec2metadataHostname string) error { + if v.Bucket == "" { + return errors.New("DriverParameters: Bucket must be provided") } if v.IndexPageSize == 0 { v.IndexPageSize = 1000 @@ -55,26 +169,41 @@ func (v *S3Volume) check() error { return errors.New("DriverParameters: RaceWindow must not be negative") } - region, ok := aws.Regions[v.Region] - if v.Endpoint == "" { - if !ok { - return fmt.Errorf("unrecognized region %+q; try specifying endpoint instead", v.Region) - } - } else if ok { - return fmt.Errorf("refusing to use AWS region name %+q with endpoint %+q; "+ - "specify empty endpoint or use a different region name", v.Region, v.Endpoint) - } else { - region = aws.Region{ - Name: v.Region, - S3Endpoint: v.Endpoint, - S3LocationConstraint: v.LocationConstraint, - } + if v.V2Signature { + return errors.New("DriverParameters: V2Signature is not supported") } - auth := aws.Auth{ - AccessKey: v.AccessKey, - SecretKey: v.SecretKey, + defaultResolver := endpoints.NewDefaultResolver() + + cfg := defaults.Config() + + if v.Endpoint == "" && v.Region == "" { + return fmt.Errorf("AWS region or endpoint must be specified") + } else if v.Endpoint != "" || ec2metadataHostname != "" { + myCustomResolver := func(service, region string) (aws.Endpoint, error) { + if v.Endpoint != "" && service == "s3" { + return aws.Endpoint{ + URL: v.Endpoint, + SigningRegion: region, + }, nil + } else if service == "ec2metadata" && ec2metadataHostname != "" { + return aws.Endpoint{ + URL: ec2metadataHostname, + }, nil + } else { + return defaultResolver.ResolveEndpoint(service, region) + } + } + cfg.EndpointResolver = aws.EndpointResolverFunc(myCustomResolver) } + if v.Region == "" { + // Endpoint is already specified (otherwise we would + // have errored out above), but Region is also + // required by the aws sdk, in order to determine + // SignatureVersions. + v.Region = "us-east-1" + } + cfg.Region = v.Region // Zero timeouts mean "wait forever", which is a bad // default. Default to long timeouts instead. @@ -85,351 +214,447 @@ func (v *S3Volume) check() error { v.ReadTimeout = s3DefaultReadTimeout } - client := s3.New(auth, region) - if region.EC2Endpoint.Signer == aws.V4Signature { - // Currently affects only eu-central-1 - client.Signature = aws.V4Signature - } - client.ConnectTimeout = time.Duration(v.ConnectTimeout) - client.ReadTimeout = time.Duration(v.ReadTimeout) - v.bucket = &s3bucket{ - Bucket: &s3.Bucket{ - S3: client, - Name: v.Bucket, - }, + creds := aws.NewChainProvider( + []aws.CredentialsProvider{ + aws.NewStaticCredentialsProvider(v.AccessKeyID, v.SecretAccessKey, v.AuthToken), + ec2rolecreds.New(ec2metadata.New(cfg)), + }) + + cfg.Credentials = creds + + v.bucket = &s3Bucket{ + bucket: v.Bucket, + svc: s3.New(cfg), } + // Set up prometheus metrics - lbls := prometheus.Labels{"device_id": v.GetDeviceID()} + lbls := prometheus.Labels{"device_id": v.DeviceID()} v.bucket.stats.opsCounters, v.bucket.stats.errCounters, v.bucket.stats.ioBytes = v.metrics.getCounterVecsFor(lbls) return nil } -const ( - s3DefaultReadTimeout = arvados.Duration(10 * time.Minute) - s3DefaultConnectTimeout = arvados.Duration(time.Minute) -) +// DeviceID returns a globally unique ID for the storage bucket. +func (v *s3Volume) DeviceID() string { + return "s3://" + v.Endpoint + "/" + v.Bucket +} -var ( - // ErrS3TrashDisabled is returned by Trash if that operation - // is impossible with the current config. - ErrS3TrashDisabled = fmt.Errorf("trash function is disabled because -trash-lifetime=0 and -s3-unsafe-delete=false") +// EmptyTrash looks for trashed blocks that exceeded BlobTrashLifetime +// and deletes them from the volume. +func (v *s3Volume) EmptyTrash() { + var bytesInTrash, blocksInTrash, bytesDeleted, blocksDeleted int64 - s3ACL = s3.Private + // Define "ready to delete" as "...when EmptyTrash started". + startT := time.Now() - zeroTime time.Time -) + emptyOneKey := func(trash *s3.Object) { + key := strings.TrimPrefix(*trash.Key, "trash/") + loc, isblk := v.isKeepBlock(key) + if !isblk { + return + } + atomic.AddInt64(&bytesInTrash, *trash.Size) + atomic.AddInt64(&blocksInTrash, 1) -const ( - maxClockSkew = 600 * time.Second - nearlyRFC1123 = "Mon, 2 Jan 2006 15:04:05 GMT" -) + trashT := *trash.LastModified + recent, err := v.head("recent/" + key) + if err != nil && os.IsNotExist(v.translateError(err)) { + v.logger.Warnf("EmptyTrash: found trash marker %q but no %q (%s); calling Untrash", *trash.Key, "recent/"+key, err) + err = v.BlockUntrash(loc) + if err != nil { + v.logger.WithError(err).Errorf("EmptyTrash: Untrash(%q) failed", loc) + } + return + } else if err != nil { + v.logger.WithError(err).Warnf("EmptyTrash: HEAD %q failed", "recent/"+key) + return + } + if trashT.Sub(*recent.LastModified) < v.cluster.Collections.BlobSigningTTL.Duration() { + if age := startT.Sub(*recent.LastModified); age >= v.cluster.Collections.BlobSigningTTL.Duration()-time.Duration(v.RaceWindow) { + // recent/key is too old to protect + // loc from being Trashed again during + // the raceWindow that starts if we + // delete trash/X now. + // + // Note this means (TrashSweepInterval + // < BlobSigningTTL - raceWindow) is + // necessary to avoid starvation. + v.logger.Infof("EmptyTrash: detected old race for %q, calling fixRace + Touch", loc) + v.fixRace(key) + v.BlockTouch(loc) + return + } + _, err := v.head(key) + if os.IsNotExist(err) { + v.logger.Infof("EmptyTrash: detected recent race for %q, calling fixRace", loc) + v.fixRace(key) + return + } else if err != nil { + v.logger.WithError(err).Warnf("EmptyTrash: HEAD %q failed", loc) + return + } + } + if startT.Sub(trashT) < v.cluster.Collections.BlobTrashLifetime.Duration() { + return + } + err = v.bucket.Del(*trash.Key) + if err != nil { + v.logger.WithError(err).Errorf("EmptyTrash: error deleting %q", *trash.Key) + return + } + atomic.AddInt64(&bytesDeleted, *trash.Size) + atomic.AddInt64(&blocksDeleted, 1) -func s3regions() (okList []string) { - for r := range aws.Regions { - okList = append(okList, r) + _, err = v.head(*trash.Key) + if err == nil { + v.logger.Warnf("EmptyTrash: HEAD %q succeeded immediately after deleting %q", loc, loc) + return + } + if !os.IsNotExist(v.translateError(err)) { + v.logger.WithError(err).Warnf("EmptyTrash: HEAD %q failed", key) + return + } + err = v.bucket.Del("recent/" + key) + if err != nil { + v.logger.WithError(err).Warnf("EmptyTrash: error deleting %q", "recent/"+key) + } } - return -} -// S3Volume implements Volume using an S3 bucket. -type S3Volume struct { - AccessKey string - SecretKey string - Endpoint string - Region string - Bucket string - LocationConstraint bool - IndexPageSize int - ConnectTimeout arvados.Duration - ReadTimeout arvados.Duration - RaceWindow arvados.Duration - UnsafeDelete bool - - cluster *arvados.Cluster - volume arvados.Volume - logger logrus.FieldLogger - metrics *volumeMetricsVecs - bucket *s3bucket - startOnce sync.Once -} - -// GetDeviceID returns a globally unique ID for the storage bucket. -func (v *S3Volume) GetDeviceID() string { - return "s3://" + v.Endpoint + "/" + v.Bucket -} - -func (v *S3Volume) getReaderWithContext(ctx context.Context, loc string) (rdr io.ReadCloser, err error) { - ready := make(chan bool) - go func() { - rdr, err = v.getReader(loc) - close(ready) - }() - select { - case <-ready: - return - case <-ctx.Done(): - v.logger.Debugf("s3: abandoning getReader(): %s", ctx.Err()) + var wg sync.WaitGroup + todo := make(chan *s3.Object, v.cluster.Collections.BlobDeleteConcurrency) + for i := 0; i < v.cluster.Collections.BlobDeleteConcurrency; i++ { + wg.Add(1) go func() { - <-ready - if err == nil { - rdr.Close() + defer wg.Done() + for key := range todo { + emptyOneKey(key) } }() - return nil, ctx.Err() } + + trashL := s3awsLister{ + Logger: v.logger, + Bucket: v.bucket, + Prefix: "trash/", + PageSize: v.IndexPageSize, + Stats: &v.bucket.stats, + } + for trash := trashL.First(); trash != nil; trash = trashL.Next() { + todo <- trash + } + close(todo) + wg.Wait() + + if err := trashL.Error(); err != nil { + v.logger.WithError(err).Error("EmptyTrash: lister failed") + } + v.logger.Infof("EmptyTrash: stats for %v: Deleted %v bytes in %v blocks. Remaining in trash: %v bytes in %v blocks.", v.DeviceID(), bytesDeleted, blocksDeleted, bytesInTrash-bytesDeleted, blocksInTrash-blocksDeleted) } -// getReader wraps (Bucket)GetReader. -// -// In situations where (Bucket)GetReader would fail because the block -// disappeared in a Trash race, getReader calls fixRace to recover the -// data, and tries again. -func (v *S3Volume) getReader(loc string) (rdr io.ReadCloser, err error) { - rdr, err = v.bucket.GetReader(loc) - err = v.translateError(err) - if err == nil || !os.IsNotExist(err) { - return +// fixRace(X) is called when "recent/X" exists but "X" doesn't +// exist. If the timestamps on "recent/X" and "trash/X" indicate there +// was a race between Put and Trash, fixRace recovers from the race by +// Untrashing the block. +func (v *s3Volume) fixRace(key string) bool { + trash, err := v.head("trash/" + key) + if err != nil { + if !os.IsNotExist(v.translateError(err)) { + v.logger.WithError(err).Errorf("fixRace: HEAD %q failed", "trash/"+key) + } + return false } - _, err = v.bucket.Head("recent/"+loc, nil) - err = v.translateError(err) + recent, err := v.head("recent/" + key) if err != nil { - // If we can't read recent/X, there's no point in - // trying fixRace. Give up. - return + v.logger.WithError(err).Errorf("fixRace: HEAD %q failed", "recent/"+key) + return false } - if !v.fixRace(loc) { - err = os.ErrNotExist - return + + recentTime := *recent.LastModified + trashTime := *trash.LastModified + ageWhenTrashed := trashTime.Sub(recentTime) + if ageWhenTrashed >= v.cluster.Collections.BlobSigningTTL.Duration() { + // No evidence of a race: block hasn't been written + // since it became eligible for Trash. No fix needed. + return false } - rdr, err = v.bucket.GetReader(loc) + v.logger.Infof("fixRace: %q: trashed at %s but touched at %s (age when trashed = %s < %s)", key, trashTime, recentTime, ageWhenTrashed, v.cluster.Collections.BlobSigningTTL) + v.logger.Infof("fixRace: copying %q to %q to recover from race between Put/Touch and Trash", "recent/"+key, key) + err = v.safeCopy(key, "trash/"+key) if err != nil { - log.Printf("warning: reading %s after successful fixRace: %s", loc, err) - err = v.translateError(err) + v.logger.WithError(err).Error("fixRace: copy failed") + return false } + return true +} + +func (v *s3Volume) head(key string) (result *s3.HeadObjectOutput, err error) { + input := &s3.HeadObjectInput{ + Bucket: aws.String(v.bucket.bucket), + Key: aws.String(key), + } + + req := v.bucket.svc.HeadObjectRequest(input) + res, err := req.Send(context.TODO()) + + v.bucket.stats.TickOps("head") + v.bucket.stats.Tick(&v.bucket.stats.Ops, &v.bucket.stats.HeadOps) + v.bucket.stats.TickErr(err) + + if err != nil { + return nil, v.translateError(err) + } + result = res.HeadObjectOutput return } -// Get a block: copy the block data into buf, and return the number of -// bytes copied. -func (v *S3Volume) Get(ctx context.Context, loc string, buf []byte) (int, error) { - rdr, err := v.getReaderWithContext(ctx, loc) +// BlockRead reads a Keep block that has been stored as a block blob +// in the S3 bucket. +func (v *s3Volume) BlockRead(ctx context.Context, hash string, writeTo io.Writer) (int, error) { + key := v.key(hash) + buf, err := v.bufferPool.GetContext(ctx) if err != nil { return 0, err } + defer v.bufferPool.Put(buf) - var n int - ready := make(chan bool) - go func() { - defer close(ready) + streamer := newStreamWriterAt(writeTo, 65536, buf) + defer streamer.Close() + err = v.readWorker(ctx, key, streamer) + if err != nil { + err = v.translateError(err) + if !os.IsNotExist(err) { + return 0, err + } + if streamer.WroteAt() > 0 { + return 0, errors.New("bug? readWorker returned ErrNotExist after writing to streamer") + } - defer rdr.Close() - n, err = io.ReadFull(rdr, buf) + _, err = v.head("recent/" + key) + err = v.translateError(err) + if err != nil { + // If we can't read recent/X, there's no point in + // trying fixRace. Give up. + return 0, err + } + if !v.fixRace(key) { + err = os.ErrNotExist + return 0, err + } - switch err { - case nil, io.EOF, io.ErrUnexpectedEOF: - err = nil - default: + err = v.readWorker(ctx, key, streamer) + if err != nil { + v.logger.Warnf("reading %s after successful fixRace: %s", hash, err) err = v.translateError(err) + return 0, err } - }() - select { - case <-ctx.Done(): - v.logger.Debugf("s3: interrupting ReadFull() with Close() because %s", ctx.Err()) - rdr.Close() - // Must wait for ReadFull to return, to ensure it - // doesn't write to buf after we return. - v.logger.Debug("s3: waiting for ReadFull() to fail") - <-ready - return 0, ctx.Err() - case <-ready: - return n, err - } -} - -// Compare the given data with the stored data. -func (v *S3Volume) Compare(ctx context.Context, loc string, expect []byte) error { - errChan := make(chan error, 1) - go func() { - _, err := v.bucket.Head("recent/"+loc, nil) - errChan <- err - }() - var err error - select { - case <-ctx.Done(): - return ctx.Err() - case err = <-errChan: } + err = streamer.Close() if err != nil { - // Checking for "loc" itself here would interfere with - // future GET requests. - // - // On AWS, if X doesn't exist, a HEAD or GET request - // for X causes X's non-existence to be cached. Thus, - // if we test for X, then create X and return a - // signature to our client, the client might still get - // 404 from all keepstores when trying to read it. - // - // To avoid this, we avoid doing HEAD X or GET X until - // we know X has been written. - // - // Note that X might exist even though recent/X - // doesn't: for example, the response to HEAD recent/X - // might itself come from a stale cache. In such - // cases, we will return a false negative and - // PutHandler might needlessly create another replica - // on a different volume. That's not ideal, but it's - // better than passing the eventually-consistent - // problem on to our clients. - return v.translateError(err) - } - rdr, err := v.getReaderWithContext(ctx, loc) - if err != nil { - return err - } - defer rdr.Close() - return v.translateError(compareReaderWithBuf(ctx, rdr, expect, loc[:32])) + return 0, v.translateError(err) + } + return streamer.Wrote(), nil +} + +func (v *s3Volume) readWorker(ctx context.Context, key string, dst io.WriterAt) error { + downloader := s3manager.NewDownloaderWithClient(v.bucket.svc, func(u *s3manager.Downloader) { + u.PartSize = s3downloaderPartSize + u.Concurrency = s3downloaderReadConcurrency + }) + count, err := downloader.DownloadWithContext(ctx, dst, &s3.GetObjectInput{ + Bucket: aws.String(v.bucket.bucket), + Key: aws.String(key), + }) + v.bucket.stats.TickOps("get") + v.bucket.stats.Tick(&v.bucket.stats.Ops, &v.bucket.stats.GetOps) + v.bucket.stats.TickErr(err) + v.bucket.stats.TickInBytes(uint64(count)) + return v.translateError(err) } -// Put writes a block. -func (v *S3Volume) Put(ctx context.Context, loc string, block []byte) error { - if v.volume.ReadOnly { - return MethodDisabledError +func (v *s3Volume) writeObject(ctx context.Context, key string, r io.Reader) error { + if r == nil { + // r == nil leads to a memory violation in func readFillBuf in + // aws-sdk-go-v2@v0.23.0/service/s3/s3manager/upload.go + r = bytes.NewReader(nil) + } + + uploadInput := s3manager.UploadInput{ + Bucket: aws.String(v.bucket.bucket), + Key: aws.String(key), + Body: r, } - var opts s3.Options - size := len(block) - if size > 0 { + + if loc, ok := v.isKeepBlock(key); ok { + var contentMD5 string md5, err := hex.DecodeString(loc) if err != nil { - return err - } - opts.ContentMD5 = base64.StdEncoding.EncodeToString(md5) - // In AWS regions that use V4 signatures, we need to - // provide ContentSHA256 up front. Otherwise, the S3 - // library reads the request body (from our buffer) - // into another new buffer in order to compute the - // SHA256 before sending the request -- which would - // mean consuming 128 MiB of memory for the duration - // of a 64 MiB write. - opts.ContentSHA256 = fmt.Sprintf("%x", sha256.Sum256(block)) - } - - // Send the block data through a pipe, so that (if we need to) - // we can close the pipe early and abandon our PutReader() - // goroutine, without worrying about PutReader() accessing our - // block buffer after we release it. - bufr, bufw := io.Pipe() - go func() { - io.Copy(bufw, bytes.NewReader(block)) - bufw.Close() - }() - - var err error - ready := make(chan bool) - go func() { - defer func() { - if ctx.Err() != nil { - v.logger.Debugf("%s: abandoned PutReader goroutine finished with err: %s", v, err) - } - }() - defer close(ready) - err = v.bucket.PutReader(loc, bufr, int64(size), "application/octet-stream", s3ACL, opts) - if err != nil { - return + return v.translateError(err) } - err = v.bucket.PutReader("recent/"+loc, nil, 0, "application/octet-stream", s3ACL, s3.Options{}) - }() - select { - case <-ctx.Done(): - v.logger.Debugf("%s: taking PutReader's input away: %s", v, ctx.Err()) - // Our pipe might be stuck in Write(), waiting for - // PutReader() to read. If so, un-stick it. This means - // PutReader will get corrupt data, but that's OK: the - // size and MD5 won't match, so the write will fail. - go io.Copy(ioutil.Discard, bufr) - // CloseWithError() will return once pending I/O is done. - bufw.CloseWithError(ctx.Err()) - v.logger.Debugf("%s: abandoning PutReader goroutine", v) - return ctx.Err() - case <-ready: - // Unblock pipe in case PutReader did not consume it. - io.Copy(ioutil.Discard, bufr) - return v.translateError(err) - } -} - -// Touch sets the timestamp for the given locator to the current time. -func (v *S3Volume) Touch(loc string) error { - if v.volume.ReadOnly { - return MethodDisabledError - } - _, err := v.bucket.Head(loc, nil) - err = v.translateError(err) - if os.IsNotExist(err) && v.fixRace(loc) { - // The data object got trashed in a race, but fixRace - // rescued it. - } else if err != nil { - return err - } - err = v.bucket.PutReader("recent/"+loc, nil, 0, "application/octet-stream", s3ACL, s3.Options{}) + contentMD5 = base64.StdEncoding.EncodeToString(md5) + uploadInput.ContentMD5 = &contentMD5 + } + + // Experimentation indicated that using concurrency 5 yields the best + // throughput, better than higher concurrency (10 or 13) by ~5%. + // Defining u.BufferProvider = s3manager.NewBufferedReadSeekerWriteToPool(64 * 1024 * 1024) + // is detrimental to throughput (minus ~15%). + uploader := s3manager.NewUploaderWithClient(v.bucket.svc, func(u *s3manager.Uploader) { + u.PartSize = s3uploaderPartSize + u.Concurrency = s3uploaderWriteConcurrency + }) + + // Unlike the goamz S3 driver, we don't need to precompute ContentSHA256: + // the aws-sdk-go v2 SDK uses a ReadSeeker to avoid having to copy the + // block, so there is no extra memory use to be concerned about. See + // makeSha256Reader in aws/signer/v4/v4.go. In fact, we explicitly disable + // calculating the Sha-256 because we don't need it; we already use md5sum + // hashes that match the name of the block. + _, err := uploader.UploadWithContext(ctx, &uploadInput, s3manager.WithUploaderRequestOptions(func(r *aws.Request) { + r.HTTPRequest.Header.Set("X-Amz-Content-Sha256", "UNSIGNED-PAYLOAD") + })) + + v.bucket.stats.TickOps("put") + v.bucket.stats.Tick(&v.bucket.stats.Ops, &v.bucket.stats.PutOps) + v.bucket.stats.TickErr(err) + return v.translateError(err) } -// Mtime returns the stored timestamp for the given locator. -func (v *S3Volume) Mtime(loc string) (time.Time, error) { - _, err := v.bucket.Head(loc, nil) +// Put writes a block. +func (v *s3Volume) BlockWrite(ctx context.Context, hash string, data []byte) error { + // Do not use putWithPipe here; we want to pass an io.ReadSeeker to the S3 + // sdk to avoid memory allocation there. See #17339 for more information. + rdr := bytes.NewReader(data) + r := newCountingReaderAtSeeker(rdr, v.bucket.stats.TickOutBytes) + key := v.key(hash) + err := v.writeObject(ctx, key, r) if err != nil { - return zeroTime, v.translateError(err) + return err } - resp, err := v.bucket.Head("recent/"+loc, nil) - err = v.translateError(err) - if os.IsNotExist(err) { - // The data object X exists, but recent/X is missing. - err = v.bucket.PutReader("recent/"+loc, nil, 0, "application/octet-stream", s3ACL, s3.Options{}) - if err != nil { - log.Printf("error: creating %q: %s", "recent/"+loc, err) - return zeroTime, v.translateError(err) + return v.writeObject(ctx, "recent/"+key, nil) +} + +type s3awsLister struct { + Logger logrus.FieldLogger + Bucket *s3Bucket + Prefix string + PageSize int + Stats *s3awsbucketStats + ContinuationToken string + buf []s3.Object + err error +} + +// First fetches the first page and returns the first item. It returns +// nil if the response is the empty set or an error occurs. +func (lister *s3awsLister) First() *s3.Object { + lister.getPage() + return lister.pop() +} + +// Next returns the next item, fetching the next page if necessary. It +// returns nil if the last available item has already been fetched, or +// an error occurs. +func (lister *s3awsLister) Next() *s3.Object { + if len(lister.buf) == 0 && lister.ContinuationToken != "" { + lister.getPage() + } + return lister.pop() +} + +// Return the most recent error encountered by First or Next. +func (lister *s3awsLister) Error() error { + return lister.err +} + +func (lister *s3awsLister) getPage() { + lister.Stats.TickOps("list") + lister.Stats.Tick(&lister.Stats.Ops, &lister.Stats.ListOps) + + var input *s3.ListObjectsV2Input + if lister.ContinuationToken == "" { + input = &s3.ListObjectsV2Input{ + Bucket: aws.String(lister.Bucket.bucket), + MaxKeys: aws.Int64(int64(lister.PageSize)), + Prefix: aws.String(lister.Prefix), } - log.Printf("info: created %q to migrate existing block to new storage scheme", "recent/"+loc) - resp, err = v.bucket.Head("recent/"+loc, nil) - if err != nil { - log.Printf("error: created %q but HEAD failed: %s", "recent/"+loc, err) - return zeroTime, v.translateError(err) + } else { + input = &s3.ListObjectsV2Input{ + Bucket: aws.String(lister.Bucket.bucket), + MaxKeys: aws.Int64(int64(lister.PageSize)), + Prefix: aws.String(lister.Prefix), + ContinuationToken: &lister.ContinuationToken, } - } else if err != nil { - // HEAD recent/X failed for some other reason. - return zeroTime, err } - return v.lastModified(resp) + + req := lister.Bucket.svc.ListObjectsV2Request(input) + resp, err := req.Send(context.Background()) + if err != nil { + if aerr, ok := err.(awserr.Error); ok { + lister.err = aerr + } else { + lister.err = err + } + return + } + + if *resp.IsTruncated { + lister.ContinuationToken = *resp.NextContinuationToken + } else { + lister.ContinuationToken = "" + } + lister.buf = make([]s3.Object, 0, len(resp.Contents)) + for _, key := range resp.Contents { + if !strings.HasPrefix(*key.Key, lister.Prefix) { + lister.Logger.Warnf("s3awsLister: S3 Bucket.List(prefix=%q) returned key %q", lister.Prefix, *key.Key) + continue + } + lister.buf = append(lister.buf, key) + } } -// IndexTo writes a complete list of locators with the given prefix +func (lister *s3awsLister) pop() (k *s3.Object) { + if len(lister.buf) > 0 { + k = &lister.buf[0] + lister.buf = lister.buf[1:] + } + return +} + +// Index writes a complete list of locators with the given prefix // for which Get() can retrieve data. -func (v *S3Volume) IndexTo(prefix string, writer io.Writer) error { +func (v *s3Volume) Index(ctx context.Context, prefix string, writer io.Writer) error { + prefix = v.key(prefix) // Use a merge sort to find matching sets of X and recent/X. - dataL := s3Lister{ - Bucket: v.bucket.Bucket, + dataL := s3awsLister{ + Logger: v.logger, + Bucket: v.bucket, Prefix: prefix, PageSize: v.IndexPageSize, Stats: &v.bucket.stats, } - recentL := s3Lister{ - Bucket: v.bucket.Bucket, + recentL := s3awsLister{ + Logger: v.logger, + Bucket: v.bucket, Prefix: "recent/" + prefix, PageSize: v.IndexPageSize, Stats: &v.bucket.stats, } for data, recent := dataL.First(), recentL.First(); data != nil && dataL.Error() == nil; data = dataL.Next() { - if data.Key >= "g" { + if ctx.Err() != nil { + return ctx.Err() + } + if *data.Key >= "g" { // Conveniently, "recent/*" and "trash/*" are // lexically greater than all hex-encoded data // hashes, so stopping here avoids iterating // over all of them needlessly with dataL. break } - if !v.isKeepBlock(data.Key) { + loc, isblk := v.isKeepBlock(*data.Key) + if !isblk { continue } @@ -441,7 +666,7 @@ func (v *S3Volume) IndexTo(prefix string, writer io.Writer) error { // Advance to the corresponding recent/X marker, if any for recent != nil && recentL.Error() == nil { - if cmp := strings.Compare(recent.Key[7:], data.Key); cmp < 0 { + if cmp := strings.Compare((*recent.Key)[7:], *data.Key); cmp < 0 { recent = recentL.Next() continue } else if cmp == 0 { @@ -458,46 +683,67 @@ func (v *S3Volume) IndexTo(prefix string, writer io.Writer) error { if err := recentL.Error(); err != nil { return err } - t, err := time.Parse(time.RFC3339, stamp.LastModified) - if err != nil { - return err - } - fmt.Fprintf(writer, "%s+%d %d\n", data.Key, data.Size, t.UnixNano()) + // We truncate sub-second precision here. Otherwise + // timestamps will never match the RFC1123-formatted + // Last-Modified values parsed by Mtime(). + fmt.Fprintf(writer, "%s+%d %d\n", loc, *data.Size, stamp.LastModified.Unix()*1000000000) } return dataL.Error() } -// Trash a Keep block. -func (v *S3Volume) Trash(loc string) error { - if v.volume.ReadOnly { - return MethodDisabledError - } - if t, err := v.Mtime(loc); err != nil { - return err - } else if time.Since(t) < v.cluster.Collections.BlobSigningTTL.Duration() { - return nil +// Mtime returns the stored timestamp for the given locator. +func (v *s3Volume) Mtime(loc string) (time.Time, error) { + key := v.key(loc) + _, err := v.head(key) + if err != nil { + return s3AWSZeroTime, v.translateError(err) } - if v.cluster.Collections.BlobTrashLifetime == 0 { - if !v.UnsafeDelete { - return ErrS3TrashDisabled + resp, err := v.head("recent/" + key) + err = v.translateError(err) + if os.IsNotExist(err) { + // The data object X exists, but recent/X is missing. + err = v.writeObject(context.Background(), "recent/"+key, nil) + if err != nil { + v.logger.WithError(err).Errorf("error creating %q", "recent/"+key) + return s3AWSZeroTime, v.translateError(err) } - return v.translateError(v.bucket.Del(loc)) - } - err := v.checkRaceWindow(loc) - if err != nil { - return err + v.logger.Infof("Mtime: created %q to migrate existing block to new storage scheme", "recent/"+key) + resp, err = v.head("recent/" + key) + if err != nil { + v.logger.WithError(err).Errorf("HEAD failed after creating %q", "recent/"+key) + return s3AWSZeroTime, v.translateError(err) + } + } else if err != nil { + // HEAD recent/X failed for some other reason. + return s3AWSZeroTime, err } - err = v.safeCopy("trash/"+loc, loc) - if err != nil { + return *resp.LastModified, err +} + +// InternalStats returns bucket I/O and API call counters. +func (v *s3Volume) InternalStats() interface{} { + return &v.bucket.stats +} + +// BlockTouch sets the timestamp for the given locator to the current time. +func (v *s3Volume) BlockTouch(hash string) error { + key := v.key(hash) + _, err := v.head(key) + err = v.translateError(err) + if os.IsNotExist(err) && v.fixRace(key) { + // The data object got trashed in a race, but fixRace + // rescued it. + } else if err != nil { return err } - return v.translateError(v.bucket.Del(loc)) + err = v.writeObject(context.Background(), "recent/"+key, nil) + return v.translateError(err) } -// checkRaceWindow returns a non-nil error if trash/loc is, or might -// be, in the race window (i.e., it's not safe to trash loc). -func (v *S3Volume) checkRaceWindow(loc string) error { - resp, err := v.bucket.Head("trash/"+loc, nil) +// checkRaceWindow returns a non-nil error if trash/key is, or might +// be, in the race window (i.e., it's not safe to trash key). +func (v *s3Volume) checkRaceWindow(key string) error { + resp, err := v.head("trash/" + key) err = v.translateError(err) if os.IsNotExist(err) { // OK, trash/X doesn't exist so we're not in the race @@ -508,396 +754,70 @@ func (v *S3Volume) checkRaceWindow(loc string) error { // we're in the race window return err } - t, err := v.lastModified(resp) - if err != nil { - // Can't parse timestamp - return err - } + t := resp.LastModified safeWindow := t.Add(v.cluster.Collections.BlobTrashLifetime.Duration()).Sub(time.Now().Add(time.Duration(v.RaceWindow))) if safeWindow <= 0 { // We can't count on "touch trash/X" to prolong // trash/X's lifetime. The new timestamp might not // become visible until now+raceWindow, and EmptyTrash // is allowed to delete trash/X before then. - return fmt.Errorf("same block is already in trash, and safe window ended %s ago", -safeWindow) + return fmt.Errorf("%s: same block is already in trash, and safe window ended %s ago", key, -safeWindow) } // trash/X exists, but it won't be eligible for deletion until // after now+raceWindow, so it's safe to overwrite it. return nil } -// safeCopy calls PutCopy, and checks the response to make sure the -// copy succeeded and updated the timestamp on the destination object -// (PutCopy returns 200 OK if the request was received, even if the -// copy failed). -func (v *S3Volume) safeCopy(dst, src string) error { - resp, err := v.bucket.PutCopy(dst, s3ACL, s3.CopyOptions{ - ContentType: "application/octet-stream", - MetadataDirective: "REPLACE", - }, v.bucket.Name+"/"+src) - err = v.translateError(err) - if os.IsNotExist(err) { - return err - } else if err != nil { - return fmt.Errorf("PutCopy(%q ← %q): %s", dst, v.bucket.Name+"/"+src, err) - } - if t, err := time.Parse(time.RFC3339Nano, resp.LastModified); err != nil { - return fmt.Errorf("PutCopy succeeded but did not return a timestamp: %q: %s", resp.LastModified, err) - } else if time.Now().Sub(t) > maxClockSkew { - return fmt.Errorf("PutCopy succeeded but returned an old timestamp: %q: %s", resp.LastModified, t) +func (b *s3Bucket) Del(path string) error { + input := &s3.DeleteObjectInput{ + Bucket: aws.String(b.bucket), + Key: aws.String(path), } - return nil -} - -// Get the LastModified header from resp, and parse it as RFC1123 or -// -- if it isn't valid RFC1123 -- as Amazon's variant of RFC1123. -func (v *S3Volume) lastModified(resp *http.Response) (t time.Time, err error) { - s := resp.Header.Get("Last-Modified") - t, err = time.Parse(time.RFC1123, s) - if err != nil && s != "" { - // AWS example is "Sun, 1 Jan 2006 12:00:00 GMT", - // which isn't quite "Sun, 01 Jan 2006 12:00:00 GMT" - // as required by HTTP spec. If it's not a valid HTTP - // header value, it's probably AWS (or s3test) giving - // us a nearly-RFC1123 timestamp. - t, err = time.Parse(nearlyRFC1123, s) - } - return + req := b.svc.DeleteObjectRequest(input) + _, err := req.Send(context.Background()) + b.stats.TickOps("delete") + b.stats.Tick(&b.stats.Ops, &b.stats.DelOps) + b.stats.TickErr(err) + return err } -// Untrash moves block from trash back into store -func (v *S3Volume) Untrash(loc string) error { - err := v.safeCopy(loc, "trash/"+loc) - if err != nil { +// Trash a Keep block. +func (v *s3Volume) BlockTrash(loc string) error { + if t, err := v.Mtime(loc); err != nil { return err + } else if time.Since(t) < v.cluster.Collections.BlobSigningTTL.Duration() { + return nil } - err = v.bucket.PutReader("recent/"+loc, nil, 0, "application/octet-stream", s3ACL, s3.Options{}) - return v.translateError(err) -} - -// Status returns a *VolumeStatus representing the current in-use -// storage capacity and a fake available capacity that doesn't make -// the volume seem full or nearly-full. -func (v *S3Volume) Status() *VolumeStatus { - return &VolumeStatus{ - DeviceNum: 1, - BytesFree: BlockSize * 1000, - BytesUsed: 1, - } -} - -// InternalStats returns bucket I/O and API call counters. -func (v *S3Volume) InternalStats() interface{} { - return &v.bucket.stats -} - -// String implements fmt.Stringer. -func (v *S3Volume) String() string { - return fmt.Sprintf("s3-bucket:%+q", v.Bucket) -} - -var s3KeepBlockRegexp = regexp.MustCompile(`^[0-9a-f]{32}$`) - -func (v *S3Volume) isKeepBlock(s string) bool { - return s3KeepBlockRegexp.MatchString(s) -} - -// fixRace(X) is called when "recent/X" exists but "X" doesn't -// exist. If the timestamps on "recent/"+loc and "trash/"+loc indicate -// there was a race between Put and Trash, fixRace recovers from the -// race by Untrashing the block. -func (v *S3Volume) fixRace(loc string) bool { - trash, err := v.bucket.Head("trash/"+loc, nil) - if err != nil { - if !os.IsNotExist(v.translateError(err)) { - log.Printf("error: fixRace: HEAD %q: %s", "trash/"+loc, err) + key := v.key(loc) + if v.cluster.Collections.BlobTrashLifetime == 0 { + if !v.UnsafeDelete { + return errS3TrashDisabled } - return false + return v.translateError(v.bucket.Del(key)) } - trashTime, err := v.lastModified(trash) + err := v.checkRaceWindow(key) if err != nil { - log.Printf("error: fixRace: parse %q: %s", trash.Header.Get("Last-Modified"), err) - return false - } - - recent, err := v.bucket.Head("recent/"+loc, nil) - if err != nil { - log.Printf("error: fixRace: HEAD %q: %s", "recent/"+loc, err) - return false - } - recentTime, err := v.lastModified(recent) - if err != nil { - log.Printf("error: fixRace: parse %q: %s", recent.Header.Get("Last-Modified"), err) - return false - } - - ageWhenTrashed := trashTime.Sub(recentTime) - if ageWhenTrashed >= v.cluster.Collections.BlobSigningTTL.Duration() { - // No evidence of a race: block hasn't been written - // since it became eligible for Trash. No fix needed. - return false + return err } - - log.Printf("notice: fixRace: %q: trashed at %s but touched at %s (age when trashed = %s < %s)", loc, trashTime, recentTime, ageWhenTrashed, v.cluster.Collections.BlobSigningTTL) - log.Printf("notice: fixRace: copying %q to %q to recover from race between Put/Touch and Trash", "recent/"+loc, loc) - err = v.safeCopy(loc, "trash/"+loc) + err = v.safeCopy("trash/"+key, key) if err != nil { - log.Printf("error: fixRace: %s", err) - return false - } - return true -} - -func (v *S3Volume) translateError(err error) error { - switch err := err.(type) { - case *s3.Error: - if (err.StatusCode == http.StatusNotFound && err.Code == "NoSuchKey") || - strings.Contains(err.Error(), "Not Found") { - return os.ErrNotExist - } - // Other 404 errors like NoSuchVersion and - // NoSuchBucket are different problems which should - // get called out downstream, so we don't convert them - // to os.ErrNotExist. - } - return err -} - -// EmptyTrash looks for trashed blocks that exceeded TrashLifetime -// and deletes them from the volume. -func (v *S3Volume) EmptyTrash() { - if v.cluster.Collections.BlobDeleteConcurrency < 1 { - return - } - - var bytesInTrash, blocksInTrash, bytesDeleted, blocksDeleted int64 - - // Define "ready to delete" as "...when EmptyTrash started". - startT := time.Now() - - emptyOneKey := func(trash *s3.Key) { - loc := trash.Key[6:] - if !v.isKeepBlock(loc) { - return - } - atomic.AddInt64(&bytesInTrash, trash.Size) - atomic.AddInt64(&blocksInTrash, 1) - - trashT, err := time.Parse(time.RFC3339, trash.LastModified) - if err != nil { - log.Printf("warning: %s: EmptyTrash: %q: parse %q: %s", v, trash.Key, trash.LastModified, err) - return - } - recent, err := v.bucket.Head("recent/"+loc, nil) - if err != nil && os.IsNotExist(v.translateError(err)) { - log.Printf("warning: %s: EmptyTrash: found trash marker %q but no %q (%s); calling Untrash", v, trash.Key, "recent/"+loc, err) - err = v.Untrash(loc) - if err != nil { - log.Printf("error: %s: EmptyTrash: Untrash(%q): %s", v, loc, err) - } - return - } else if err != nil { - log.Printf("warning: %s: EmptyTrash: HEAD %q: %s", v, "recent/"+loc, err) - return - } - recentT, err := v.lastModified(recent) - if err != nil { - log.Printf("warning: %s: EmptyTrash: %q: parse %q: %s", v, "recent/"+loc, recent.Header.Get("Last-Modified"), err) - return - } - if trashT.Sub(recentT) < v.cluster.Collections.BlobSigningTTL.Duration() { - if age := startT.Sub(recentT); age >= v.cluster.Collections.BlobSigningTTL.Duration()-time.Duration(v.RaceWindow) { - // recent/loc is too old to protect - // loc from being Trashed again during - // the raceWindow that starts if we - // delete trash/X now. - // - // Note this means (TrashCheckInterval - // < BlobSignatureTTL - raceWindow) is - // necessary to avoid starvation. - log.Printf("notice: %s: EmptyTrash: detected old race for %q, calling fixRace + Touch", v, loc) - v.fixRace(loc) - v.Touch(loc) - return - } - _, err := v.bucket.Head(loc, nil) - if os.IsNotExist(err) { - log.Printf("notice: %s: EmptyTrash: detected recent race for %q, calling fixRace", v, loc) - v.fixRace(loc) - return - } else if err != nil { - log.Printf("warning: %s: EmptyTrash: HEAD %q: %s", v, loc, err) - return - } - } - if startT.Sub(trashT) < v.cluster.Collections.BlobTrashLifetime.Duration() { - return - } - err = v.bucket.Del(trash.Key) - if err != nil { - log.Printf("warning: %s: EmptyTrash: deleting %q: %s", v, trash.Key, err) - return - } - atomic.AddInt64(&bytesDeleted, trash.Size) - atomic.AddInt64(&blocksDeleted, 1) - - _, err = v.bucket.Head(loc, nil) - if err == nil { - log.Printf("warning: %s: EmptyTrash: HEAD %q succeeded immediately after deleting %q", v, loc, loc) - return - } - if !os.IsNotExist(v.translateError(err)) { - log.Printf("warning: %s: EmptyTrash: HEAD %q: %s", v, loc, err) - return - } - err = v.bucket.Del("recent/" + loc) - if err != nil { - log.Printf("warning: %s: EmptyTrash: deleting %q: %s", v, "recent/"+loc, err) - } - } - - var wg sync.WaitGroup - todo := make(chan *s3.Key, v.cluster.Collections.BlobDeleteConcurrency) - for i := 0; i < v.cluster.Collections.BlobDeleteConcurrency; i++ { - wg.Add(1) - go func() { - defer wg.Done() - for key := range todo { - emptyOneKey(key) - } - }() - } - - trashL := s3Lister{ - Bucket: v.bucket.Bucket, - Prefix: "trash/", - PageSize: v.IndexPageSize, - Stats: &v.bucket.stats, - } - for trash := trashL.First(); trash != nil; trash = trashL.Next() { - todo <- trash - } - close(todo) - wg.Wait() - - if err := trashL.Error(); err != nil { - log.Printf("error: %s: EmptyTrash: lister: %s", v, err) - } - log.Printf("EmptyTrash stats for %v: Deleted %v bytes in %v blocks. Remaining in trash: %v bytes in %v blocks.", v.String(), bytesDeleted, blocksDeleted, bytesInTrash-bytesDeleted, blocksInTrash-blocksDeleted) -} - -type s3Lister struct { - Bucket *s3.Bucket - Prefix string - PageSize int - Stats *s3bucketStats - nextMarker string - buf []s3.Key - err error -} - -// First fetches the first page and returns the first item. It returns -// nil if the response is the empty set or an error occurs. -func (lister *s3Lister) First() *s3.Key { - lister.getPage() - return lister.pop() -} - -// Next returns the next item, fetching the next page if necessary. It -// returns nil if the last available item has already been fetched, or -// an error occurs. -func (lister *s3Lister) Next() *s3.Key { - if len(lister.buf) == 0 && lister.nextMarker != "" { - lister.getPage() + return err } - return lister.pop() -} - -// Return the most recent error encountered by First or Next. -func (lister *s3Lister) Error() error { - return lister.err + return v.translateError(v.bucket.Del(key)) } -func (lister *s3Lister) getPage() { - lister.Stats.TickOps("list") - lister.Stats.Tick(&lister.Stats.Ops, &lister.Stats.ListOps) - resp, err := lister.Bucket.List(lister.Prefix, "", lister.nextMarker, lister.PageSize) - lister.nextMarker = "" +// BlockUntrash moves block from trash back into store +func (v *s3Volume) BlockUntrash(hash string) error { + key := v.key(hash) + err := v.safeCopy(key, "trash/"+key) if err != nil { - lister.err = err - return - } - if resp.IsTruncated { - lister.nextMarker = resp.NextMarker - } - lister.buf = make([]s3.Key, 0, len(resp.Contents)) - for _, key := range resp.Contents { - if !strings.HasPrefix(key.Key, lister.Prefix) { - log.Printf("warning: s3Lister: S3 Bucket.List(prefix=%q) returned key %q", lister.Prefix, key.Key) - continue - } - lister.buf = append(lister.buf, key) - } -} - -func (lister *s3Lister) pop() (k *s3.Key) { - if len(lister.buf) > 0 { - k = &lister.buf[0] - lister.buf = lister.buf[1:] - } - return -} - -// s3bucket wraps s3.bucket and counts I/O and API usage stats. -type s3bucket struct { - *s3.Bucket - stats s3bucketStats -} - -func (b *s3bucket) GetReader(path string) (io.ReadCloser, error) { - rdr, err := b.Bucket.GetReader(path) - b.stats.TickOps("get") - b.stats.Tick(&b.stats.Ops, &b.stats.GetOps) - b.stats.TickErr(err) - return NewCountingReader(rdr, b.stats.TickInBytes), err -} - -func (b *s3bucket) Head(path string, headers map[string][]string) (*http.Response, error) { - resp, err := b.Bucket.Head(path, headers) - b.stats.TickOps("head") - b.stats.Tick(&b.stats.Ops, &b.stats.HeadOps) - b.stats.TickErr(err) - return resp, err -} - -func (b *s3bucket) PutReader(path string, r io.Reader, length int64, contType string, perm s3.ACL, options s3.Options) error { - if length == 0 { - // goamz will only send Content-Length: 0 when reader - // is nil due to net.http.Request.ContentLength - // behavior. Otherwise, Content-Length header is - // omitted which will cause some S3 services - // (including AWS and Ceph RadosGW) to fail to create - // empty objects. - r = nil - } else { - r = NewCountingReader(r, b.stats.TickOutBytes) + return err } - err := b.Bucket.PutReader(path, r, length, contType, perm, options) - b.stats.TickOps("put") - b.stats.Tick(&b.stats.Ops, &b.stats.PutOps) - b.stats.TickErr(err) - return err -} - -func (b *s3bucket) Del(path string) error { - err := b.Bucket.Del(path) - b.stats.TickOps("delete") - b.stats.Tick(&b.stats.Ops, &b.stats.DelOps) - b.stats.TickErr(err) - return err + err = v.writeObject(context.Background(), "recent/"+key, nil) + return v.translateError(err) } -type s3bucketStats struct { +type s3awsbucketStats struct { statsTicker Ops uint64 GetOps uint64 @@ -907,13 +827,18 @@ type s3bucketStats struct { ListOps uint64 } -func (s *s3bucketStats) TickErr(err error) { +func (s *s3awsbucketStats) TickErr(err error) { if err == nil { return } errType := fmt.Sprintf("%T", err) - if err, ok := err.(*s3.Error); ok { - errType = errType + fmt.Sprintf(" %d %s", err.StatusCode, err.Code) + if aerr, ok := err.(awserr.Error); ok { + if reqErr, ok := err.(awserr.RequestFailure); ok { + // A service error occurred + errType = errType + fmt.Sprintf(" %d %s", reqErr.StatusCode(), aerr.Code()) + } else { + errType = errType + fmt.Sprintf(" 000 %s", aerr.Code()) + } } s.statsTicker.TickErr(err, errType) }