12416: Merge branch 'fix/keepstore-s3-radosgw-empty-object' of https://github.com...

[arvados.git] / services / keepstore / volume.go

diff --git a/services/keepstore/volume.go b/services/keepstore/volume.go
index 07b497cc2afd4b70a185e7354001137d3146bd58..69802abdd1b5c4e22422293331d6cb0eec371896 100644 (file)
--- a/services/keepstore/volume.go
+++ b/services/keepstore/volume.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
@@ -232,6 +236,10 @@ type Volume interface {
        // EmptyTrash looks for trashed blocks that exceeded TrashLifetime
        // and deletes them from the volume.
        EmptyTrash()
+
+       // Return a globally unique ID of the underlying storage
+       // device if possible, otherwise "".
+       DeviceID() string
 }
 
 // A VolumeWithExamples provides example configs to display in the
@@ -320,17 +328,12 @@ func MakeRRVolumeManager(volumes []Volume) *RRVolumeManager {
        for _, v := range volumes {
                mnt := &VolumeMount{
                        UUID:        (*VolumeMount)(nil).generateUUID(),
-                       DeviceID:    "",
+                       DeviceID:    v.DeviceID(),
                        ReadOnly:    !v.Writable(),
                        Replication: v.Replication(),
                        Tier:        1,
                        volume:      v,
                }
-               if v, ok := v.(interface {
-                       DeviceID() string
-               }); ok {
-                       mnt.DeviceID = v.DeviceID()
-               }
                vm.iostats[v] = &ioStats{}
                vm.mounts = append(vm.mounts, mnt)
                vm.mountMap[mnt.UUID] = mnt