projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14399-azure-list-retry'
[arvados.git]
/
services
/
keepstore
/
config.go
diff --git
a/services/keepstore/config.go
b/services/keepstore/config.go
index 43b309916ea36b885941df58155ec1cc7736701d..43a2191111376fbf86c6943ffffff6c22668aa38 100644
(file)
--- a/
services/keepstore/config.go
+++ b/
services/keepstore/config.go
@@
-146,11
+146,7
@@
func (cfg *Config) Start(reg *prometheus.Registry) error {
}
vm := newVolumeMetricsVecs(reg)
for _, v := range cfg.Volumes {
}
vm := newVolumeMetricsVecs(reg)
for _, v := range cfg.Volumes {
- metrics := vm.curryWith(
- v.String(),
- v.Status().MountPoint,
- fmt.Sprintf("%d", v.Status().DeviceNum))
- if err := v.Start(metrics); err != nil {
+ if err := v.Start(vm); err != nil {
return fmt.Errorf("volume %s: %s", v, err)
}
log.Printf("Using volume %v (writable=%v)", v, v.Writable())
return fmt.Errorf("volume %s: %s", v, err)
}
log.Printf("Using volume %v (writable=%v)", v, v.Writable())
@@
-171,7
+167,7
@@
func (vl *VolumeList) UnmarshalJSON(data []byte) error {
for _, factory := range VolumeTypes {
t := factory().Type()
if _, ok := typeMap[t]; ok {
for _, factory := range VolumeTypes {
t := factory().Type()
if _, ok := typeMap[t]; ok {
- log.Fatal
("volume type %+q is claimed by multiple VolumeTypes"
)
+ log.Fatal
f("volume type %+q is claimed by multiple VolumeTypes", t
)
}
typeMap[t] = factory
}
}
typeMap[t] = factory
}