From 6b08f66ec97fe66e0d43c567dfea2deb0fadfcd0 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Mon, 15 Aug 2022 14:51:01 +0800 Subject: [PATCH] #2624 add SyncResourceSpecs --- models/resource_specification.go | 2 +- modules/cron/tasks_basic.go | 13 +++++++++++++ services/cloudbrain/resource/resource_queue.go | 6 +++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/models/resource_specification.go b/models/resource_specification.go index b5141ceb7..40bf1f818 100644 --- a/models/resource_specification.go +++ b/models/resource_specification.go @@ -35,7 +35,7 @@ func (r ResourceSpecification) ConvertToRes() *ResourceSpecificationRes { SourceSpecId: r.SourceSpecId, AccCardsNum: r.AccCardsNum, CpuCores: r.CpuCores, - MemGiB: r.GPUMemGiB, + MemGiB: r.MemGiB, ShareMemGiB: r.ShareMemGiB, GPUMemGiB: r.GPUMemGiB, UnitPrice: r.UnitPrice, diff --git a/modules/cron/tasks_basic.go b/modules/cron/tasks_basic.go index b3a6c02a1..b79b8f533 100755 --- a/modules/cron/tasks_basic.go +++ b/modules/cron/tasks_basic.go @@ -5,6 +5,7 @@ package cron import ( + "code.gitea.io/gitea/services/cloudbrain/resource" "context" "time" @@ -207,6 +208,17 @@ func registerSyncCloudbrainStatus() { }) } +func registerSyncResourceSpecs() { + RegisterTaskFatal("sync_grampus_specs", &BaseConfig{ + Enabled: true, + RunAtStart: true, + Schedule: "0 0 1 * * ?", + }, func(ctx context.Context, _ *models.User, _ Config) error { + resource.SyncGrampusQueueAndSpecs() + return nil + }) +} + func initBasicTasks() { registerUpdateMirrorTask() registerRepoHealthCheck() @@ -227,4 +239,5 @@ func initBasicTasks() { registerSyncCloudbrainStatus() registerHandleOrgStatistic() + registerSyncResourceSpecs() } diff --git a/services/cloudbrain/resource/resource_queue.go b/services/cloudbrain/resource/resource_queue.go index 15122f944..ff3f00b69 100644 --- a/services/cloudbrain/resource/resource_queue.go +++ b/services/cloudbrain/resource/resource_queue.go @@ -102,6 +102,10 @@ func SyncGrampusQueue(doerId int64) error { } } - //todo 调试两个虎鲸接口,注意批量update是否有问题。确定上架时有没有检查queue是否被删除 return models.SyncGrampusQueues(queueUpdateList, queueInsertList, existIds) } + +func SyncGrampusQueueAndSpecs() { + SyncGrampusQueue(0) + SyncGrampusSpecs(0) +}