From f29595318301133bf080f460ba4f18b99c777bca Mon Sep 17 00:00:00 2001 From: Yibo Zhuang Date: Fri, 20 May 2022 14:55:00 -0700 Subject: [PATCH] runtime: fix incorrect Action function for direct-volume stats The action function expects a function that returns error but the current direct-volume stats Action returns (string, error) which is invalid. This change fixes the format and print out the stats from the command instead. Fixes: #4293 Signed-off-by: Yibo Zhuang --- src/runtime/cmd/kata-runtime/kata-volume.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/runtime/cmd/kata-runtime/kata-volume.go b/src/runtime/cmd/kata-runtime/kata-volume.go index e08e9482fa..a94d35d72e 100644 --- a/src/runtime/cmd/kata-runtime/kata-volume.go +++ b/src/runtime/cmd/kata-runtime/kata-volume.go @@ -7,10 +7,11 @@ package main import ( "encoding/json" + "fmt" "net/url" containerdshim "github.com/kata-containers/kata-containers/src/runtime/pkg/containerd-shim-v2" - "github.com/kata-containers/kata-containers/src/runtime/pkg/direct-volume" + volume "github.com/kata-containers/kata-containers/src/runtime/pkg/direct-volume" "github.com/kata-containers/kata-containers/src/runtime/pkg/utils/shimclient" "github.com/urfave/cli" @@ -89,12 +90,14 @@ var statsCommand = cli.Command{ Destination: &volumePath, }, }, - Action: func(c *cli.Context) (string, error) { + Action: func(c *cli.Context) error { stats, err := Stats(volumePath) if err != nil { - return "", cli.NewExitError(err.Error(), 1) + return cli.NewExitError(err.Error(), 1) } - return string(stats), nil + + fmt.Println(string(stats)) + return nil }, }