From 08988c7db6570c35e0701ebea15237a7aa9d0394 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Wed, 29 Nov 2023 14:38:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A6=82=E8=A7=88=E9=A1=B5=E7=A3=81?=
 =?UTF-8?q?=E7=9B=98=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96=20(#3096)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/dashboard.go | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/backend/app/service/dashboard.go b/backend/app/service/dashboard.go
index d81761fc1..3025b67de 100644
--- a/backend/app/service/dashboard.go
+++ b/backend/app/service/dashboard.go
@@ -1,9 +1,9 @@
 package service
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
+	"sort"
 	"strings"
 	"sync"
 	"time"
@@ -215,26 +215,25 @@ func loadDiskInfo() []dto.DiskInfo {
 		mounts = append(mounts, diskInfo{Type: fields[1], Device: fields[0], Mount: fields[6]})
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
-	defer cancel()
 	var wg sync.WaitGroup
 	wg.Add(len(mounts))
 	for i := 0; i < len(mounts); i++ {
-		go func(index int) {
+		go func(timeoutCh <-chan time.Time, mount diskInfo) {
 			defer wg.Done()
+
+			var itemData dto.DiskInfo
+			itemData.Path = mount.Mount
+			itemData.Type = mount.Type
+			itemData.Device = mount.Device
 			select {
-			case <-ctx.Done():
-				global.LOG.Errorf("load disk info from %s failed, err: timeout", mounts[index].Mount)
-				return
+			case <-timeoutCh:
+				datas = append(datas, itemData)
+				global.LOG.Errorf("load disk info from %s failed, err: timeout", mount.Mount)
 			default:
-				state, err := disk.Usage(mounts[index].Mount)
+				state, err := disk.Usage(mount.Mount)
 				if err != nil {
 					return
 				}
-				var itemData dto.DiskInfo
-				itemData.Path = mounts[index].Mount
-				itemData.Type = mounts[index].Type
-				itemData.Device = mounts[index].Device
 				itemData.Total = state.Total
 				itemData.Free = state.Free
 				itemData.Used = state.Used
@@ -245,8 +244,12 @@ func loadDiskInfo() []dto.DiskInfo {
 				itemData.InodesUsedPercent = state.InodesUsedPercent
 				datas = append(datas, itemData)
 			}
-		}(i)
+		}(time.After(5*time.Second), mounts[i])
 	}
 	wg.Wait()
+
+	sort.Slice(datas, func(i, j int) bool {
+		return datas[i].Path < datas[j].Path
+	})
 	return datas
 }