Deprecate showing drive capacity and total free (#5976)

This addresses a situation that we shouldn't be
displaying Total/Free anymore, instead we should simply
show the total usage.

cmd/admin-handlers_test.go

@@ -929,9 +929,6 @@ func TestAdminServerInfo(t *testing.T) {
 		if serverInfo.Error != "" {
 			t.Errorf("Unexpected error = %v\n", serverInfo.Error)
 		}
-		if serverInfo.Data.StorageInfo.Free == 0 {
-			t.Error("Expected StorageInfo.Free to be non empty")
-		}
 		if serverInfo.Data.Properties.Region != globalMinioDefaultRegion {
 			t.Errorf("Expected %s, got %s", globalMinioDefaultRegion, serverInfo.Data.Properties.Region)
 		}

cmd/fs-v1.go

@@ -176,35 +176,39 @@ func (fs *FSObjects) diskUsage(doneCh chan struct{}) {
 	ticker := time.NewTicker(fs.usageCheckInterval)
 	defer ticker.Stop()
 
-	var usage uint64
 	usageFn := func(ctx context.Context, entry string) error {
+		var fi os.FileInfo
+		var err error
 		if hasSuffix(entry, slashSeparator) {
-			return nil
+			fi, err = fsStatDir(ctx, entry)
+		} else {
+			fi, err = fsStatFile(ctx, entry)
 		}
-		fi, err := fsStatFile(ctx, entry)
 		if err != nil {
 			return err
 		}
-		usage = usage + uint64(fi.Size())
+		atomic.AddUint64(&fs.totalUsed, uint64(fi.Size()))
 		return nil
 	}
 
 	if err := getDiskUsage(context.Background(), fs.fsPath, usageFn); err != nil {
 		return
 	}
-	atomic.StoreUint64(&fs.totalUsed, usage)
 
 	for {
 		select {
 		case <-doneCh:
 			return
 		case <-ticker.C:
-			usage = 0
+			var usage uint64
 			usageFn = func(ctx context.Context, entry string) error {
+				var fi os.FileInfo
+				var err error
 				if hasSuffix(entry, slashSeparator) {
-					return nil
+					fi, err = fsStatDir(ctx, entry)
+				} else {
+					fi, err = fsStatFile(ctx, entry)
 				}
-				fi, err := fsStatFile(ctx, entry)
 				if err != nil {
 					return err
 				}
@@ -221,14 +225,8 @@ func (fs *FSObjects) diskUsage(doneCh chan struct{}) {
 
 // StorageInfo - returns underlying storage statistics.
 func (fs *FSObjects) StorageInfo(ctx context.Context) StorageInfo {
-	info, err := getDiskInfo(fs.fsPath)
-	logger.GetReqInfo(ctx).AppendTags("path", fs.fsPath)
-	logger.LogIf(ctx, err)
-
 	storageInfo := StorageInfo{
-		Total: info.Total,
-		Free:  info.Free,
-		Used:  atomic.LoadUint64(&fs.totalUsed),
+		Used: atomic.LoadUint64(&fs.totalUsed),
 	}
 	storageInfo.Backend.Type = FS
 	return storageInfo

cmd/posix.go

@@ -319,20 +319,16 @@ func (s *posix) diskUsage() {
 	ticker := time.NewTicker(s.usageCheckInterval)
 	defer ticker.Stop()
 
-	var usage uint64
 	usageFn := func(ctx context.Context, entry string) error {
 		select {
 		case <-s.stopUsageCh:
 			return errWalkAbort
 		default:
-			if hasSuffix(entry, slashSeparator) {
-				return nil
-			}
 			fi, err := os.Stat(entry)
 			if err != nil {
 				return err
 			}
-			usage = usage + uint64(fi.Size())
+			atomic.AddUint64(&s.totalUsage, uint64(fi.Size()))
 			return nil
 		}
 	}
@@ -340,7 +336,6 @@ func (s *posix) diskUsage() {
 	if err := getDiskUsage(context.Background(), s.diskPath, usageFn); err != nil {
 		return
 	}
-	atomic.StoreUint64(&s.totalUsage, usage)
 
 	for {
 		select {
@@ -349,15 +344,12 @@ func (s *posix) diskUsage() {
 		case <-globalServiceDoneCh:
 			return
 		case <-ticker.C:
-			usage = 0
+			var usage uint64
 			usageFn = func(ctx context.Context, entry string) error {
 				select {
 				case <-s.stopUsageCh:
 					return errWalkAbort
 				default:
-					if hasSuffix(entry, slashSeparator) {
-						return nil
-					}
 					fi, err := os.Stat(entry)
 					if err != nil {
 						return err

cmd/server-startup-msg.go

@@ -173,19 +173,19 @@ func printObjectAPIMsg() {
 
 // Get formatted disk/storage info message.
 func getStorageInfoMsg(storageInfo StorageInfo) string {
-	msg := fmt.Sprintf("%s %s Free, %s Total", colorBlue("Drive Capacity:"),
-		humanize.IBytes(uint64(storageInfo.Free)),
-		humanize.IBytes(uint64(storageInfo.Total)))
+	var msg string
 	if storageInfo.Backend.Type == Erasure {
 		diskInfo := fmt.Sprintf(" %d Online, %d Offline. ", storageInfo.Backend.OnlineDisks, storageInfo.Backend.OfflineDisks)
-		msg += colorBlue("\nStatus:") + fmt.Sprintf(getFormatStr(len(diskInfo), 8), diskInfo)
+		msg += colorBlue("Status:") + fmt.Sprintf(getFormatStr(len(diskInfo), 8), diskInfo)
 	}
 	return msg
 }
 
 // Prints startup message of storage capacity and erasure information.
 func printStorageInfo(storageInfo StorageInfo) {
-	logger.StartupMessage(getStorageInfoMsg(storageInfo) + "\n")
+	if msg := getStorageInfoMsg(storageInfo); msg != "" {
+		logger.StartupMessage(msg)
+	}
 }
 
 func printCacheStorageInfo(storageInfo StorageInfo) {

cmd/server-startup-msg_test.go

@@ -25,20 +25,16 @@ import (
 	"strings"
 	"testing"
 	"time"
-
-	humanize "github.com/dustin/go-humanize"
 )
 
 // Tests if we generate storage info.
 func TestStorageInfoMsg(t *testing.T) {
 	infoStorage := StorageInfo{}
-	infoStorage.Total = 10 * humanize.GiByte
-	infoStorage.Free = 2 * humanize.GiByte
 	infoStorage.Backend.Type = Erasure
 	infoStorage.Backend.OnlineDisks = 7
 	infoStorage.Backend.OfflineDisks = 1
 
-	if msg := getStorageInfoMsg(infoStorage); !strings.Contains(msg, "2.0 GiB Free, 10 GiB Total") || !strings.Contains(msg, "7 Online, 1 Offline") {
+	if msg := getStorageInfoMsg(infoStorage); !strings.Contains(msg, "7 Online, 1 Offline") {
 		t.Fatal("Unexpected storage info message, found:", msg)
 	}
 }

cmd/web-handlers_test.go

@@ -221,13 +221,9 @@ func testStorageInfoWebHandler(obj ObjectLayer, instanceType string, t TestErrHa
 	if rec.Code != http.StatusOK {
 		t.Fatalf("Expected the response status to be 200, but instead found `%d`", rec.Code)
 	}
-	err = getTestWebRPCResponse(rec, &storageInfoReply)
-	if err != nil {
+	if err = getTestWebRPCResponse(rec, &storageInfoReply); err != nil {
 		t.Fatalf("Failed %v", err)
 	}
-	if storageInfoReply.StorageInfo.Total <= 0 {
-		t.Fatalf("Got a zero or negative total free space disk")
-	}
 }
 
 // Wrapper for calling ServerInfo Web Handler

cmd/xl-sets.go

@@ -280,8 +280,6 @@ func (s *xlSets) StorageInfo(ctx context.Context) StorageInfo {
 	storageInfo.Backend.Type = Erasure
 	for _, set := range s.sets {
 		lstorageInfo := set.StorageInfo(ctx)
-		storageInfo.Total = storageInfo.Total + lstorageInfo.Total
-		storageInfo.Free = storageInfo.Free + lstorageInfo.Free
 		storageInfo.Used = storageInfo.Used + lstorageInfo.Used
 		storageInfo.Backend.OnlineDisks = storageInfo.Backend.OnlineDisks + lstorageInfo.Backend.OnlineDisks
 		storageInfo.Backend.OfflineDisks = storageInfo.Backend.OfflineDisks + lstorageInfo.Backend.OfflineDisks

cmd/xl-sets_test.go

@@ -98,46 +98,6 @@ func TestNewXLSets(t *testing.T) {
 	}
 }
 
-// TestStorageInfoSets - tests storage info for erasure coded sets of disks.
-func TestStorageInfoSets(t *testing.T) {
-	var nDisks = 16 // Maximum disks.
-	var erasureDisks []string
-	for i := 0; i < nDisks; i++ {
-		// Do not attempt to create this path, the test validates
-		// so that newXLSets initializes non existing paths
-		// and successfully returns initialized object layer.
-		disk := filepath.Join(globalTestTmpDir, "minio-"+nextSuffix())
-		erasureDisks = append(erasureDisks, disk)
-		defer os.RemoveAll(disk)
-	}
-
-	endpoints := mustGetNewEndpointList(erasureDisks...)
-	// Initializes all erasure disks
-	format, err := waitForFormatXL(context.Background(), true, endpoints, 1, 16)
-	if err != nil {
-		t.Fatalf("Unable to format disks for erasure, %s", err)
-	}
-
-	objLayer, err := newXLSets(endpoints, format, 1, 16)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Get storage info first attempt.
-	disks16Info := objLayer.StorageInfo(context.Background())
-
-	// This test assumes homogeneity between all disks,
-	// i.e if we loose one disk the effective storage
-	// usage values is assumed to decrease. If we have
-	// heterogenous environment this is not true all the time.
-	if disks16Info.Free <= 0 {
-		t.Fatalf("Diskinfo total free values should be greater 0")
-	}
-	if disks16Info.Total <= 0 {
-		t.Fatalf("Diskinfo total values should be greater 0")
-	}
-}
-
 // TestHashedLayer - tests the hashed layer which will be returned
 // consistently for a given object name.
 func TestHashedLayer(t *testing.T) {

cmd/xl-v1.go

@@ -173,10 +173,7 @@ func getStorageInfo(disks []StorageAPI) StorageInfo {
 	validDisksInfo := sortValidDisksInfo(disksInfo)
 	// If there are no valid disks, set total and free disks to 0
 	if len(validDisksInfo) == 0 {
-		return StorageInfo{
-			Total: 0,
-			Free:  0,
-		}
+		return StorageInfo{}
 	}
 
 	_, sscParity := getRedundancyCount(standardStorageClass, len(disks))
@@ -192,13 +189,7 @@ func getStorageInfo(disks []StorageAPI) StorageInfo {
 		availableDataDisks = uint64(onlineDisks)
 	}
 
-	// Return calculated storage info, choose the lowest Total and
-	// Free as the total aggregated values. Total capacity is always
-	// the multiple of smallest disk among the disk list.
-	storageInfo := StorageInfo{
-		Total: validDisksInfo[0].Total * availableDataDisks,
-		Free:  validDisksInfo[0].Free * availableDataDisks,
-	}
+	storageInfo := StorageInfo{}
 
 	// Combine all disks to get total usage.
 	var used uint64

cmd/xl-v1_test.go

@@ -17,39 +17,10 @@
 package cmd
 
 import (
-	"context"
-	"os"
 	"reflect"
 	"testing"
 )
 
-// TestStorageInfo - tests storage info.
-func TestStorageInfo(t *testing.T) {
-	objLayer, fsDirs, err := prepareXL16()
-	if err != nil {
-		t.Fatalf("Unable to initialize 'XL' object layer.")
-	}
-
-	// Remove all dirs.
-	for _, dir := range fsDirs {
-		defer os.RemoveAll(dir)
-	}
-
-	// Get storage info first attempt.
-	disks16Info := objLayer.StorageInfo(context.Background())
-
-	// This test assumes homogenity between all disks,
-	// i.e if we loose one disk the effective storage
-	// usage values is assumed to decrease. If we have
-	// heterogenous environment this is not true all the time.
-	if disks16Info.Free <= 0 {
-		t.Fatalf("Diskinfo total free values should be greater 0")
-	}
-	if disks16Info.Total <= 0 {
-		t.Fatalf("Diskinfo total values should be greater 0")
-	}
-}
-
 // Sort valid disks info.
 func TestSortingValidDisks(t *testing.T) {
 	testCases := []struct {