Display network information of checkpoints created with Podman #162

deveshgoyal1000 · 2025-04-05T01:18:53Z

This PR implements support for displaying network information (IP and MAC addresses) from Podman container checkpoints, addressing issue.

Currently, checkpointctl shows IP address information for checkpoints created with CRI-O but not with Podman. For Podman checkpoints, this information is stored in network.status in JSON format.

Implementation:

Added network.status file parsing functionality
Added IP and MAC address display to checkpoint show output
Added test coverage for network information parsing

Testing Results:
Before (Original Output) and After (With Network Information output)

The implementation successfully displays:

Container's IP address
MAC address
Maintains existing checkpoint information

Fixes #132

github-actions · 2025-04-05T14:03:35Z

Test Results

61 tests ±0 61 ✅ ±0 2s ⏱️ ±0s
1 suites ±0 0 💤 ±0
1 files ±0 0 ❌ ±0

Results for commit 7669ce5. ± Comparison against base commit 2eec433.

♻️ This comment has been updated with latest results.

adrianreber · 2025-04-05T14:11:32Z

Please have a look at the CI failures and try to fix them.

Also, please rebase and remove the merge commit.

adrianreber · 2025-04-05T14:13:26Z

You should also remove the dependabot commit from your PR.

rst0git · 2025-04-05T14:29:59Z

@deveshgoyal1000 Thank you for working on this! In addition to Adrian's comments, it would be great if you can add more detailed commit messages. The following contributor guide provides more information: https://github.com/checkpoint-restore/criu/blob/criu-dev/CONTRIBUTING.md#describe-your-changes

deveshgoyal1000 · 2025-04-05T22:15:12Z

Thanks for the feedback! I’ll start working on the suggested updates.

Signed-off-by: deveshgoyal1000 <devesh.21bcon427@jecrcu.edu.in>

codecov-commenter · 2025-04-06T15:06:41Z

Codecov Report

Attention: Patch coverage is 74.02597% with 20 lines in your changes missing coverage. Please review.

Project coverage is 71.41%. Comparing base (88acd95) to head (7669ce5).
Report is 2 commits behind head on main.

Files with missing lines	Patch %	Lines
internal/podman_network.go	43.75%	9 Missing ⚠️
internal/container.go	88.23%	5 Missing and 1 partial ⚠️
internal/oci_image_build.go	0.00%	5 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #162      +/-   ##
==========================================
- Coverage   71.43%   71.41%   -0.02%     
==========================================
  Files          13       14       +1     
  Lines        1565     1599      +34     
==========================================
+ Hits         1118     1142      +24     
- Misses        373      384      +11     
+ Partials       74       73       -1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

snprajwal · 2025-04-07T10:14:10Z

internal/container.go

+	if specDump.Annotations["io.container.manager"] == "libpod" {
+		// Create temp dir for network status file
+		tmpDir, err := os.MkdirTemp("", "network-status")
+		if err == nil {


We would like to return the error here (possible wrapped with some context)

snprajwal · 2025-04-07T10:14:17Z

internal/container.go

+
+			// Extract network.status file
+			err = UntarFiles(task.CheckpointFilePath, tmpDir, []string{metadata.NetworkStatusFile})
+			if err == nil {


snprajwal · 2025-04-07T10:14:22Z

internal/container.go

+			if err == nil {
+				networkStatusFile := filepath.Join(tmpDir, metadata.NetworkStatusFile)
+				ip, mac, err := getPodmanNetworkInfo(networkStatusFile)
+				if err == nil {


snprajwal · 2025-04-07T10:15:43Z

internal/container.go

+		if strings.Contains(err.Error(), "unexpected end of JSON input") {
+			return nil, fmt.Errorf("config.dump: unexpected end of JSON input")
+		}
+		return nil, fmt.Errorf("config.dump: %w", err)


Suggested change

if strings.Contains(err.Error(), "unexpected end of JSON input") {

return nil, fmt.Errorf("config.dump: unexpected end of JSON input")

}

return nil, fmt.Errorf("config.dump: %w", err)

return nil, fmt.Errorf("config.dump: %w", err)

I don't think we need the special case since we are wrapping with context.

snprajwal · 2025-04-07T10:15:55Z

internal/container.go

+		if os.IsNotExist(err) {
+			return nil, fmt.Errorf("spec.dump: no such file or directory")
+		}
+		if strings.Contains(err.Error(), "unexpected end of JSON input") {
+			return nil, fmt.Errorf("spec.dump: unexpected end of JSON input")
+		}
+		return nil, fmt.Errorf("spec.dump: %w", err)


Suggested change

if os.IsNotExist(err) {

return nil, fmt.Errorf("spec.dump: no such file or directory")

}

if strings.Contains(err.Error(), "unexpected end of JSON input") {

return nil, fmt.Errorf("spec.dump: unexpected end of JSON input")

}

return nil, fmt.Errorf("spec.dump: %w", err)

return nil, fmt.Errorf("spec.dump: %w", err)

I don't think we need the special case since we are wrapping with context.

snprajwal · 2025-04-07T10:17:43Z

internal/container.go

+		"IP",
+		"MAC",
+		"CHKPT Size",
+		"Root FS Diff Size",


Suggested change

"Root FS Diff Size",

"Root FS Diff",

Would it make sense to drop the "size" suffix, since the field ought to make it clear that we are talking about the size?

snprajwal · 2025-04-07T10:18:33Z

internal/container.go

+			if strings.Contains(err.Error(), "Error: ") {
+				return fmt.Errorf("%s", strings.TrimPrefix(err.Error(), "Error: "))
+			}


This seems unnecessary

snprajwal · 2025-04-07T10:19:46Z

internal/podman_network.go

+	}
+
+	return "", "", nil
+}


Please add a newline at the end of the file :)

snprajwal · 2025-04-07T10:19:52Z

internal/podman_network_test.go

+	if err == nil {
+		t.Error("getPodmanNetworkInfo should fail with invalid JSON")
+	}
+}


Please add a newline at the end of the file :)

snprajwal · 2025-04-07T10:25:02Z

Oh also, it looks like you need to format the files correctly

deveshgoyal1000 · 2025-04-07T23:12:08Z

Yes, I’m working on it. Thanks for the detailed review and suggestions

deveshgoyal1000 force-pushed the podman-network-info branch from d42ce5a to 4166f35 Compare April 5, 2025 01:33

deveshgoyal1000 force-pushed the podman-network-info branch from 4166f35 to 5cdf9c8 Compare April 5, 2025 23:06

deveshgoyal1000 closed this Apr 6, 2025

deveshgoyal1000 force-pushed the podman-network-info branch from 5cdf9c8 to 88acd95 Compare April 6, 2025 11:39

deveshgoyal1000 reopened this Apr 6, 2025

deveshgoyal1000 closed this Apr 6, 2025

deveshgoyal1000 force-pushed the podman-network-info branch from a975984 to 88acd95 Compare April 6, 2025 12:35

deveshgoyal1000 reopened this Apr 6, 2025

deveshgoyal1000 force-pushed the podman-network-info branch from 52dd188 to 03bf319 Compare April 6, 2025 13:21

container: Add Podman network information display support

7669ce5

Signed-off-by: deveshgoyal1000 <devesh.21bcon427@jecrcu.edu.in>

deveshgoyal1000 force-pushed the podman-network-info branch from 03bf319 to 7669ce5 Compare April 6, 2025 14:50

snprajwal reviewed Apr 7, 2025

View reviewed changes

Display network information of checkpoints created with Podman #162

Are you sure you want to change the base?

Display network information of checkpoints created with Podman #162

Uh oh!

Conversation

deveshgoyal1000 commented Apr 5, 2025

Uh oh!

github-actions bot commented Apr 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Results

Uh oh!

adrianreber commented Apr 5, 2025

Uh oh!

adrianreber commented Apr 5, 2025

Uh oh!

rst0git commented Apr 5, 2025

Uh oh!

deveshgoyal1000 commented Apr 5, 2025

Uh oh!

codecov-commenter commented Apr 6, 2025

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

snprajwal commented Apr 7, 2025

Uh oh!

deveshgoyal1000 commented Apr 7, 2025

Uh oh!

Uh oh!

github-actions bot commented Apr 5, 2025 •

edited

Loading