X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4568673894b4a752503ad403bd391767ac1805e5..b7ff345255551a5187ae7b2846b704a3c800256d:/services/keepstore/s3_volume.go diff --git a/services/keepstore/s3_volume.go b/services/keepstore/s3_volume.go index c52f616d1a..d34b8772c5 100644 --- a/services/keepstore/s3_volume.go +++ b/services/keepstore/s3_volume.go @@ -9,18 +9,17 @@ import ( "fmt" "io" "io/ioutil" - "log" "net/http" "os" "regexp" "strings" "sync" - "sync/atomic" "time" "git.curoverse.com/arvados.git/sdk/go/arvados" "github.com/AdRoll/goamz/aws" "github.com/AdRoll/goamz/s3" + log "github.com/Sirupsen/logrus" ) const ( @@ -149,24 +148,11 @@ type S3Volume struct { ReadOnly bool UnsafeDelete bool - bucket *s3.Bucket - bucketStats bucketStats - volumeStats ioStats + bucket *s3bucket startOnce sync.Once } -type bucketStats struct { - Errors uint64 - Ops uint64 - GetOps uint64 - PutOps uint64 - HeadOps uint64 - DelOps uint64 - InBytes uint64 - OutBytes uint64 -} - // Examples implements VolumeWithExamples. func (*S3Volume) Examples() []Volume { return []Volume{ @@ -244,9 +230,11 @@ func (v *S3Volume) Start() error { client := s3.New(auth, region) client.ConnectTimeout = time.Duration(v.ConnectTimeout) client.ReadTimeout = time.Duration(v.ReadTimeout) - v.bucket = &s3.Bucket{ - S3: client, - Name: v.Bucket, + v.bucket = &s3bucket{ + Bucket: &s3.Bucket{ + S3: client, + Name: v.Bucket, + }, } return nil } @@ -278,19 +266,14 @@ func (v *S3Volume) getReaderWithContext(ctx context.Context, loc string) (rdr io // 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) { - v.tick(&v.bucketStats.Ops, &v.bucketStats.GetOps) rdr, err = v.bucket.GetReader(loc) err = v.translateError(err) - if err == nil { - rdr = NewCountingReader(rdr, v.tickInBytes) - return - } else if !os.IsNotExist(v.tickErr(err)) { + if err == nil || !os.IsNotExist(err) { return } - v.tick(&v.bucketStats.Ops, &v.bucketStats.HeadOps) _, err = v.bucket.Head("recent/"+loc, nil) - err = v.translateError(v.tickErr(err)) + err = v.translateError(err) if err != nil { // If we can't read recent/X, there's no point in // trying fixRace. Give up. @@ -301,13 +284,11 @@ func (v *S3Volume) getReader(loc string) (rdr io.ReadCloser, err error) { return } - v.tick(&v.bucketStats.Ops, &v.bucketStats.GetOps) rdr, err = v.bucket.GetReader(loc) if err != nil { log.Printf("warning: reading %s after successful fixRace: %s", loc, err) - err = v.translateError(v.tickErr(err)) + err = v.translateError(err) } - rdr = NewCountingReader(rdr, v.tickInBytes) return } @@ -392,16 +373,11 @@ func (v *S3Volume) Put(ctx context.Context, loc string, block []byte) error { } }() defer close(ready) - v.tick(&v.bucketStats.Ops, &v.bucketStats.PutOps) - rdr := NewCountingReader(bufr, v.tickOutBytes) - err = v.bucket.PutReader(loc, rdr, int64(size), "application/octet-stream", s3ACL, opts) + err = v.bucket.PutReader(loc, bufr, int64(size), "application/octet-stream", s3ACL, opts) if err != nil { - v.tickErr(err) return } - v.tick(&v.bucketStats.Ops, &v.bucketStats.PutOps) err = v.bucket.Put("recent/"+loc, nil, "application/octet-stream", s3ACL, s3.Options{}) - v.tickErr(err) }() select { case <-ctx.Done(): @@ -425,44 +401,38 @@ func (v *S3Volume) Touch(loc string) error { if v.ReadOnly { return MethodDisabledError } - v.tick(&v.bucketStats.Ops, &v.bucketStats.HeadOps) _, err := v.bucket.Head(loc, nil) - err = v.translateError(v.tickErr(err)) + 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 } - v.tick(&v.bucketStats.Ops, &v.bucketStats.PutOps) err = v.bucket.Put("recent/"+loc, nil, "application/octet-stream", s3ACL, s3.Options{}) - return v.translateError(v.tickErr(err)) + return v.translateError(err) } // Mtime returns the stored timestamp for the given locator. func (v *S3Volume) Mtime(loc string) (time.Time, error) { - v.tick(&v.bucketStats.Ops, &v.bucketStats.HeadOps) _, err := v.bucket.Head(loc, nil) if err != nil { - return zeroTime, v.translateError(v.tickErr(err)) + return zeroTime, v.translateError(err) } - v.tick(&v.bucketStats.Ops, &v.bucketStats.HeadOps) resp, err := v.bucket.Head("recent/"+loc, nil) - err = v.translateError(v.tickErr(err)) + err = v.translateError(err) if os.IsNotExist(err) { // The data object X exists, but recent/X is missing. - v.tick(&v.bucketStats.Ops, &v.bucketStats.PutOps) err = v.bucket.Put("recent/"+loc, nil, "application/octet-stream", s3ACL, s3.Options{}) if err != nil { log.Printf("error: creating %q: %s", "recent/"+loc, err) - return zeroTime, v.translateError(v.tickErr(err)) + return zeroTime, v.translateError(err) } log.Printf("info: created %q to migrate existing block to new storage scheme", "recent/"+loc) - v.tick(&v.bucketStats.Ops, &v.bucketStats.HeadOps) 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(v.tickErr(err)) + return zeroTime, v.translateError(err) } } else if err != nil { // HEAD recent/X failed for some other reason. @@ -476,16 +446,19 @@ func (v *S3Volume) Mtime(loc string) (time.Time, error) { func (v *S3Volume) IndexTo(prefix string, writer io.Writer) error { // Use a merge sort to find matching sets of X and recent/X. dataL := s3Lister{ - Bucket: v.bucket, + Bucket: v.bucket.Bucket, Prefix: prefix, PageSize: v.IndexPageSize, } recentL := s3Lister{ - Bucket: v.bucket, + Bucket: v.bucket.Bucket, Prefix: "recent/" + prefix, PageSize: v.IndexPageSize, } + v.bucket.stats.Tick(&v.bucket.stats.Ops, &v.bucket.stats.ListOps) + v.bucket.stats.Tick(&v.bucket.stats.Ops, &v.bucket.stats.ListOps) for data, recent := dataL.First(), recentL.First(); data != nil; data = dataL.Next() { + v.bucket.stats.Tick(&v.bucket.stats.Ops, &v.bucket.stats.ListOps) if data.Key >= "g" { // Conveniently, "recent/*" and "trash/*" are // lexically greater than all hex-encoded data @@ -507,10 +480,12 @@ func (v *S3Volume) IndexTo(prefix string, writer io.Writer) error { for recent != nil { if cmp := strings.Compare(recent.Key[7:], data.Key); cmp < 0 { recent = recentL.Next() + v.bucket.stats.Tick(&v.bucket.stats.Ops, &v.bucket.stats.ListOps) continue } else if cmp == 0 { stamp = recent recent = recentL.Next() + v.bucket.stats.Tick(&v.bucket.stats.Ops, &v.bucket.stats.ListOps) break } else { // recent/X marker is missing: we'll @@ -542,8 +517,7 @@ func (v *S3Volume) Trash(loc string) error { if !s3UnsafeDelete { return ErrS3TrashDisabled } - v.tick(&v.bucketStats.Ops, &v.bucketStats.DelOps) - return v.translateError(v.tickErr(v.bucket.Del(loc))) + return v.translateError(v.bucket.Del(loc)) } err := v.checkRaceWindow(loc) if err != nil { @@ -553,16 +527,14 @@ func (v *S3Volume) Trash(loc string) error { if err != nil { return err } - v.tick(&v.bucketStats.Ops, &v.bucketStats.DelOps) - return v.translateError(v.tickErr(v.bucket.Del(loc))) + return v.translateError(v.bucket.Del(loc)) } // 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 { - v.tick(&v.bucketStats.Ops, &v.bucketStats.HeadOps) resp, err := v.bucket.Head("trash/"+loc, nil) - err = v.translateError(v.tickErr(err)) + err = v.translateError(err) if os.IsNotExist(err) { // OK, trash/X doesn't exist so we're not in the race // window @@ -595,12 +567,11 @@ func (v *S3Volume) checkRaceWindow(loc string) error { // (PutCopy returns 200 OK if the request was received, even if the // copy failed). func (v *S3Volume) safeCopy(dst, src string) error { - v.tick(&v.bucketStats.Ops, &v.bucketStats.PutOps) resp, err := v.bucket.PutCopy(dst, s3ACL, s3.CopyOptions{ ContentType: "application/octet-stream", MetadataDirective: "REPLACE", }, v.bucket.Name+"/"+src) - err = v.translateError(v.tickErr(err)) + err = v.translateError(err) if err != nil { return err } @@ -634,9 +605,8 @@ func (v *S3Volume) Untrash(loc string) error { if err != nil { return err } - v.tick(&v.bucketStats.Ops, &v.bucketStats.PutOps) err = v.bucket.Put("recent/"+loc, nil, "application/octet-stream", s3ACL, s3.Options{}) - return v.translateError(v.tickErr(err)) + return v.translateError(err) } // Status returns a *VolumeStatus representing the current in-use @@ -650,9 +620,9 @@ func (v *S3Volume) Status() *VolumeStatus { } } -// IOStatus implements InternalStatser. +// InternalStats returns bucket I/O and API call counters. func (v *S3Volume) InternalStats() interface{} { - return &v.bucketStats + return &v.bucket.stats } // String implements fmt.Stringer. @@ -683,10 +653,9 @@ func (v *S3Volume) isKeepBlock(s string) bool { // there was a race between Put and Trash, fixRace recovers from the // race by Untrashing the block. func (v *S3Volume) fixRace(loc string) bool { - v.tick(&v.bucketStats.Ops, &v.bucketStats.HeadOps) trash, err := v.bucket.Head("trash/"+loc, nil) if err != nil { - if !os.IsNotExist(v.translateError(v.tickErr(err))) { + if !os.IsNotExist(v.translateError(err)) { log.Printf("error: fixRace: HEAD %q: %s", "trash/"+loc, err) } return false @@ -697,10 +666,8 @@ func (v *S3Volume) fixRace(loc string) bool { return false } - v.tick(&v.bucketStats.Ops, &v.bucketStats.HeadOps) recent, err := v.bucket.Head("recent/"+loc, nil) if err != nil { - v.tickErr(err) log.Printf("error: fixRace: HEAD %q: %s", "recent/"+loc, err) return false } @@ -749,7 +716,7 @@ func (v *S3Volume) EmptyTrash() { // Use a merge sort to find matching sets of trash/X and recent/X. trashL := s3Lister{ - Bucket: v.bucket, + Bucket: v.bucket.Bucket, Prefix: "trash/", PageSize: v.IndexPageSize, } @@ -768,9 +735,8 @@ func (v *S3Volume) EmptyTrash() { log.Printf("warning: %s: EmptyTrash: %q: parse %q: %s", v, trash.Key, trash.LastModified, err) continue } - v.tick(&v.bucketStats.Ops, &v.bucketStats.HeadOps) recent, err := v.bucket.Head("recent/"+loc, nil) - if err != nil && os.IsNotExist(v.translateError(v.tickErr(err))) { + 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 { @@ -801,9 +767,8 @@ func (v *S3Volume) EmptyTrash() { v.Touch(loc) continue } - v.tick(&v.bucketStats.Ops, &v.bucketStats.HeadOps) _, err := v.bucket.Head(loc, nil) - if os.IsNotExist(v.tickErr(err)) { + if os.IsNotExist(err) { log.Printf("notice: %s: EmptyTrash: detected recent race for %q, calling fixRace", v, loc) v.fixRace(loc) continue @@ -815,23 +780,18 @@ func (v *S3Volume) EmptyTrash() { if startT.Sub(trashT) < theConfig.TrashLifetime.Duration() { continue } - v.tick(&v.bucketStats.Ops, &v.bucketStats.DelOps) err = v.bucket.Del(trash.Key) if err != nil { - v.tickErr(err) log.Printf("warning: %s: EmptyTrash: deleting %q: %s", v, trash.Key, err) continue } bytesDeleted += trash.Size blocksDeleted++ - v.tick(&v.bucketStats.Ops, &v.bucketStats.HeadOps) _, err = v.bucket.Head(loc, nil) - if os.IsNotExist(v.tickErr(err)) { - v.tick(&v.bucketStats.Ops, &v.bucketStats.DelOps) + if os.IsNotExist(err) { err = v.bucket.Del("recent/" + loc) if err != nil { - v.tickErr(err) log.Printf("warning: %s: EmptyTrash: deleting %q: %s", v, "recent/"+loc, err) } } else if err != nil { @@ -844,27 +804,6 @@ func (v *S3Volume) EmptyTrash() { 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) } -func (v *S3Volume) tick(counters ...*uint64) { - for _, counter := range counters { - atomic.AddUint64(counter, 1) - } -} - -func (v *S3Volume) tickErr(err error) error { - if err != nil { - atomic.AddUint64(&v.bucketStats.Errors, 1) - } - return err -} - -func (v *S3Volume) tickInBytes(n uint64) { - atomic.AddUint64(&v.bucketStats.InBytes, n) -} - -func (v *S3Volume) tickOutBytes(n uint64) { - atomic.AddUint64(&v.bucketStats.OutBytes, n) -} - type s3Lister struct { Bucket *s3.Bucket Prefix string @@ -923,3 +862,65 @@ func (lister *s3Lister) pop() (k *s3.Key) { } 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.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.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 { + err := b.Bucket.PutReader(path, NewCountingReader(r, b.stats.TickOutBytes), length, contType, perm, options) + b.stats.Tick(&b.stats.Ops, &b.stats.PutOps) + b.stats.TickErr(err) + return err +} + +func (b *s3bucket) Put(path string, data []byte, contType string, perm s3.ACL, options s3.Options) error { + err := b.Bucket.PutReader(path, NewCountingReader(bytes.NewBuffer(data), b.stats.TickOutBytes), int64(len(data)), contType, perm, options) + 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.Tick(&b.stats.Ops, &b.stats.DelOps) + b.stats.TickErr(err) + return err +} + +type s3bucketStats struct { + statsTicker + Ops uint64 + GetOps uint64 + PutOps uint64 + HeadOps uint64 + DelOps uint64 + ListOps uint64 +} + +func (s *s3bucketStats) 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) + } + s.statsTicker.TickErr(err, errType) +}