19620: Remove old "v1" S3 keepstore driver.
[arvados.git] / services / keepstore / s3_volume_test.go
diff --git a/services/keepstore/s3_volume_test.go b/services/keepstore/s3_volume_test.go
deleted file mode 100644 (file)
index a820983..0000000
+++ /dev/null
@@ -1,594 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: AGPL-3.0
-
-package keepstore
-
-import (
-       "bytes"
-       "context"
-       "crypto/md5"
-       "encoding/json"
-       "fmt"
-       "io"
-       "net/http"
-       "net/http/httptest"
-       "os"
-       "strings"
-       "time"
-
-       "git.arvados.org/arvados.git/sdk/go/arvados"
-       "git.arvados.org/arvados.git/sdk/go/ctxlog"
-       "github.com/AdRoll/goamz/s3"
-       "github.com/AdRoll/goamz/s3/s3test"
-       "github.com/prometheus/client_golang/prometheus"
-       "github.com/sirupsen/logrus"
-       check "gopkg.in/check.v1"
-)
-
-const (
-       TestBucketName = "testbucket"
-)
-
-type fakeClock struct {
-       now *time.Time
-}
-
-func (c *fakeClock) Now() time.Time {
-       if c.now == nil {
-               return time.Now()
-       }
-       return *c.now
-}
-
-var _ = check.Suite(&StubbedS3Suite{})
-
-type StubbedS3Suite struct {
-       s3server *httptest.Server
-       metadata *httptest.Server
-       cluster  *arvados.Cluster
-       handler  *handler
-       volumes  []*TestableS3Volume
-}
-
-func (s *StubbedS3Suite) SetUpTest(c *check.C) {
-       s.s3server = nil
-       s.metadata = nil
-       s.cluster = testCluster(c)
-       s.cluster.Volumes = map[string]arvados.Volume{
-               "zzzzz-nyw5e-000000000000000": {Driver: "S3"},
-               "zzzzz-nyw5e-111111111111111": {Driver: "S3"},
-       }
-       s.handler = &handler{}
-}
-
-func (s *StubbedS3Suite) TestGeneric(c *check.C) {
-       DoGenericVolumeTests(c, false, func(t TB, cluster *arvados.Cluster, volume arvados.Volume, logger logrus.FieldLogger, metrics *volumeMetricsVecs) TestableVolume {
-               // Use a negative raceWindow so s3test's 1-second
-               // timestamp precision doesn't confuse fixRace.
-               return s.newTestableVolume(c, cluster, volume, metrics, -2*time.Second)
-       })
-}
-
-func (s *StubbedS3Suite) TestGenericReadOnly(c *check.C) {
-       DoGenericVolumeTests(c, true, func(t TB, cluster *arvados.Cluster, volume arvados.Volume, logger logrus.FieldLogger, metrics *volumeMetricsVecs) TestableVolume {
-               return s.newTestableVolume(c, cluster, volume, metrics, -2*time.Second)
-       })
-}
-
-func (s *StubbedS3Suite) TestGenericWithPrefix(c *check.C) {
-       DoGenericVolumeTests(c, false, func(t TB, cluster *arvados.Cluster, volume arvados.Volume, logger logrus.FieldLogger, metrics *volumeMetricsVecs) TestableVolume {
-               v := s.newTestableVolume(c, cluster, volume, metrics, -2*time.Second)
-               v.PrefixLength = 3
-               return v
-       })
-}
-
-func (s *StubbedS3Suite) TestIndex(c *check.C) {
-       v := s.newTestableVolume(c, s.cluster, arvados.Volume{Replication: 2}, newVolumeMetricsVecs(prometheus.NewRegistry()), 0)
-       v.IndexPageSize = 3
-       for i := 0; i < 256; i++ {
-               v.PutRaw(fmt.Sprintf("%02x%030x", i, i), []byte{102, 111, 111})
-       }
-       for _, spec := range []struct {
-               prefix      string
-               expectMatch int
-       }{
-               {"", 256},
-               {"c", 16},
-               {"bc", 1},
-               {"abc", 0},
-       } {
-               buf := new(bytes.Buffer)
-               err := v.IndexTo(spec.prefix, buf)
-               c.Check(err, check.IsNil)
-
-               idx := bytes.SplitAfter(buf.Bytes(), []byte{10})
-               c.Check(len(idx), check.Equals, spec.expectMatch+1)
-               c.Check(len(idx[len(idx)-1]), check.Equals, 0)
-       }
-}
-
-func (s *StubbedS3Suite) TestSignatureVersion(c *check.C) {
-       var header http.Header
-       stub := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-               header = r.Header
-       }))
-       defer stub.Close()
-
-       // Default V4 signature
-       vol := S3Volume{
-               S3VolumeDriverParameters: arvados.S3VolumeDriverParameters{
-                       AccessKeyID:     "xxx",
-                       SecretAccessKey: "xxx",
-                       Endpoint:        stub.URL,
-                       Region:          "test-region-1",
-                       Bucket:          "test-bucket-name",
-               },
-               cluster: s.cluster,
-               logger:  ctxlog.TestLogger(c),
-               metrics: newVolumeMetricsVecs(prometheus.NewRegistry()),
-       }
-       err := vol.check()
-       c.Check(err, check.IsNil)
-       err = vol.Put(context.Background(), "acbd18db4cc2f85cedef654fccc4a4d8", []byte("foo"))
-       c.Check(err, check.IsNil)
-       c.Check(header.Get("Authorization"), check.Matches, `AWS4-HMAC-SHA256 .*`)
-
-       // Force V2 signature
-       vol = S3Volume{
-               S3VolumeDriverParameters: arvados.S3VolumeDriverParameters{
-                       AccessKeyID:     "xxx",
-                       SecretAccessKey: "xxx",
-                       Endpoint:        stub.URL,
-                       Region:          "test-region-1",
-                       Bucket:          "test-bucket-name",
-                       V2Signature:     true,
-               },
-               cluster: s.cluster,
-               logger:  ctxlog.TestLogger(c),
-               metrics: newVolumeMetricsVecs(prometheus.NewRegistry()),
-       }
-       err = vol.check()
-       c.Check(err, check.IsNil)
-       err = vol.Put(context.Background(), "acbd18db4cc2f85cedef654fccc4a4d8", []byte("foo"))
-       c.Check(err, check.IsNil)
-       c.Check(header.Get("Authorization"), check.Matches, `AWS xxx:.*`)
-}
-
-func (s *StubbedS3Suite) TestIAMRoleCredentials(c *check.C) {
-       s.metadata = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-               upd := time.Now().UTC().Add(-time.Hour).Format(time.RFC3339)
-               exp := time.Now().UTC().Add(time.Hour).Format(time.RFC3339)
-               // Literal example from
-               // https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html#instance-metadata-security-credentials
-               // but with updated timestamps
-               io.WriteString(w, `{"Code":"Success","LastUpdated":"`+upd+`","Type":"AWS-HMAC","AccessKeyId":"ASIAIOSFODNN7EXAMPLE","SecretAccessKey":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","Token":"token","Expiration":"`+exp+`"}`)
-       }))
-       defer s.metadata.Close()
-
-       v := s.newTestableVolume(c, s.cluster, arvados.Volume{Replication: 2}, newVolumeMetricsVecs(prometheus.NewRegistry()), 5*time.Minute)
-       c.Check(v.AccessKeyID, check.Equals, "ASIAIOSFODNN7EXAMPLE")
-       c.Check(v.SecretAccessKey, check.Equals, "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY")
-       c.Check(v.bucket.bucket.S3.Auth.AccessKey, check.Equals, "ASIAIOSFODNN7EXAMPLE")
-       c.Check(v.bucket.bucket.S3.Auth.SecretKey, check.Equals, "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY")
-
-       s.metadata = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-               w.WriteHeader(http.StatusNotFound)
-       }))
-       deadv := &S3Volume{
-               S3VolumeDriverParameters: arvados.S3VolumeDriverParameters{
-                       IAMRole:  s.metadata.URL + "/fake-metadata/test-role",
-                       Endpoint: "http://localhost:12345",
-                       Region:   "test-region-1",
-                       Bucket:   "test-bucket-name",
-               },
-               cluster: s.cluster,
-               logger:  ctxlog.TestLogger(c),
-               metrics: newVolumeMetricsVecs(prometheus.NewRegistry()),
-       }
-       err := deadv.check()
-       c.Check(err, check.ErrorMatches, `.*/fake-metadata/test-role.*`)
-       c.Check(err, check.ErrorMatches, `.*404.*`)
-}
-
-func (s *StubbedS3Suite) TestStats(c *check.C) {
-       v := s.newTestableVolume(c, s.cluster, arvados.Volume{Replication: 2}, newVolumeMetricsVecs(prometheus.NewRegistry()), 5*time.Minute)
-       stats := func() string {
-               buf, err := json.Marshal(v.InternalStats())
-               c.Check(err, check.IsNil)
-               return string(buf)
-       }
-
-       c.Check(stats(), check.Matches, `.*"Ops":0,.*`)
-
-       loc := "acbd18db4cc2f85cedef654fccc4a4d8"
-       _, err := v.Get(context.Background(), loc, make([]byte, 3))
-       c.Check(err, check.NotNil)
-       c.Check(stats(), check.Matches, `.*"Ops":[^0],.*`)
-       c.Check(stats(), check.Matches, `.*"\*s3.Error 404 [^"]*":[^0].*`)
-       c.Check(stats(), check.Matches, `.*"InBytes":0,.*`)
-
-       err = v.Put(context.Background(), loc, []byte("foo"))
-       c.Check(err, check.IsNil)
-       c.Check(stats(), check.Matches, `.*"OutBytes":3,.*`)
-       c.Check(stats(), check.Matches, `.*"PutOps":2,.*`)
-
-       _, err = v.Get(context.Background(), loc, make([]byte, 3))
-       c.Check(err, check.IsNil)
-       _, err = v.Get(context.Background(), loc, make([]byte, 3))
-       c.Check(err, check.IsNil)
-       c.Check(stats(), check.Matches, `.*"InBytes":6,.*`)
-}
-
-type blockingHandler struct {
-       requested chan *http.Request
-       unblock   chan struct{}
-}
-
-func (h *blockingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-       if r.Method == "PUT" && !strings.Contains(strings.Trim(r.URL.Path, "/"), "/") {
-               // Accept PutBucket ("PUT /bucketname/"), called by
-               // newTestableVolume
-               return
-       }
-       if h.requested != nil {
-               h.requested <- r
-       }
-       if h.unblock != nil {
-               <-h.unblock
-       }
-       http.Error(w, "nothing here", http.StatusNotFound)
-}
-
-func (s *StubbedS3Suite) TestGetContextCancel(c *check.C) {
-       loc := "acbd18db4cc2f85cedef654fccc4a4d8"
-       buf := make([]byte, 3)
-
-       s.testContextCancel(c, func(ctx context.Context, v *TestableS3Volume) error {
-               _, err := v.Get(ctx, loc, buf)
-               return err
-       })
-}
-
-func (s *StubbedS3Suite) TestCompareContextCancel(c *check.C) {
-       loc := "acbd18db4cc2f85cedef654fccc4a4d8"
-       buf := []byte("bar")
-
-       s.testContextCancel(c, func(ctx context.Context, v *TestableS3Volume) error {
-               return v.Compare(ctx, loc, buf)
-       })
-}
-
-func (s *StubbedS3Suite) TestPutContextCancel(c *check.C) {
-       loc := "acbd18db4cc2f85cedef654fccc4a4d8"
-       buf := []byte("foo")
-
-       s.testContextCancel(c, func(ctx context.Context, v *TestableS3Volume) error {
-               return v.Put(ctx, loc, buf)
-       })
-}
-
-func (s *StubbedS3Suite) testContextCancel(c *check.C, testFunc func(context.Context, *TestableS3Volume) error) {
-       handler := &blockingHandler{}
-       s.s3server = httptest.NewServer(handler)
-       defer s.s3server.Close()
-
-       v := s.newTestableVolume(c, s.cluster, arvados.Volume{Replication: 2}, newVolumeMetricsVecs(prometheus.NewRegistry()), 5*time.Minute)
-
-       ctx, cancel := context.WithCancel(context.Background())
-
-       handler.requested = make(chan *http.Request)
-       handler.unblock = make(chan struct{})
-       defer close(handler.unblock)
-
-       doneFunc := make(chan struct{})
-       go func() {
-               err := testFunc(ctx, v)
-               c.Check(err, check.Equals, context.Canceled)
-               close(doneFunc)
-       }()
-
-       timeout := time.After(10 * time.Second)
-
-       // Wait for the stub server to receive a request, meaning
-       // Get() is waiting for an s3 operation.
-       select {
-       case <-timeout:
-               c.Fatal("timed out waiting for test func to call our handler")
-       case <-doneFunc:
-               c.Fatal("test func finished without even calling our handler!")
-       case <-handler.requested:
-       }
-
-       cancel()
-
-       select {
-       case <-timeout:
-               c.Fatal("timed out")
-       case <-doneFunc:
-       }
-}
-
-func (s *StubbedS3Suite) TestBackendStates(c *check.C) {
-       s.cluster.Collections.BlobTrashLifetime.Set("1h")
-       s.cluster.Collections.BlobSigningTTL.Set("1h")
-
-       v := s.newTestableVolume(c, s.cluster, arvados.Volume{Replication: 2}, newVolumeMetricsVecs(prometheus.NewRegistry()), 5*time.Minute)
-       var none time.Time
-
-       putS3Obj := func(t time.Time, key string, data []byte) {
-               if t == none {
-                       return
-               }
-               v.serverClock.now = &t
-               v.bucket.Bucket().Put(key, data, "application/octet-stream", s3ACL, s3.Options{})
-       }
-
-       t0 := time.Now()
-       nextKey := 0
-       for _, scenario := range []struct {
-               label               string
-               dataT               time.Time
-               recentT             time.Time
-               trashT              time.Time
-               canGet              bool
-               canTrash            bool
-               canGetAfterTrash    bool
-               canUntrash          bool
-               haveTrashAfterEmpty bool
-               freshAfterEmpty     bool
-       }{
-               {
-                       "No related objects",
-                       none, none, none,
-                       false, false, false, false, false, false,
-               },
-               {
-                       // Stored by older version, or there was a
-                       // race between EmptyTrash and Put: Trash is a
-                       // no-op even though the data object is very
-                       // old
-                       "No recent/X",
-                       t0.Add(-48 * time.Hour), none, none,
-                       true, true, true, false, false, false,
-               },
-               {
-                       "Not trash, but old enough to be eligible for trash",
-                       t0.Add(-24 * time.Hour), t0.Add(-2 * time.Hour), none,
-                       true, true, false, false, false, false,
-               },
-               {
-                       "Not trash, and not old enough to be eligible for trash",
-                       t0.Add(-24 * time.Hour), t0.Add(-30 * time.Minute), none,
-                       true, true, true, false, false, false,
-               },
-               {
-                       "Trashed + untrashed copies exist, due to recent race between Trash and Put",
-                       t0.Add(-24 * time.Hour), t0.Add(-3 * time.Minute), t0.Add(-2 * time.Minute),
-                       true, true, true, true, true, false,
-               },
-               {
-                       "Trashed + untrashed copies exist, trash nearly eligible for deletion: prone to Trash race",
-                       t0.Add(-24 * time.Hour), t0.Add(-12 * time.Hour), t0.Add(-59 * time.Minute),
-                       true, false, true, true, true, false,
-               },
-               {
-                       "Trashed + untrashed copies exist, trash is eligible for deletion: prone to Trash race",
-                       t0.Add(-24 * time.Hour), t0.Add(-12 * time.Hour), t0.Add(-61 * time.Minute),
-                       true, false, true, true, false, false,
-               },
-               {
-                       "Trashed + untrashed copies exist, due to old race between Put and unfinished Trash: emptying trash is unsafe",
-                       t0.Add(-24 * time.Hour), t0.Add(-12 * time.Hour), t0.Add(-12 * time.Hour),
-                       true, false, true, true, true, true,
-               },
-               {
-                       "Trashed + untrashed copies exist, used to be unsafe to empty, but since made safe by fixRace+Touch",
-                       t0.Add(-time.Second), t0.Add(-time.Second), t0.Add(-12 * time.Hour),
-                       true, true, true, true, false, false,
-               },
-               {
-                       "Trashed + untrashed copies exist because Trash operation was interrupted (no race)",
-                       t0.Add(-24 * time.Hour), t0.Add(-24 * time.Hour), t0.Add(-12 * time.Hour),
-                       true, false, true, true, false, false,
-               },
-               {
-                       "Trash, not yet eligible for deletion",
-                       none, t0.Add(-12 * time.Hour), t0.Add(-time.Minute),
-                       false, false, false, true, true, false,
-               },
-               {
-                       "Trash, not yet eligible for deletion, prone to races",
-                       none, t0.Add(-12 * time.Hour), t0.Add(-59 * time.Minute),
-                       false, false, false, true, true, false,
-               },
-               {
-                       "Trash, eligible for deletion",
-                       none, t0.Add(-12 * time.Hour), t0.Add(-2 * time.Hour),
-                       false, false, false, true, false, false,
-               },
-               {
-                       "Erroneously trashed during a race, detected before BlobTrashLifetime",
-                       none, t0.Add(-30 * time.Minute), t0.Add(-29 * time.Minute),
-                       true, false, true, true, true, false,
-               },
-               {
-                       "Erroneously trashed during a race, rescue during EmptyTrash despite reaching BlobTrashLifetime",
-                       none, t0.Add(-90 * time.Minute), t0.Add(-89 * time.Minute),
-                       true, false, true, true, true, false,
-               },
-               {
-                       "Trashed copy exists with no recent/* marker (cause unknown); repair by untrashing",
-                       none, none, t0.Add(-time.Minute),
-                       false, false, false, true, true, true,
-               },
-       } {
-               for _, prefixLength := range []int{0, 3} {
-                       v.PrefixLength = prefixLength
-                       c.Logf("Scenario: %q (prefixLength=%d)", scenario.label, prefixLength)
-
-                       // We have a few tests to run for each scenario, and
-                       // the tests are expected to change state. By calling
-                       // this setup func between tests, we (re)create the
-                       // scenario as specified, using a new unique block
-                       // locator to prevent interference from previous
-                       // tests.
-
-                       setupScenario := func() (string, []byte) {
-                               nextKey++
-                               blk := []byte(fmt.Sprintf("%d", nextKey))
-                               loc := fmt.Sprintf("%x", md5.Sum(blk))
-                               key := loc
-                               if prefixLength > 0 {
-                                       key = loc[:prefixLength] + "/" + loc
-                               }
-                               c.Log("\t", loc)
-                               putS3Obj(scenario.dataT, key, blk)
-                               putS3Obj(scenario.recentT, "recent/"+key, nil)
-                               putS3Obj(scenario.trashT, "trash/"+key, blk)
-                               v.serverClock.now = &t0
-                               return loc, blk
-                       }
-
-                       // Check canGet
-                       loc, blk := setupScenario()
-                       buf := make([]byte, len(blk))
-                       _, err := v.Get(context.Background(), loc, buf)
-                       c.Check(err == nil, check.Equals, scenario.canGet)
-                       if err != nil {
-                               c.Check(os.IsNotExist(err), check.Equals, true)
-                       }
-
-                       // Call Trash, then check canTrash and canGetAfterTrash
-                       loc, _ = setupScenario()
-                       err = v.Trash(loc)
-                       c.Check(err == nil, check.Equals, scenario.canTrash)
-                       _, err = v.Get(context.Background(), loc, buf)
-                       c.Check(err == nil, check.Equals, scenario.canGetAfterTrash)
-                       if err != nil {
-                               c.Check(os.IsNotExist(err), check.Equals, true)
-                       }
-
-                       // Call Untrash, then check canUntrash
-                       loc, _ = setupScenario()
-                       err = v.Untrash(loc)
-                       c.Check(err == nil, check.Equals, scenario.canUntrash)
-                       if scenario.dataT != none || scenario.trashT != none {
-                               // In all scenarios where the data exists, we
-                               // should be able to Get after Untrash --
-                               // regardless of timestamps, errors, race
-                               // conditions, etc.
-                               _, err = v.Get(context.Background(), loc, buf)
-                               c.Check(err, check.IsNil)
-                       }
-
-                       // Call EmptyTrash, then check haveTrashAfterEmpty and
-                       // freshAfterEmpty
-                       loc, _ = setupScenario()
-                       v.EmptyTrash()
-                       _, err = v.bucket.Head("trash/"+v.key(loc), nil)
-                       c.Check(err == nil, check.Equals, scenario.haveTrashAfterEmpty)
-                       if scenario.freshAfterEmpty {
-                               t, err := v.Mtime(loc)
-                               c.Check(err, check.IsNil)
-                               // new mtime must be current (with an
-                               // allowance for 1s timestamp precision)
-                               c.Check(t.After(t0.Add(-time.Second)), check.Equals, true)
-                       }
-
-                       // Check for current Mtime after Put (applies to all
-                       // scenarios)
-                       loc, blk = setupScenario()
-                       err = v.Put(context.Background(), loc, blk)
-                       c.Check(err, check.IsNil)
-                       t, err := v.Mtime(loc)
-                       c.Check(err, check.IsNil)
-                       c.Check(t.After(t0.Add(-time.Second)), check.Equals, true)
-               }
-       }
-}
-
-type TestableS3Volume struct {
-       *S3Volume
-       server      *s3test.Server
-       c           *check.C
-       serverClock *fakeClock
-}
-
-func (s *StubbedS3Suite) newTestableVolume(c *check.C, cluster *arvados.Cluster, volume arvados.Volume, metrics *volumeMetricsVecs, raceWindow time.Duration) *TestableS3Volume {
-       clock := &fakeClock{}
-       srv, err := s3test.NewServer(&s3test.Config{Clock: clock})
-       c.Assert(err, check.IsNil)
-       endpoint := srv.URL()
-       if s.s3server != nil {
-               endpoint = s.s3server.URL
-       }
-
-       iamRole, accessKey, secretKey := "", "xxx", "xxx"
-       if s.metadata != nil {
-               iamRole, accessKey, secretKey = s.metadata.URL+"/fake-metadata/test-role", "", ""
-       }
-
-       v := &TestableS3Volume{
-               S3Volume: &S3Volume{
-                       S3VolumeDriverParameters: arvados.S3VolumeDriverParameters{
-                               IAMRole:            iamRole,
-                               AccessKeyID:        accessKey,
-                               SecretAccessKey:    secretKey,
-                               Bucket:             TestBucketName,
-                               Endpoint:           endpoint,
-                               Region:             "test-region-1",
-                               LocationConstraint: true,
-                               UnsafeDelete:       true,
-                               IndexPageSize:      1000,
-                       },
-                       cluster: cluster,
-                       volume:  volume,
-                       logger:  ctxlog.TestLogger(c),
-                       metrics: metrics,
-               },
-               c:           c,
-               server:      srv,
-               serverClock: clock,
-       }
-       c.Assert(v.S3Volume.check(), check.IsNil)
-       c.Assert(v.bucket.Bucket().PutBucket(s3.ACL("private")), check.IsNil)
-       // We couldn't set RaceWindow until now because check()
-       // rejects negative values.
-       v.S3Volume.RaceWindow = arvados.Duration(raceWindow)
-       return v
-}
-
-// PutRaw skips the ContentMD5 test
-func (v *TestableS3Volume) PutRaw(loc string, block []byte) {
-       key := v.key(loc)
-       err := v.bucket.Bucket().Put(key, block, "application/octet-stream", s3ACL, s3.Options{})
-       if err != nil {
-               v.logger.Printf("PutRaw: %s: %+v", loc, err)
-       }
-       err = v.bucket.Bucket().Put("recent/"+key, nil, "application/octet-stream", s3ACL, s3.Options{})
-       if err != nil {
-               v.logger.Printf("PutRaw: recent/%s: %+v", key, err)
-       }
-}
-
-// TouchWithDate turns back the clock while doing a Touch(). We assume
-// there are no other operations happening on the same s3test server
-// while we do this.
-func (v *TestableS3Volume) TouchWithDate(locator string, lastPut time.Time) {
-       v.serverClock.now = &lastPut
-       err := v.bucket.Bucket().Put("recent/"+v.key(locator), nil, "application/octet-stream", s3ACL, s3.Options{})
-       if err != nil {
-               panic(err)
-       }
-       v.serverClock.now = nil
-}
-
-func (v *TestableS3Volume) Teardown() {
-       v.server.Quit()
-}
-
-func (v *TestableS3Volume) ReadWriteOperationLabelValues() (r, w string) {
-       return "get", "put"
-}