Merge pull request #4548 from darfux/ret_error_if_metric_fails

AkihiroSuda · web-flow · commit c862000ab963 · 2020-09-10T20:00:33.000+09:00
ctr: Return error if task.Metrics fails
diff --git a/cmd/ctr/commands/tasks/metrics.go b/cmd/ctr/commands/tasks/metrics.go
@@ -73,7 +73,7 @@ var metricsCommand = cli.Command{
 		}
 		metric, err := task.Metrics(ctx)
 		if err != nil {
-			return nil
+			return err
 		}
 		anydata, err := typeurl.UnmarshalAny(metric.Data)
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ var metricsCommand = cli.Command{`
`73`	`73`	`}`
`74`	`74`	`metric, err := task.Metrics(ctx)`
`75`	`75`	`if err != nil {`
`76`		`- return nil`
	`76`	`+ return err`
`77`	`77`	`}`
`78`	`78`	`anydata, err := typeurl.UnmarshalAny(metric.Data)`
`79`	`79`	`if err != nil {`