github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #5395 from mikebrow/cmd-check-improve-error-checking

Browse Source 
add check quiet option and update usage
This commit is contained in:
Michael Crosby 2021-04-20 14:43:25 -04:00 committed by GitHub
commit 079fe6bca8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
cmd/ctr/commands/images/images.go
View File

@ -199,30 +199,42 @@ var setLabelsCommand = cli.Command{
var checkCommand = cli.Command{ var checkCommand = cli.Command{
Name: "check", Name: "check",
Usage: "check that an image has all content available locally", Usage: "check existing images to ensure all content is available locally",
ArgsUsage: "[flags] [<filter>, ...]", ArgsUsage: "[flags] [<filter>, ...]",
Description: "check that an image has all content available locally", Description: "check existing images to ensure all content is available locally",
Flags: commands.SnapshotterFlags, Flags: append([]cli.Flag{
cli.BoolFlag{
Name: "quiet, q",
Usage: "print only the ready image refs (fully downloaded and unpacked)",
},
}, commands.SnapshotterFlags...),
Action: func(context *cli.Context) error { Action: func(context *cli.Context) error {
var ( var (
exitErr error exitErr error
quiet = context.Bool("quiet")
) )
client, ctx, cancel, err := commands.NewClient(context) client, ctx, cancel, err := commands.NewClient(context)
if err != nil { if err != nil {
return err return err
} }
defer cancel() defer cancel()
var (
contentStore = client.ContentStore() var contentStore = client.ContentStore()
tw = tabwriter.NewWriter(os.Stdout, 1, 8, 1, ' ', 0)
)
fmt.Fprintln(tw, "REF\tTYPE\tDIGEST\tSTATUS\tSIZE\tUNPACKED\t")
args := []string(context.Args()) args := []string(context.Args())
imageList, err := client.ListImages(ctx, args...) imageList, err := client.ListImages(ctx, args...)
if err != nil { if err != nil {
return errors.Wrap(err, "failed listing images") return errors.Wrap(err, "failed listing images")
} }
if len(imageList) == 0 {
log.G(ctx).Debugf("no images found")
return exitErr
}
var tw = tabwriter.NewWriter(os.Stdout, 1, 8, 1, ' ', 0)
if !quiet {
fmt.Fprintln(tw, "REF\tTYPE\tDIGEST\tSTATUS\tSIZE\tUNPACKED\t")
}
for _, image := range imageList { for _, image := range imageList {
var ( var (
@ -230,6 +242,7 @@ var checkCommand = cli.Command{
size string size string
requiredSize int64 requiredSize int64
presentSize int64 presentSize int64
complete bool = true
) )
available, required, present, missing, err := images.Check(ctx, contentStore, image.Target(), platforms.Default()) available, required, present, missing, err := images.Check(ctx, contentStore, image.Target(), platforms.Default())
@ -239,6 +252,7 @@ var checkCommand = cli.Command{
} }
log.G(ctx).WithError(err).Errorf("unable to check %v", image.Name()) log.G(ctx).WithError(err).Errorf("unable to check %v", image.Name())
status = "error" status = "error"
complete = false
} }
if status != "error" { if status != "error" {
@ -252,6 +266,7 @@ var checkCommand = cli.Command{
if len(missing) > 0 { if len(missing) > 0 {
status = "incomplete" status = "incomplete"
complete = false
} }
if available { if available {
@ -260,6 +275,7 @@ var checkCommand = cli.Command{
} else { } else {
status = fmt.Sprintf("unavailable (%v/?)", len(present)) status = fmt.Sprintf("unavailable (%v/?)", len(present))
size = fmt.Sprintf("%v/?", progress.Bytes(presentSize)) size = fmt.Sprintf("%v/?", progress.Bytes(presentSize))
complete = false
} }
} else { } else {
size = "-" size = "-"
@ -273,16 +289,23 @@ var checkCommand = cli.Command{
log.G(ctx).WithError(err).Errorf("unable to check unpack for %v", image.Name()) log.G(ctx).WithError(err).Errorf("unable to check unpack for %v", image.Name())
} }
fmt.Fprintf(tw, "%v\t%v\t%v\t%v\t%v\t%t\n", if !quiet {
image.Name(), fmt.Fprintf(tw, "%v\t%v\t%v\t%v\t%v\t%t\n",
image.Target().MediaType, image.Name(),
image.Target().Digest, image.Target().MediaType,
status, image.Target().Digest,
size, status,
unpacked) size,
unpacked)
} else {
if complete {
fmt.Println(image.Name())
}
}
}
if !quiet {
tw.Flush()
} }
tw.Flush()
return exitErr return exitErr
}, },
} }