Browse Source

Sort VolumeInfos by VolumeId in Store.Status();

Ordered VolumeInfos is more Human-readable,
especially when there is a lot of volumes.
pull/128/head
yanyiwu 10 years ago
parent
commit
b7a18580b8
  1. 5
      go/storage/store.go
  2. 21
      go/storage/volume_info.go

5
go/storage/store.go

@ -223,7 +223,9 @@ func (s *Store) Status() []*VolumeInfo {
var stats []*VolumeInfo
for _, location := range s.Locations {
for k, v := range location.volumes {
s := &VolumeInfo{Id: VolumeId(k), Size: v.ContentSize(),
s := &VolumeInfo{
Id: VolumeId(k),
Size: v.ContentSize(),
Collection: v.Collection,
ReplicaPlacement: v.ReplicaPlacement,
Version: v.Version(),
@ -235,6 +237,7 @@ func (s *Store) Status() []*VolumeInfo {
stats = append(stats, s)
}
}
sortVolumeInfos(stats)
return stats
}

21
go/storage/volume_info.go

@ -3,6 +3,7 @@ package storage
import (
"fmt"
"github.com/chrislusf/seaweedfs/go/operation"
"sort"
)
type VolumeInfo struct {
@ -42,3 +43,23 @@ func (vi VolumeInfo) String() string {
return fmt.Sprintf("Id:%d, Size:%d, ReplicaPlacement:%s, Collection:%s, Version:%v, FileCount:%d, DeleteCount:%d, DeletedByteCount:%d, ReadOnly:%v",
vi.Id, vi.Size, vi.ReplicaPlacement, vi.Collection, vi.Version, vi.FileCount, vi.DeleteCount, vi.DeletedByteCount, vi.ReadOnly)
}
/*VolumesInfo sorting*/
type volumeInfos []*VolumeInfo
func (vis volumeInfos) Len() int {
return len(vis)
}
func (vis volumeInfos) Less(i, j int) bool {
return vis[i].Id < vis[j].Id
}
func (vis volumeInfos) Swap(i, j int) {
vis[i], vis[j] = vis[j], vis[i]
}
func sortVolumeInfos(vis volumeInfos) {
sort.Sort(vis)
}
Loading…
Cancel
Save