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

remote: checkpoint --export prints a rawInput or an error on remote #15812

Merged
merged 1 commit into from
Sep 16, 2022
Merged

remote: checkpoint --export prints a rawInput or an error on remote #15812

merged 1 commit into from
Sep 16, 2022
+30 −12

Conversation

sstosh
Copy link
Contributor

@sstosh sstosh commented Sep 15, 2022

This commit fixes container checkpoint --export
to print a rawInput or an error.

Fixes: #15743

Signed-off-by: Toshiki Sonoda [email protected]

Does this PR introduce a user-facing change?

Now checkpoint --export prints a rawInput or an error on remote

@github-actions github-actions bot added the kind/api-change Change to remote API; merits scrutiny label Sep 15, 2022
@rhatdan
Copy link
Member

rhatdan commented Sep 15, 2022

Thanks @sstosh
LGTM
@containers/podman-maintainers PTAL

vrothberg
vrothberg reviewed Sep 15, 2022
View reviewed changes
pkg/bindings/containers/checkpoint.go Outdated
// options are options and allow for more fine grained control of the checkpoint process.
func Checkpoint(ctx context.Context, nameOrID string, options *CheckpointOptions) (*entities.CheckpointReport, error) {
func Checkpoint(ctx context.Context, cid string, options *CheckpointOptions) (*entities.CheckpointReport, error) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The renaming of nameOrID does not look correct to me. The value can be either a name or a (partial) ID, can't it?

I'd appreciate a test checking for the name.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I checked, containers.Checkpoint function is only called by tunnel.(*ContainerEngine).ContainerCheckpoint function.
This means that nameOrID is always assigned a container ID.

podman/pkg/domain/infra/tunnel/containers.go

Line 412 in 750726e

report, err := containers.Checkpoint(ic.ClientCtx, c.ID, options)

Therefore, nameOrID args should be renamed to cid.
If I have misunderstood, I will fix these changes.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sstosh, pkg/bindings can be used by externals callers. So it does not matter (too) much how it's being used internally since both, ID and name, are supported.

Copy link
Contributor Author

@sstosh sstosh Sep 16, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your reply. I understand.
I'll change cid back to nameOrID.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, @sstosh !

@sstosh
remote: checkpoint --export prints a rawInput or an error on remote
d63e49a 
This commit fixes `container checkpoint --export`
to print a rawInput or an error.

Fixes: containers#15743

Signed-off-by: Toshiki Sonoda <[email protected]>
@sstosh sstosh force-pushed the checkpoint-export-rawinput branch from 20aa7e7 to d63e49a Compare September 16, 2022 07:46
vrothberg
vrothberg reviewed Sep 16, 2022
View reviewed changes
Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Luap99
Luap99 approved these changes Sep 16, 2022
View reviewed changes
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 16, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Luap99, sstosh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 16, 2022
@Luap99
Copy link
Member

Luap99 commented Sep 16, 2022

/lgtm
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 16, 2022
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 16, 2022
@rhatdan
Copy link
Member

rhatdan commented Sep 16, 2022

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 16, 2022
@openshift-merge-robot openshift-merge-robot merged commit 740223c into containers:main Sep 16, 2022
@sstosh sstosh deleted the checkpoint-export-rawinput branch September 16, 2022 10:27
@edsantiago edsantiago mentioned this pull request Oct 6, 2022
Closed
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 20, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 20, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@vrothberg vrothberg vrothberg left review comments

@Luap99 Luap99 Luap99 approved these changes

Assignees

@Luap99 Luap99

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/api-change Change to remote API; merits scrutiny lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

checkpoint --export failed to print rawInput on podman-remote
5 participants
@sstosh @rhatdan @Luap99 @vrothberg @openshift-merge-robot