use hdd instead of empty string

7 files changed, 21 insertions, 20 deletions

diff --git a/weed/topology/data_node.go b/weed/topology/data_node.go
index 5b625de80..038d87043 100644
--- a/weed/topology/data_node.go
+++ b/weed/topology/data_node.go
@@ -14,10 +14,10 @@ import (
 
 type DataNode struct {
 	NodeImpl
-	Ip           string
-	Port         int
-	PublicUrl    string
-	LastSeen     int64 // unix time in seconds
+	Ip        string
+	Port      int
+	PublicUrl string
+	LastSeen  int64 // unix time in seconds
 }
 
 func NewDataNode(id string) *DataNode {
@@ -80,7 +80,7 @@ func (dn *DataNode) UpdateVolumes(actualVolumes []storage.VolumeInfo) (newVolume
 			deletedVolumes = append(deletedVolumes, v)
 
 			deltaDiskUsages := newDiskUsages()
-			deltaDiskUsage := deltaDiskUsages.getOrCreateDisk(types.DiskType(v.DiskType))
+			deltaDiskUsage := deltaDiskUsages.getOrCreateDisk(types.ToDiskType(v.DiskType))
 			deltaDiskUsage.volumeCount = -1
 			if v.IsRemote() {
 				deltaDiskUsage.remoteVolumeCount = -1
@@ -112,7 +112,7 @@ func (dn *DataNode) DeltaUpdateVolumes(newVolumes, deletedVolumes []storage.Volu
 		delete(disk.volumes, v.Id)
 
 		deltaDiskUsages := newDiskUsages()
-		deltaDiskUsage := deltaDiskUsages.getOrCreateDisk(types.DiskType(v.DiskType))
+		deltaDiskUsage := deltaDiskUsages.getOrCreateDisk(types.ToDiskType(v.DiskType))
 		deltaDiskUsage.volumeCount = -1
 		if v.IsRemote() {
 			deltaDiskUsage.remoteVolumeCount = -1
@@ -194,7 +194,8 @@ func (dn *DataNode) ToMap() interface{} {
 
 func (dn *DataNode) ToDataNodeInfo() *master_pb.DataNodeInfo {
 	m := &master_pb.DataNodeInfo{
-		Id:                string(dn.Id()),
+		Id:        string(dn.Id()),
+		DiskInfos: make(map[string]*master_pb.DiskInfo),
 	}
 	for _, c := range dn.Children() {
 		disk := c.(*Disk)
@@ -224,4 +225,4 @@ func (dn *DataNode) getVolumes() []storage.VolumeInfo {
 		existingVolumes = append(existingVolumes, disk.GetVolumes()...)
 	}
 	return existingVolumes
-}
\ No newline at end of file
+}
diff --git a/weed/topology/data_node_ec.go b/weed/topology/data_node_ec.go
index be6df3b8a..cd4c5cd8b 100644
--- a/weed/topology/data_node_ec.go
+++ b/weed/topology/data_node_ec.go
@@ -31,7 +31,7 @@ func (dn *DataNode) UpdateEcShards(actualShards []*erasure_coding.EcVolumeInfo)
 
 		disk := dn.getOrCreateDisk(ecShards.DiskType)
 		deltaDiskUsages := newDiskUsages()
-		deltaDiskUsage := deltaDiskUsages.getOrCreateDisk(types.DiskType(ecShards.DiskType))
+		deltaDiskUsage := deltaDiskUsages.getOrCreateDisk(types.ToDiskType(ecShards.DiskType))
 
 		vid := ecShards.VolumeId
 		if actualEcShards, ok := actualEcShardMap[vid]; !ok {
@@ -60,7 +60,7 @@ func (dn *DataNode) UpdateEcShards(actualShards []*erasure_coding.EcVolumeInfo)
 
 		disk := dn.getOrCreateDisk(ecShards.DiskType)
 		deltaDiskUsages := newDiskUsages()
-		deltaDiskUsage := deltaDiskUsages.getOrCreateDisk(types.DiskType(ecShards.DiskType))
+		deltaDiskUsage := deltaDiskUsages.getOrCreateDisk(types.ToDiskType(ecShards.DiskType))
 
 		if dn.hasEcShards(ecShards.VolumeId) {
 			newShards = append(newShards, ecShards)
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),
diff --git a/weed/topology/disk_ec.go b/weed/topology/disk_ec.go
index f03f68411..74a06b47f 100644
--- a/weed/topology/disk_ec.go
+++ b/weed/topology/disk_ec.go
@@ -30,7 +30,7 @@ func (d *Disk) AddOrUpdateEcShard(s *erasure_coding.EcVolumeInfo) {
 	}
 
 	deltaDiskUsages := newDiskUsages()
-	deltaDiskUsage := deltaDiskUsages.getOrCreateDisk(types.DiskType(d.Id()))
+	deltaDiskUsage := deltaDiskUsages.getOrCreateDisk(types.ToDiskType(string(d.Id())))
 	deltaDiskUsage.ecShardCount = int64(delta)
 	d.UpAdjustDiskUsageDelta(deltaDiskUsages)
 
@@ -46,7 +46,7 @@ func (d *Disk) DeleteEcShard(s *erasure_coding.EcVolumeInfo) {
 		delta := existing.ShardBits.ShardIdCount() - oldCount
 
 		deltaDiskUsages := newDiskUsages()
-		deltaDiskUsage := deltaDiskUsages.getOrCreateDisk(types.DiskType(d.Id()))
+		deltaDiskUsage := deltaDiskUsages.getOrCreateDisk(types.ToDiskType(string(d.Id())))
 		deltaDiskUsage.ecShardCount = int64(delta)
 		d.UpAdjustDiskUsageDelta(deltaDiskUsages)
 
diff --git a/weed/topology/node.go b/weed/topology/node.go
index 5275af64a..1f5e4194c 100644
--- a/weed/topology/node.go
+++ b/weed/topology/node.go
@@ -193,7 +193,7 @@ func (n *NodeImpl) AdjustMaxVolumeCounts(maxVolumeCounts map[string]uint32) {
 			// the volume server may have set the max to zero
 			continue
 		}
-		dt := types.DiskType(diskType)
+		dt := types.ToDiskType(diskType)
 		deltaDiskUsage := deltaDiskUsages.getOrCreateDisk(dt)
 		currentDiskUsage := n.diskUsages.getOrCreateDisk(dt)
 		deltaDiskUsage.maxVolumeCount = int64(maxVolumeCount) - currentDiskUsage.maxVolumeCount
diff --git a/weed/topology/rack.go b/weed/topology/rack.go
index e75318ffe..95fd260ad 100644
--- a/weed/topology/rack.go
+++ b/weed/topology/rack.go
@@ -46,7 +46,7 @@ func (r *Rack) GetOrCreateDataNode(ip string, port int, publicUrl string, maxVol
 	r.LinkChildNode(dn)
 	for diskType, maxVolumeCount := range maxVolumeCounts {
 		disk := NewDisk(diskType)
-		disk.diskUsages.getOrCreateDisk(types.DiskType(diskType)).maxVolumeCount = int64(maxVolumeCount)
+		disk.diskUsages.getOrCreateDisk(types.ToDiskType(diskType)).maxVolumeCount = int64(maxVolumeCount)
 		dn.LinkChildNode(disk)
 	}
 	return dn
diff --git a/weed/topology/topology_event_handling.go b/weed/topology/topology_event_handling.go
index 1b1d0fe86..543dacf29 100644
--- a/weed/topology/topology_event_handling.go
+++ b/weed/topology/topology_event_handling.go
@@ -52,7 +52,7 @@ func (t *Topology) SetVolumeCapacityFull(volumeInfo storage.VolumeInfo) bool {
 
 			disk := dn.getOrCreateDisk(volumeInfo.DiskType)
 			deltaDiskUsages := newDiskUsages()
-			deltaDiskUsage := deltaDiskUsages.getOrCreateDisk(types.DiskType(volumeInfo.DiskType))
+			deltaDiskUsage := deltaDiskUsages.getOrCreateDisk(types.ToDiskType(volumeInfo.DiskType))
 			deltaDiskUsage.activeVolumeCount = -1
 			disk.UpAdjustDiskUsageDelta(deltaDiskUsages)