Mirror
/
seaweedfs
mirror of https://github.com/seaweedfs/seaweedfs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

add Volumes ID column in the master ui

pull/1330/head
bingoohuang 6 years ago
parent
1c7f9b393b
commit
8282b5a8f5
3 changed files with 64 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      weed/server/master_ui/templates.go
  2. 48
      weed/topology/data_node.go
  3. 14
      weed/topology/data_node_test.go

2
weed/server/master_ui/templates.go
View File

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

48
weed/topology/data_node.go
View File

@ -2,6 +2,7 @@ package topology
import ( import (
"fmt" "fmt"
"sort"
"strconv" "strconv"
"sync" "sync"
@ -166,6 +167,7 @@ func (dn *DataNode) ToMap() interface{} {
ret := make(map[string]interface{}) ret := make(map[string]interface{})
ret["Url"] = dn.Url() ret["Url"] = dn.Url()
ret["Volumes"] = dn.GetVolumeCount() ret["Volumes"] = dn.GetVolumeCount()
ret["VolumesID"] = dn.GetVolumesID()
ret["EcShards"] = dn.GetEcShardCount() ret["EcShards"] = dn.GetEcShardCount()
ret["Max"] = dn.GetMaxVolumeCount() ret["Max"] = dn.GetMaxVolumeCount()
ret["Free"] = dn.FreeSpace() ret["Free"] = dn.FreeSpace()
@ -173,6 +175,52 @@ func (dn *DataNode) ToMap() interface{} {
return ret return ret
} }
func (dn *DataNode) GetVolumesID() string {
ids := make([]int, 0, len(dn.volumes))
for k := range dn.volumes {
ids = append(ids, int(k))
}
return JoinInts(ids...)
}
func JoinInts(ids ...int) string {
sort.Ints(ids)
s := ""
start := 0
last := 0
for i, v := range ids {
if i == 0 {
start = v
last = v
s = fmt.Sprintf("%d", v)
continue
}
if last+1 == v {
last = v
continue
}
if last > start {
s += fmt.Sprintf("-%d", last)
}
s += fmt.Sprintf(" %d", v)
start = v
last = v
}
if last != start {
s += fmt.Sprintf("-%d", last)
}
return s
}
func (dn *DataNode) ToDataNodeInfo() *master_pb.DataNodeInfo { func (dn *DataNode) ToDataNodeInfo() *master_pb.DataNodeInfo {
m := &master_pb.DataNodeInfo{ m := &master_pb.DataNodeInfo{
Id: string(dn.Id()), Id: string(dn.Id()),

14
weed/topology/data_node_test.go
View File

@ -0,0 +1,14 @@
package topology
import (
assert2 "github.com/stretchr/testify/assert"
"testing"
)
func TestJoinInts(t *testing.T) {
assert2.Equal(t, "1-3", JoinInts(1, 2, 3))
assert2.Equal(t, "1 3", JoinInts(1, 3))
assert2.Equal(t, "1 3 5", JoinInts(5, 1, 3))
assert2.Equal(t, "1-3 5", JoinInts(1, 2, 3, 5))
assert2.Equal(t, "1-3 5 7-9", JoinInts(7, 9, 8, 1, 2, 3, 5))
}
Write Preview
Loading…
Cancel
Save