Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Serialize the container_filesystem and image_filesystem in addition for file stats. #1310

Merged
merged 1 commit into from
Dec 8, 2023
Merged

Serialize the container_filesystem and image_filesystem in addition for file stats. #1310

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 23 additions & 27 deletions cmd/crictl/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,38 +494,34 @@ var imageFsInfoCommand = &cli.Command{
if err != nil {
return fmt.Errorf("image filesystem info request: %w", err)
}
fileSystemReport := func(filesystem []*pb.FilesystemUsage) error {
for _, info := range filesystem {
status, err := protobufObjectToJSON(info)
if err != nil {
return fmt.Errorf("marshal filesystem info to json: %w", err)
}

switch output {
case "json", "yaml", "go-template":
if err := outputStatusInfo(status, nil, output, tmplStr); err != nil {
return fmt.Errorf("output filesystem info: %w", err)
}
continue
case "table": // table output is after this switch block
default:
return fmt.Errorf("output option cannot be %s", output)
}
status, err := protobufObjectToJSON(r)
if err != nil {
return fmt.Errorf("marshal filesystem info to json: %w", err)
}

// otherwise output in table format
fmt.Printf("TimeStamp: %d\n", info.Timestamp)
fmt.Printf("Disk: %s\n", units.HumanSize(float64(info.UsedBytes.GetValue())))
fmt.Printf("Inodes: %d\n", info.InodesUsed.GetValue())
fmt.Printf("Mountpoint: %s\n", info.FsId.Mountpoint)
switch output {
case "json", "yaml", "go-template":
if err := outputStatusInfo(status, nil, output, tmplStr); err != nil {
return fmt.Errorf("output filesystem info: %w", err)
}
return nil
case "table": // table output is after this switch block
default:
return fmt.Errorf("output option cannot be %s", output)
}
if err := fileSystemReport(r.ImageFilesystems); err != nil {
return err
}
if err := fileSystemReport(r.ContainerFilesystems); err != nil {
return err

tablePrintFileSystem := func(fileLabel string, filesystem []*pb.FilesystemUsage) {
fmt.Printf("%s Filesystem \n", fileLabel)
for i, val := range filesystem {
fmt.Printf("TimeStamp[%d]: %d\n", i, val.Timestamp)
fmt.Printf("Disk[%d]: %s\n", i, units.HumanSize(float64(val.UsedBytes.GetValue())))
fmt.Printf("Inodes[%d]: %d\n", i, val.InodesUsed.GetValue())
fmt.Printf("Mountpoint[%d]: %s\n", i, val.FsId.Mountpoint)
}
}
// otherwise output in table format
tablePrintFileSystem("Container", r.ContainerFilesystems)
tablePrintFileSystem("Image", r.ImageFilesystems)

return nil

Expand Down
Loading