projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 14645-fuse-operations-reporting
[arvados.git]
/
services
/
keepstore
/
s3_volume_test.go
diff --git
a/services/keepstore/s3_volume_test.go
b/services/keepstore/s3_volume_test.go
index e88efffe41aa52d72ddd19553ea0b378d8da3e83..6377420ff4b381cba49b07d2813fb4803f03aa62 100644
(file)
--- a/
services/keepstore/s3_volume_test.go
+++ b/
services/keepstore/s3_volume_test.go
@@
-171,8
+171,7
@@
func (s *StubbedS3Suite) testContextCancel(c *check.C, testFunc func(context.Con
vol := *v.S3Volume
vol.Endpoint = srv.URL
v = &TestableS3Volume{S3Volume: &vol}
vol := *v.S3Volume
vol.Endpoint = srv.URL
v = &TestableS3Volume{S3Volume: &vol}
- metrics := newVolumeMetricsVecs(prometheus.NewRegistry()).curryWith(
- v.String(), v.Status().MountPoint, fmt.Sprintf("%d", v.Status().DeviceNum))
+ metrics := newVolumeMetricsVecs(prometheus.NewRegistry())
v.Start(metrics)
ctx, cancel := context.WithCancel(context.Background())
v.Start(metrics)
ctx, cancel := context.WithCancel(context.Background())
@@
-433,8
+432,7
@@
func (s *StubbedS3Suite) newTestableVolume(c *check.C, raceWindow time.Duration,
server: srv,
serverClock: clock,
}
server: srv,
serverClock: clock,
}
- metrics := newVolumeMetricsVecs(prometheus.NewRegistry()).curryWith(
- v.String(), v.Status().MountPoint, fmt.Sprintf("%d", v.Status().DeviceNum))
+ metrics := newVolumeMetricsVecs(prometheus.NewRegistry())
v.Start(metrics)
err = v.bucket.PutBucket(s3.ACL("private"))
c.Assert(err, check.IsNil)
v.Start(metrics)
err = v.bucket.PutBucket(s3.ACL("private"))
c.Assert(err, check.IsNil)
@@
-453,7
+451,7
@@
Volumes:
c.Check(cfg.Volumes[0].GetStorageClasses(), check.DeepEquals, []string{"class_a", "class_b"})
}
c.Check(cfg.Volumes[0].GetStorageClasses(), check.DeepEquals, []string{"class_a", "class_b"})
}
-func (v *TestableS3Volume) Start(
m *volumeMetri
cs) error {
+func (v *TestableS3Volume) Start(
vm *volumeMetricsVe
cs) error {
tmp, err := ioutil.TempFile("", "keepstore")
v.c.Assert(err, check.IsNil)
defer os.Remove(tmp.Name())
tmp, err := ioutil.TempFile("", "keepstore")
v.c.Assert(err, check.IsNil)
defer os.Remove(tmp.Name())
@@
-464,7
+462,7
@@
func (v *TestableS3Volume) Start(m *volumeMetrics) error {
v.S3Volume.AccessKeyFile = tmp.Name()
v.S3Volume.SecretKeyFile = tmp.Name()
v.S3Volume.AccessKeyFile = tmp.Name()
v.S3Volume.SecretKeyFile = tmp.Name()
- v.c.Assert(v.S3Volume.Start(m), check.IsNil)
+ v.c.Assert(v.S3Volume.Start(
v
m), check.IsNil)
return nil
}
return nil
}
@@
-495,3
+493,7
@@
func (v *TestableS3Volume) TouchWithDate(locator string, lastPut time.Time) {
func (v *TestableS3Volume) Teardown() {
v.server.Quit()
}
func (v *TestableS3Volume) Teardown() {
v.server.Quit()
}
+
+func (v *TestableS3Volume) ReadWriteOperationLabelValues() (r, w string) {
+ return "get", "put"
+}