Browse Source

rename VolumesID to VolumeIds

pull/1330/head
bingoo 6 years ago
parent
commit
9c71e9f2b7
  1. 4
      weed/server/master_ui/templates.go
  2. 4
      weed/topology/data_node.go

4
weed/server/master_ui/templates.go

@ -76,7 +76,7 @@ var StatusTpl = template.Must(template.New("status").Parse(`<!DOCTYPE html>
<th>Rack</th>
<th>RemoteAddr</th>
<th>#Volumes</th>
<th>Volumes ID</th>
<th>Volume Ids</th>
<th>#ErasureCodingShards</th>
<th>Max</th>
</tr>
@ -90,7 +90,7 @@ var StatusTpl = template.Must(template.New("status").Parse(`<!DOCTYPE html>
<td>{{ $rack.Id }}</td>
<td><a href="http://{{ $dn.Url }}/ui/index.html">{{ $dn.Url }}</a></td>
<td>{{ $dn.Volumes }}</td>
<td>{{ $dn.VolumesID}}</td>
<td>{{ $dn.VolumeIds}}</td>
<td>{{ $dn.EcShards }}</td>
<td>{{ $dn.Max }}</td>
</tr>

4
weed/topology/data_node.go

@ -167,7 +167,7 @@ func (dn *DataNode) ToMap() interface{} {
ret := make(map[string]interface{})
ret["Url"] = dn.Url()
ret["Volumes"] = dn.GetVolumeCount()
ret["VolumesID"] = dn.GetVolumesID()
ret["VolumeIds"] = dn.GetVolumeIds()
ret["EcShards"] = dn.GetEcShardCount()
ret["Max"] = dn.GetMaxVolumeCount()
ret["Free"] = dn.FreeSpace()
@ -175,7 +175,7 @@ func (dn *DataNode) ToMap() interface{} {
return ret
}
func (dn *DataNode) GetVolumesID() string {
func (dn *DataNode) GetVolumeIds() string {
volumesLen := len(dn.volumes)
if volumesLen <= 100 {
return "..."

Loading…
Cancel
Save