Browse Source
[shell] use constant for hdd of type (#6337)
use constant for hdd of type
pull/6341/head
Konstantin Lebedev
1 month ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with
11 additions and
7 deletions
-
weed/shell/command_cluster_check.go
-
weed/shell/command_volume_balance_test.go
-
weed/shell/command_volume_list.go
-
weed/storage/disk_location_test.go
-
weed/storage/types/volume_disk_type.go
|
|
@ -4,6 +4,7 @@ import ( |
|
|
|
"context" |
|
|
|
"flag" |
|
|
|
"fmt" |
|
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/types" |
|
|
|
"io" |
|
|
|
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/cluster" |
|
|
@ -79,7 +80,7 @@ func (c *commandClusterCheck) Do(args []string, commandEnv *CommandEnv, writer i |
|
|
|
|
|
|
|
if len(filers) > 0 { |
|
|
|
genericDiskInfo, genericDiskInfoOk := topologyInfo.DiskInfos[""] |
|
|
|
hddDiskInfo, hddDiskInfoOk := topologyInfo.DiskInfos["hdd"] |
|
|
|
hddDiskInfo, hddDiskInfoOk := topologyInfo.DiskInfos[types.HddType] |
|
|
|
|
|
|
|
if !genericDiskInfoOk && !hddDiskInfoOk { |
|
|
|
return fmt.Errorf("filer metadata logs need generic or hdd disk type to be defined") |
|
|
|
|
|
@ -265,7 +265,7 @@ func TestBalance(t *testing.T) { |
|
|
|
func TestVolumeSelection(t *testing.T) { |
|
|
|
topologyInfo := parseOutput(topoData) |
|
|
|
|
|
|
|
vids, err := collectVolumeIdsForTierChange(topologyInfo, 1000, types.ToDiskType("hdd"), "", 20.0, 0) |
|
|
|
vids, err := collectVolumeIdsForTierChange(topologyInfo, 1000, types.ToDiskType(types.HddType), "", 20.0, 0) |
|
|
|
if err != nil { |
|
|
|
t.Errorf("collectVolumeIdsForTierChange: %v", err) |
|
|
|
} |
|
|
|
|
|
@ -6,6 +6,7 @@ import ( |
|
|
|
"fmt" |
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb" |
|
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding" |
|
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/types" |
|
|
|
"golang.org/x/exp/slices" |
|
|
|
"path/filepath" |
|
|
|
"strings" |
|
|
@ -72,7 +73,7 @@ func diskInfosToString(diskInfos map[string]*master_pb.DiskInfo) string { |
|
|
|
var buf bytes.Buffer |
|
|
|
for diskType, diskInfo := range diskInfos { |
|
|
|
if diskType == "" { |
|
|
|
diskType = "hdd" |
|
|
|
diskType = types.HddType |
|
|
|
} |
|
|
|
fmt.Fprintf(&buf, " %s(volume:%d/%d active:%d free:%d remote:%d)", diskType, diskInfo.VolumeCount, diskInfo.MaxVolumeCount, diskInfo.ActiveVolumeCount, diskInfo.FreeVolumeCount, diskInfo.RemoteVolumeCount) |
|
|
|
} |
|
|
@ -162,7 +163,7 @@ func (c *commandVolumeList) writeDiskInfo(writer io.Writer, t *master_pb.DiskInf |
|
|
|
var s statistics |
|
|
|
diskType := t.Type |
|
|
|
if diskType == "" { |
|
|
|
diskType = "hdd" |
|
|
|
diskType = types.HddType |
|
|
|
} |
|
|
|
output(verbosityLevel >= 4, writer, " Disk %s(%s)\n", diskType, diskInfoToString(t)) |
|
|
|
slices.SortFunc(t.VolumeInfos, func(a, b *master_pb.VolumeInformationMessage) int { |
|
|
|
|
|
@ -1,6 +1,7 @@ |
|
|
|
package storage |
|
|
|
|
|
|
|
import ( |
|
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/types" |
|
|
|
"testing" |
|
|
|
"time" |
|
|
|
|
|
|
@ -40,7 +41,7 @@ func TestUnUsedSpace(t *testing.T) { |
|
|
|
Directory: "/test/", |
|
|
|
DirectoryUuid: "1234", |
|
|
|
IdxDirectory: "/test/", |
|
|
|
DiskType: "hdd", |
|
|
|
DiskType: types.HddType, |
|
|
|
MaxVolumeCount: 0, |
|
|
|
OriginalMaxVolumeCount: 0, |
|
|
|
MinFreeSpace: minFreeSpace, |
|
|
|
|
|
@ -8,6 +8,7 @@ type DiskType string |
|
|
|
|
|
|
|
const ( |
|
|
|
HardDriveType DiskType = "" |
|
|
|
HddType = "hdd" |
|
|
|
SsdType = "ssd" |
|
|
|
) |
|
|
|
|
|
|
@ -15,7 +16,7 @@ func ToDiskType(vt string) (diskType DiskType) { |
|
|
|
vt = strings.ToLower(vt) |
|
|
|
diskType = HardDriveType |
|
|
|
switch vt { |
|
|
|
case "", "hdd": |
|
|
|
case "", HddType: |
|
|
|
diskType = HardDriveType |
|
|
|
case "ssd": |
|
|
|
diskType = SsdType |
|
|
@ -34,7 +35,7 @@ func (diskType DiskType) String() string { |
|
|
|
|
|
|
|
func (diskType DiskType) ReadableString() string { |
|
|
|
if diskType == "" { |
|
|
|
return "hdd" |
|
|
|
return HddType |
|
|
|
} |
|
|
|
return string(diskType) |
|
|
|
} |