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

调度结构修改5 

Former-commit-id: 89372339e77858bc2b6c5443520402611f0c9bb2
This commit is contained in:
tzwang 2023-08-24 17:08:19 +08:00
parent b87abd2a62
commit 47d0ae257b
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/internal/algo/provider.go
View File

@ -3,7 +3,7 @@ package algo
import "math"
type Provider struct {
Pid int
Pid int64
CpuSum float64
MemSum float64
DiskSum float64
@ -23,7 +23,7 @@ type Provider struct {
ProfitPerTask map[int]float64
}
func NewProvider(Pid int, CpuSum float64, MemSum float64, DiskSum float64, CpuCost float64, MemCost float64, DiskCost float64) *Provider {
func NewProvider(Pid int64, CpuSum float64, MemSum float64, DiskSum float64, CpuCost float64, MemCost float64, DiskCost float64) *Provider {
return &Provider{
Pid: Pid,
CpuSum: CpuSum,

12
api/internal/pkg/scheduler/scheduler.go
View File

@ -48,6 +48,12 @@ func (s *scheduler) MatchLabels(dbEngin *gorm.DB) {
}
func (s *scheduler) AssignAndSchedule() error {
// 已指定 ParticipantId
if s.task.ParticipantId != 0 {
return nil
}
//生成算法所需参数
task, providerList := s.genTaskAndProviders()
strategy, err := s.scheduleService.pickOptimalStrategy(task, providerList...)
@ -57,6 +63,7 @@ func (s *scheduler) AssignAndSchedule() error {
if strategy == nil {
s.task.ParticipantId = s.participantIds[0]
return nil
}
return nil
@ -79,5 +86,10 @@ func (s *scheduler) SaveToDb(dbEngin *gorm.DB) error {
}
func (s *scheduler) genTaskAndProviders() (*algo.Task, []*algo.Provider) {
//var providerList []*algo.Provider
//for _, id := range s.participantIds {
// provider := algo.NewProvider(id, 100, 200, 200, 0.0, 0.0, 0.0)
//
//}
return nil, nil
}