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

Merge pull request 'updated deployinstance logics' (#274) from tzwang/pcm-coordinator:master into master 

Former-commit-id: b858434acdf715fec01e7ef73f53f5bacbd0296b
This commit is contained in:
tzwang 2024-07-26 15:38:45 +08:00
parent 7ac9ad4914 8434ba3a7c
commit 68872134a0
5 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/logic/inference/deployinstancelistlogic.go
View File

@ -38,16 +38,18 @@ func (l *DeployInstanceListLogic) DeployInstanceList(req *types.DeployInstanceLi
return nil, tx.Error return nil, tx.Error
} }
go updater.UpdateDeployInstanceStatusBatch(l.svcCtx, list)
ins := list[0] ins := list[0]
for i := range list { for i := range list {
last, _ := time.Parse(time.RFC3339, ins.UpdateTime) uTime, _ := time.Parse(time.RFC3339, ins.UpdateTime)
latest, _ := time.Parse(time.RFC3339, list[i].UpdateTime) latest, _ := time.Parse(time.RFC3339, list[i].UpdateTime)
if latest.After(last) { if latest.After(uTime) {
ins = list[i] ins = list[i]
} }
} }
go updater.UpdateDeployInstanceStatus(l.svcCtx, ins) go updater.UpdateDeployInstanceStatus(l.svcCtx, ins, true)
//count total //count total
var total int64 var total int64

2
internal/logic/inference/startdeployinstancelistlogic.go
View File

@ -40,7 +40,7 @@ func (l *StartDeployInstanceListLogic) StartDeployInstanceList(req *types.StartD
return nil, errors.New("start instance failed") return nil, errors.New("start instance failed")
} }
go updater.UpdateDeployInstanceStatus(l.svcCtx, ins) go updater.UpdateDeployInstanceStatus(l.svcCtx, ins, true)
return resp, nil return resp, nil
} }

2
internal/logic/inference/stopdeployinstancelogic.go
View File

@ -40,7 +40,7 @@ func (l *StopDeployInstanceLogic) StopDeployInstance(req *types.StopDeployInstan
return nil, errors.New("stop instance failed") return nil, errors.New("stop instance failed")
} }
go updater.UpdateDeployInstanceStatus(l.svcCtx, ins) go updater.UpdateDeployInstanceStatus(l.svcCtx, ins, true)
return resp, nil return resp, nil
} }

2
internal/scheduler/database/aiStorage.go
View File

@ -441,7 +441,7 @@ func (s *AiStorage) GetInferDeployInstanceTotalNum() (int32, error) {
func (s *AiStorage) GetInferDeployInstanceRunningNum() (int32, error) { func (s *AiStorage) GetInferDeployInstanceRunningNum() (int32, error) {
var total int32 var total int32
tx := s.DbEngin.Raw("select count(*) from ai_infer_deploy_instance where `status` = 'running'").Scan(&total) tx := s.DbEngin.Raw("select count(*) from ai_infer_deploy_instance where `status` = 'Running'").Scan(&total)
if tx.Error != nil { if tx.Error != nil {
logx.Errorf(tx.Error.Error()) logx.Errorf(tx.Error.Error())
return 0, tx.Error return 0, tx.Error

29
internal/scheduler/service/updater/deployInstance.go
View File

@ -9,7 +9,25 @@ import (
"strconv" "strconv"
) )
func UpdateDeployInstanceStatus(svc *svc.ServiceContext, instance *models.AiInferDeployInstance) { func UpdateDeployInstanceStatusBatch(svc *svc.ServiceContext, insList []*models.AiInferDeployInstance) {
list := make([]*models.AiInferDeployInstance, len(insList))
copy(list, insList)
for i := len(list) - 1; i >= 0; i-- {
if list[i].Status == constants.Running || list[i].Status == constants.Stopped {
list = append(list[:i], list[i+1:]...)
}
}
if len(list) == 0 {
return
}
for _, instance := range list {
go UpdateDeployInstanceStatus(svc, instance, false)
}
}
func UpdateDeployInstanceStatus(svc *svc.ServiceContext, instance *models.AiInferDeployInstance, updatetime bool) {
amap, found := svc.Scheduler.AiService.InferenceAdapterMap[strconv.FormatInt(instance.AdapterId, 10)] amap, found := svc.Scheduler.AiService.InferenceAdapterMap[strconv.FormatInt(instance.AdapterId, 10)]
if !found { if !found {
return return
@ -44,8 +62,11 @@ func UpdateDeployInstanceStatus(svc *svc.ServiceContext, instance *models.AiInfe
instance.Status = ins.Status instance.Status = ins.Status
} }
} }
err = svc.Scheduler.AiStorages.UpdateInferDeployInstance(instance)
if err != nil { if updatetime {
return err = svc.Scheduler.AiStorages.UpdateInferDeployInstance(instance)
if err != nil {
return
}
} }
} }