From 4908fbc193cab93cb529830855bb9114010c3900 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 10 Jan 2023 11:38:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E4=B8=80=E4=B8=8B=E4=BA=91=E8=84=91?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index c18e1f51a..edcbdaa57 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -2519,7 +2519,7 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s } else { setMapKey("GpuDebugJob", cloudTaskRecord.UserID, 1, resultItemMap) } - } else if cloudTaskRecord.Type == 2 { + } else if cloudTaskRecord.Type == 2 || cloudTaskRecord.Type == 3 { setMapKey("C2Net", cloudTaskRecord.UserID, 1, resultItemMap) if cloudTaskRecord.ComputeResource == NPUResource { if cloudTaskRecord.JobType == "TRAIN" { @@ -2529,6 +2529,9 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s } } else if cloudTaskRecord.ComputeResource == GPUResource { if cloudTaskRecord.JobType == "TRAIN" { + if cloudTaskRecord.UserID == 247 { + log.Info("test_2022 user has train task 1") + } setMapKey("GpuTrainJob", cloudTaskRecord.UserID, 1, resultItemMap) } else { setMapKey("GpuDebugJob", cloudTaskRecord.UserID, 1, resultItemMap) From 4bf61de4110ede62a0e1b1727bdda67b02d2d84d Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 10 Jan 2023 11:47:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=91=E8=84=91?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=85=B7=E4=BD=93=E6=95=B0=E9=87=8F=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index edcbdaa57..693d9861b 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -2486,7 +2486,7 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s var indexTotal int64 indexTotal = 0 for { - sess.Select("id,job_type,user_id,duration,train_job_duration,type").Table("cloudbrain").Unscoped().Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal)) + sess.Select("id,job_type,user_id,duration,train_job_duration,type,compute_resource").Table("cloudbrain").Unscoped().Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal)) cloudTaskList := make([]*Cloudbrain, 0) sess.Find(&cloudTaskList) log.Info("query cloudbrain size=" + fmt.Sprint(len(cloudTaskList))) @@ -2529,9 +2529,6 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s } } else if cloudTaskRecord.ComputeResource == GPUResource { if cloudTaskRecord.JobType == "TRAIN" { - if cloudTaskRecord.UserID == 247 { - log.Info("test_2022 user has train task 1") - } setMapKey("GpuTrainJob", cloudTaskRecord.UserID, 1, resultItemMap) } else { setMapKey("GpuDebugJob", cloudTaskRecord.UserID, 1, resultItemMap)