mirror/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2024-11-27 12:39:01 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix: 概览页磁盘信息获取增加锁 (#3100)

Browse Source
This commit is contained in:
ssongliu 2023-11-29 15:34:07 +08:00 committed by wanghe-fit2cloud
parent 71869b7264
commit 67ce559b12
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/app/service/dashboard.go
View File

@ -209,7 +209,10 @@ func loadDiskInfo() []dto.DiskInfo {
mounts = append(mounts, diskInfo{Type: fields[1], Device: fields[0], Mount: fields[6]}) mounts = append(mounts, diskInfo{Type: fields[1], Device: fields[0], Mount: fields[6]})
} }
var wg sync.WaitGroup var (
wg sync.WaitGroup
mu sync.Mutex
)
wg.Add(len(mounts)) wg.Add(len(mounts))
for i := 0; i < len(mounts); i++ { for i := 0; i < len(mounts); i++ {
go func(timeoutCh <-chan time.Time, mount diskInfo) { go func(timeoutCh <-chan time.Time, mount diskInfo) {
@ -221,11 +224,17 @@ func loadDiskInfo() []dto.DiskInfo {
itemData.Device = mount.Device itemData.Device = mount.Device
select { select {
case <-timeoutCh: case <-timeoutCh:
mu.Lock()
datas = append(datas, itemData) datas = append(datas, itemData)
mu.Unlock()
global.LOG.Errorf("load disk info from %s failed, err: timeout", mount.Mount) global.LOG.Errorf("load disk info from %s failed, err: timeout", mount.Mount)
default: default:
state, err := disk.Usage(mount.Mount) state, err := disk.Usage(mount.Mount)
if err != nil { if err != nil {
mu.Lock()
datas = append(datas, itemData)
mu.Unlock()
global.LOG.Errorf("load disk info from %s failed, err: %v", mount.Mount, err)
return return
} }
itemData.Total = state.Total itemData.Total = state.Total
@ -236,7 +245,9 @@ func loadDiskInfo() []dto.DiskInfo {
itemData.InodesUsed = state.InodesUsed itemData.InodesUsed = state.InodesUsed
itemData.InodesFree = state.InodesFree itemData.InodesFree = state.InodesFree
itemData.InodesUsedPercent = state.InodesUsedPercent itemData.InodesUsedPercent = state.InodesUsedPercent
mu.Lock()
datas = append(datas, itemData) datas = append(datas, itemData)
mu.Unlock()
} }
}(time.After(5*time.Second), mounts[i]) }(time.After(5*time.Second), mounts[i])
} }