From ff1392f7f4a854d17dea13f6738a219d7bb2cf96 Mon Sep 17 00:00:00 2001
From: Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com>
Date: Tue, 10 Dec 2024 18:43:59 +0200
Subject: [PATCH] [shell] use constant for hdd of type (#6337)

use constant for hdd of type
---
 weed/shell/command_cluster_check.go       | 3 ++-
 weed/shell/command_volume_balance_test.go | 2 +-
 weed/shell/command_volume_list.go         | 5 +++--
 weed/storage/disk_location_test.go        | 3 ++-
 weed/storage/types/volume_disk_type.go    | 5 +++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/weed/shell/command_cluster_check.go b/weed/shell/command_cluster_check.go
index 27a4f2bb3..57b30e008 100644
--- a/weed/shell/command_cluster_check.go
+++ b/weed/shell/command_cluster_check.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")
diff --git a/weed/shell/command_volume_balance_test.go b/weed/shell/command_volume_balance_test.go
index f1a0c4450..6c4b2a818 100644
--- a/weed/shell/command_volume_balance_test.go
+++ b/weed/shell/command_volume_balance_test.go
@@ -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)
 	}
diff --git a/weed/shell/command_volume_list.go b/weed/shell/command_volume_list.go
index fe7d5f732..74655df12 100644
--- a/weed/shell/command_volume_list.go
+++ b/weed/shell/command_volume_list.go
@@ -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 {
diff --git a/weed/storage/disk_location_test.go b/weed/storage/disk_location_test.go
index d105a477f..d2823588f 100644
--- a/weed/storage/disk_location_test.go
+++ b/weed/storage/disk_location_test.go
@@ -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,
diff --git a/weed/storage/types/volume_disk_type.go b/weed/storage/types/volume_disk_type.go
index c9b87d802..04c519070 100644
--- a/weed/storage/types/volume_disk_type.go
+++ b/weed/storage/types/volume_disk_type.go
@@ -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)
 }