support customizable disk type

docker/compose/local-cluster-compose.yml

@@ -24,7 +24,7 @@ services:
     ports:
       - 8080:8080
       - 18080:18080
-    command: 'volume -mserver="master0:9333,master1:9334,master2:9335" -port=8080 -ip=volume1 -publicUrl=localhost:8080'
+    command: 'volume -mserver="master0:9333,master1:9334,master2:9335" -port=8080 -ip=volume1 -publicUrl=localhost:8080 -preStopSeconds=1 -disk=ssd1'
     depends_on:
       - master0
       - master1
@@ -34,7 +34,7 @@ services:
     ports:
       - 8082:8082
       - 18082:18082
-    command: 'volume -mserver="master0:9333,master1:9334,master2:9335" -port=8082 -ip=volume2 -publicUrl=localhost:8082'
+    command: 'volume -mserver="master0:9333,master1:9334,master2:9335" -port=8082 -ip=volume2 -publicUrl=localhost:8082 -preStopSeconds=1 -disk=ssd1'
     depends_on:
       - master0
       - master1
@@ -44,7 +44,7 @@ services:
     ports:
       - 8083:8083
       - 18083:18083
-    command: 'volume -mserver="master0:9333,master1:9334,master2:9335" -port=8083 -ip=volume3 -publicUrl=localhost:8083'
+    command: 'volume -mserver="master0:9333,master1:9334,master2:9335" -port=8083 -ip=volume3 -publicUrl=localhost:8083 -preStopSeconds=1'
     depends_on:
       - master0
       - master1

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)
 		}
 	}

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)
 		}
 	}

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>

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"
-}

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()
 

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)
+}