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))
- v.Start(metrics)
+ metrics := newVolumeMetricsVecs(prometheus.NewRegistry())
+ v.Start(metrics.opsCounters, metrics.errCounters, metrics.ioBytes)
ctx, cancel := context.WithCancel(context.Background())
server: srv,
serverClock: clock,
}
- metrics := newVolumeMetricsVecs(prometheus.NewRegistry()).curryWith(
- v.String(), v.Status().MountPoint, fmt.Sprintf("%d", v.Status().DeviceNum))
- v.Start(metrics)
+ metrics := newVolumeMetricsVecs(prometheus.NewRegistry())
+ v.Start(metrics.opsCounters, metrics.errCounters, metrics.ioBytes)
err = v.bucket.PutBucket(s3.ACL("private"))
c.Assert(err, check.IsNil)
return v
c.Check(cfg.Volumes[0].GetStorageClasses(), check.DeepEquals, []string{"class_a", "class_b"})
}
-func (v *TestableS3Volume) Start(m *volumeMetrics) error {
+func (v *TestableS3Volume) Start(opsCounters, errCounters, ioBytes *prometheus.CounterVec) error {
tmp, err := ioutil.TempFile("", "keepstore")
v.c.Assert(err, check.IsNil)
defer os.Remove(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(opsCounters, errCounters, ioBytes), check.IsNil)
return nil
}