From c95c0dd74807c5e27234563799b2cf79071188f5 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 31 Jan 2023 11:47:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E7=AE=97=E4=BB=BB=E5=8A=A1=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E6=8E=A5=E5=8F=A3=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/cloudbrain.go | 9 +++++++++ modules/grampus/resty.go | 11 +++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 51e122bb6..448a706b3 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1661,6 +1661,15 @@ type Metrics struct { Value []string `json:"value"` //获取的监控值的序列，元素为String类型 } +type NewModelArtsMetricStatisticResult struct { + MetricsInfo []Metrics `json:"metrics"` //监控详情 +} + +type NewModelArtsMetrics struct { + Metric string `json:"metric"` //监控指标项 + Value []float32 `json:"value"` //获取的监控值的序列，元素为float类型 +} + func Cloudbrains(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) { sess := x.NewSession() defer sess.Close() diff --git a/modules/grampus/resty.go b/modules/grampus/resty.go index 3611240b9..65d195318 100755 --- a/modules/grampus/resty.go +++ b/modules/grampus/resty.go @@ -315,10 +315,10 @@ func GetTrainJobLog(jobID string) (string, error) { return logContent, nil } -func GetGrampusMetrics(jobID string) (models.GetTrainJobMetricStatisticResult, error) { +func GetGrampusMetrics(jobID string) (models.NewModelArtsMetricStatisticResult, error) { checkSetting() client := getRestyClient() - var result models.GetTrainJobMetricStatisticResult + var result models.NewModelArtsMetricStatisticResult res, err := client.R(). SetAuthToken(TOKEN). Get(HOST + urlTrainJob + "/" + jobID + "/task/0/replica/0/metrics") @@ -331,12 +331,7 @@ func GetGrampusMetrics(jobID string) (models.GetTrainJobMetricStatisticResult, e return result, fmt.Errorf("json.Unmarshal failed(%s): %v", res.String(), err.Error()) } if res.StatusCode() != http.StatusOK { - log.Error("Call GrampusMetrics failed(%d):%s(%s)", res.StatusCode(), result.ErrorCode, result.ErrorMsg) - return result, fmt.Errorf("Call GrampusMetrics failed(%d):%d(%s)", res.StatusCode(), result.ErrorCode, result.ErrorMsg) - } - if !result.IsSuccess { - log.Error("GetGrampusMetrics(%s) failed", jobID) - return result, fmt.Errorf("GetGrampusMetrics failed:%s", result.ErrorMsg) + return result, fmt.Errorf("Call GrampusMetrics failed(%d)", res.StatusCode()) } return result, nil }