floraachy
/
pcm-coordinator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix clusterResouces bugs 

Former-commit-id: 52c5b84d8957dd7f2529ce3dd5416ee7ffd9b07d
This commit is contained in:
tzwang 2024-06-06 19:08:51 +08:00
parent 83f8865dd2
commit ccbf2a00f1
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/internal/cron/aiCronTask.go
View File

@ -382,6 +382,10 @@ func UpdateClusterResource(svc *svc.ServiceContext) {
return return
} }
} else { } else {
if stat.CpuCoreTotal == 0 || stat.MemTotal == 0 || stat.DiskTotal == 0 {
wg.Done()
return
}
clusterResource.CardTotal = cardTotal clusterResource.CardTotal = cardTotal
clusterResource.CardTopsTotal = topsTotal clusterResource.CardTopsTotal = topsTotal
clusterResource.CpuAvail = float64(stat.CpuCoreAvail) clusterResource.CpuAvail = float64(stat.CpuCoreAvail)

2
api/internal/cron/cron.go
View File

@ -44,7 +44,7 @@ func AddCronGroup(svc *svc.ServiceContext) {
UpdateAiAdapterMaps(svc) UpdateAiAdapterMaps(svc)
}) })
svc.Cron.AddFunc("30 21 * * *", func() { svc.Cron.AddFunc("@every 7h30m", func() {
UpdateClusterResource(svc) UpdateClusterResource(svc)
}) })
} }

4
api/internal/logic/ai/getcenteroverviewlogic.go
View File

@ -134,6 +134,10 @@ func (l *GetCenterOverviewLogic) updateClusterResource(mu *sync.RWMutex, ch chan
return return
} }
} else { } else {
if stat.CpuCoreTotal == 0 || stat.MemTotal == 0 || stat.DiskTotal == 0 {
wg.Done()
return
}
clusterResource.CardTotal = cardTotal clusterResource.CardTotal = cardTotal
clusterResource.CardTopsTotal = topsTotal clusterResource.CardTopsTotal = topsTotal
clusterResource.CpuAvail = float64(stat.CpuCoreAvail) clusterResource.CpuAvail = float64(stat.CpuCoreAvail)

3
api/internal/scheduler/database/aiStorage.go
View File

@ -237,10 +237,13 @@ func (s *AiStorage) UpdateClusterResources(clusterResource *models.TClusterResou
ClusterName: clusterResource.ClusterName, ClusterName: clusterResource.ClusterName,
CpuAvail: clusterResource.CpuAvail, CpuAvail: clusterResource.CpuAvail,
CpuTotal: clusterResource.CpuTotal, CpuTotal: clusterResource.CpuTotal,
CpuUtilisation: clusterResource.CpuAvail / clusterResource.CpuTotal,
MemoryAvail: clusterResource.MemAvail, MemoryAvail: clusterResource.MemAvail,
MemoryTotal: clusterResource.MemTotal, MemoryTotal: clusterResource.MemTotal,
MemoryUtilisation: clusterResource.MemAvail / clusterResource.MemTotal,
DiskAvail: clusterResource.DiskAvail, DiskAvail: clusterResource.DiskAvail,
DiskTotal: clusterResource.DiskTotal, DiskTotal: clusterResource.DiskTotal,
DiskUtilisation: clusterResource.DiskAvail / clusterResource.DiskTotal,
} }
tracker.SyncClusterLoad(param) tracker.SyncClusterLoad(param)
return nil return nil