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

Merge pull request 'fix clusterResouces bugs' (#216) from tzwang/pcm-coordinator:master into master 

Former-commit-id: 39e79e58349ec553dfe286fd5d9f5360e02ef627
This commit is contained in:
tzwang 2024-06-06 19:13:00 +08:00
parent 83f8865dd2 ccbf2a00f1
commit 4d97270321
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
}
} else {
if stat.CpuCoreTotal == 0 || stat.MemTotal == 0 || stat.DiskTotal == 0 {
wg.Done()
return
}
clusterResource.CardTotal = cardTotal
clusterResource.CardTopsTotal = topsTotal
clusterResource.CpuAvail = float64(stat.CpuCoreAvail)

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

@ -44,7 +44,7 @@ func AddCronGroup(svc *svc.ServiceContext) {
UpdateAiAdapterMaps(svc)
})
svc.Cron.AddFunc("30 21 * * *", func() {
svc.Cron.AddFunc("@every 7h30m", func() {
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
}
} else {
if stat.CpuCoreTotal == 0 || stat.MemTotal == 0 || stat.DiskTotal == 0 {
wg.Done()
return
}
clusterResource.CardTotal = cardTotal
clusterResource.CardTopsTotal = topsTotal
clusterResource.CpuAvail = float64(stat.CpuCoreAvail)

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

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