diff options
Diffstat (limited to 'weed')
| -rw-r--r-- | weed/server/volume_server_handlers_admin.go | 4 | ||||
| -rw-r--r-- | weed/server/volume_server_handlers_ui.go | 2 | ||||
| -rw-r--r-- | weed/server/volume_server_ui/templates.go | 4 | ||||
| -rw-r--r-- | weed/storage/disk_location.go | 7 | ||||
| -rw-r--r-- | weed/storage/store.go | 1 | ||||
| -rw-r--r-- | weed/storage/volume_disk_type.go | 7 |
6 files changed, 14 insertions, 11 deletions
diff --git a/weed/server/volume_server_handlers_admin.go b/weed/server/volume_server_handlers_admin.go index 29bd70d71..7e6c06871 100644 --- a/weed/server/volume_server_handlers_admin.go +++ b/weed/server/volume_server_handlers_admin.go @@ -17,7 +17,7 @@ func (vs *VolumeServer) statusHandler(w http.ResponseWriter, r *http.Request) { for _, loc := range vs.store.Locations { if dir, e := filepath.Abs(loc.Directory); e == nil { newDiskStatus := stats.NewDiskStatus(dir) - newDiskStatus.DiskType = loc.GetDiskType() + newDiskStatus.DiskType = loc.DiskType.String() ds = append(ds, newDiskStatus) } } @@ -34,7 +34,7 @@ func (vs *VolumeServer) statsDiskHandler(w http.ResponseWriter, r *http.Request) for _, loc := range vs.store.Locations { if dir, e := filepath.Abs(loc.Directory); e == nil { newDiskStatus := stats.NewDiskStatus(dir) - newDiskStatus.DiskType = loc.GetDiskType() + newDiskStatus.DiskType = loc.DiskType.String() ds = append(ds, newDiskStatus) } } diff --git a/weed/server/volume_server_handlers_ui.go b/weed/server/volume_server_handlers_ui.go index 95c7549d2..437e5c45d 100644 --- a/weed/server/volume_server_handlers_ui.go +++ b/weed/server/volume_server_handlers_ui.go @@ -20,7 +20,7 @@ func (vs *VolumeServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) for _, loc := range vs.store.Locations { if dir, e := filepath.Abs(loc.Directory); e == nil { newDiskStatus := stats.NewDiskStatus(dir) - newDiskStatus.DiskType = loc.GetDiskType() + newDiskStatus.DiskType = loc.DiskType.String() ds = append(ds, newDiskStatus) } } diff --git a/weed/server/volume_server_ui/templates.go b/weed/server/volume_server_ui/templates.go index 2a93c3441..6a8bb6f55 100644 --- a/weed/server/volume_server_ui/templates.go +++ b/weed/server/volume_server_ui/templates.go @@ -69,7 +69,7 @@ var StatusTpl = template.Must(template.New("status").Funcs(funcMap).Parse(`<!DOC <thead> <tr> <th>Path</th> - <th>Type</th> + <th>Disk</th> <th>Total</th> <th>Free</th> <th>Usage</th> @@ -129,6 +129,7 @@ var StatusTpl = template.Must(template.New("status").Funcs(funcMap).Parse(`<!DOC <tr> <th>Id</th> <th>Collection</th> + <th>Disk</th> <th>Data Size</th> <th>Files</th> <th>Trash</th> @@ -141,6 +142,7 @@ var StatusTpl = template.Must(template.New("status").Funcs(funcMap).Parse(`<!DOC <tr> <td><code>{{ .Id }}</code></td> <td>{{ .Collection }}</td> + <td>{{ .DiskType }}</td> <td>{{ bytesToHumanReadable .Size }}</td> <td>{{ .FileCount }}</td> <td>{{ .DeleteCount }} / {{bytesToHumanReadable .DeletedByteCount}}</td> diff --git a/weed/storage/disk_location.go b/weed/storage/disk_location.go index a7be3a559..7292c23f6 100644 --- a/weed/storage/disk_location.go +++ b/weed/storage/disk_location.go @@ -373,10 +373,3 @@ func (l *DiskLocation) CheckDiskSpace() { } } - -func (l *DiskLocation) GetDiskType() string { - if l.DiskType == SsdType { - return "SSD" - } - return "HDD" -} diff --git a/weed/storage/store.go b/weed/storage/store.go index 482e8998c..4bb05649c 100644 --- a/weed/storage/store.go +++ b/weed/storage/store.go @@ -173,6 +173,7 @@ func collectStatForOneVolume(vid needle.VolumeId, v *Volume) (s *VolumeInfo) { ReadOnly: v.IsReadOnly(), Ttl: v.Ttl, CompactRevision: uint32(v.CompactionRevision), + DiskType: v.DiskType().String(), } s.RemoteStorageName, s.RemoteStorageKey = v.RemoteStorageNameKey() diff --git a/weed/storage/volume_disk_type.go b/weed/storage/volume_disk_type.go index e97002120..4d14ada63 100644 --- a/weed/storage/volume_disk_type.go +++ b/weed/storage/volume_disk_type.go @@ -24,3 +24,10 @@ func ToDiskType(vt string) (diskType DiskType) { } return } + +func (diskType DiskType) String() string{ + if diskType == "" { + return "hdd" + } + return string(diskType) +} |