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

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

Former-commit-id: 16ea48f02391521a9c9cccd0d7b1f77809c358a1
This commit is contained in:
tzwang 2024-05-21 11:04:39 +08:00
parent 01fd992d63 bf2019bf3f
commit 22049179a8
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/internal/logic/core/pagelisttasklogic.go
View File

@ -101,8 +101,8 @@ func (l *PageListTaskLogic) updateTaskStatus(tasklist []*types.TaskModel, ch cha
task := list[0] task := list[0]
for i := range list { for i := range list {
earliest, _ := time.Parse(constants.Layout_temp, task.UpdatedTime) earliest, _ := time.Parse(time.RFC3339, task.UpdatedTime)
latest, _ := time.Parse(constants.Layout_temp, list[i].UpdatedTime) latest, _ := time.Parse(time.RFC3339, list[i].UpdatedTime)
if latest.Before(earliest) { if latest.Before(earliest) {
task = list[i] task = list[i]
} }

3
api/internal/scheduler/schedulers/aiScheduler.go
View File

@ -113,6 +113,9 @@ func (as *AiScheduler) PickOptimalStrategy() (strategy.Strategy, error) {
case strategy.REPLICATION: case strategy.REPLICATION:
var clusterIds []string var clusterIds []string
for _, resource := range resources { for _, resource := range resources {
if resource == nil {
continue
}
clusterIds = append(clusterIds, resource.ClusterId) clusterIds = append(clusterIds, resource.ClusterId)
} }
strategy := strategy.NewReplicationStrategy(clusterIds, 1) strategy := strategy.NewReplicationStrategy(clusterIds, 1)

5
api/internal/scheduler/strategy/dynamicResources.go
View File

@ -31,6 +31,11 @@ func (ps *DynamicResourcesStrategy) Schedule() ([]*AssignedCluster, error) {
var assignedCluster AssignedCluster var assignedCluster AssignedCluster
var results []*AssignedCluster var results []*AssignedCluster
for _, res := range ps.resources { for _, res := range ps.resources {
if res == nil {
continue
}
if opt.ResourceType == "cpu" { if opt.ResourceType == "cpu" {
if res.CpuCoreHours <= 0 { if res.CpuCoreHours <= 0 {
cluster := &AssignedCluster{ClusterId: res.ClusterId, Replicas: ps.replicas} cluster := &AssignedCluster{ClusterId: res.ClusterId, Replicas: ps.replicas}