diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-02-16 03:03:00 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-02-16 03:03:00 -0800 |
| commit | 3fe628f04e2aa3ac550c670c27d00fcc3fc2e12b (patch) | |
| tree | 98c2c6e2355c237dcc1e383673f83a555f13ab27 /weed/topology/disk.go | |
| parent | f8446b42abd7f3c6c0a298dbbb8641e466891561 (diff) | |
| download | seaweedfs-3fe628f04e2aa3ac550c670c27d00fcc3fc2e12b.tar.xz seaweedfs-3fe628f04e2aa3ac550c670c27d00fcc3fc2e12b.zip | |
use hdd instead of empty string
Diffstat (limited to 'weed/topology/disk.go')
| -rw-r--r-- | weed/topology/disk.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/weed/topology/disk.go b/weed/topology/disk.go index b13ff3fbf..831528949 100644 --- a/weed/topology/disk.go +++ b/weed/topology/disk.go @@ -63,7 +63,7 @@ func (d *DiskUsages) ToMap() interface{} { defer d.RUnlock() ret := make(map[string]interface{}) for diskType, diskUsage := range d.usages { - ret[types.DiskType(diskType).String()] = diskUsage.ToMap() + ret[diskType.String()] = diskUsage.ToMap() } return ret } @@ -156,7 +156,7 @@ func (d *Disk) AddOrUpdateVolume(v storage.VolumeInfo) (isNew, isChangedRO bool) func (d *Disk) doAddOrUpdateVolume(v storage.VolumeInfo) (isNew, isChangedRO bool) { deltaDiskUsages := newDiskUsages() - deltaDiskUsage := deltaDiskUsages.getOrCreateDisk(types.DiskType(v.DiskType)) + deltaDiskUsage := deltaDiskUsages.getOrCreateDisk(types.ToDiskType(v.DiskType)) if oldV, ok := d.volumes[v.Id]; !ok { d.volumes[v.Id] = v deltaDiskUsage.volumeCount = 1 @@ -228,7 +228,7 @@ func (d *Disk) GetTopology() *Topology { func (d *Disk) ToMap() interface{} { ret := make(map[string]interface{}) - diskUsage := d.diskUsages.getOrCreateDisk(types.DiskType(d.Id())) + diskUsage := d.diskUsages.getOrCreateDisk(types.ToDiskType(string(d.Id()))) ret["Volumes"] = diskUsage.volumeCount ret["VolumeIds"] = d.GetVolumeIds() ret["EcShards"] = diskUsage.ecShardCount @@ -238,12 +238,12 @@ func (d *Disk) ToMap() interface{} { } func (d *Disk) FreeSpace() int64 { - t := d.diskUsages.getOrCreateDisk(types.DiskType(d.Id())) + t := d.diskUsages.getOrCreateDisk(types.ToDiskType(string(d.Id()))) return t.FreeSpace() } func (d *Disk) ToDiskInfo() *master_pb.DiskInfo { - diskUsage := d.diskUsages.getOrCreateDisk(types.DiskType(d.Id())) + diskUsage := d.diskUsages.getOrCreateDisk(types.ToDiskType(string(d.Id()))) m := &master_pb.DiskInfo{ Type: string(d.Id()), VolumeCount: uint64(diskUsage.volumeCount), |