Skip to content

rpc.proto: making images_dir_fd optional #2797

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

Closed
herheliuk wants to merge 1 commit into from
Closed

rpc.proto: making images_dir_fd optional #2797

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion criu/cr-service.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
}

/*
* open images_dir - images_dir_fd is a required RPC parameter
* open images_dir - images_dir_fd is -1 by default
*
* This assumes that if opts.imgs_dir is set we have a value
* from the configuration file parser. The test to see that
Expand Down
2 changes: 1 addition & 1 deletion images/rpc.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ enum criu_pre_dump_mode {
};

message criu_opts {
required int32 images_dir_fd = 1 [default = -1];
optional int32 images_dir_fd = 1 [default = -1];
Copy link
Member

@rst0git rst0git Oct 23, 2025

Choose a reason for hiding this comment

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

This change is likely to break existing users:
https://protobuf.dev/programming-guides/proto2/#required-deprecated

Copy link
Member Author

@herheliuk herheliuk Oct 23, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

we can hardcode req.opts.images_dir_fd = self.opts.images_dir_fd on every request, (in pycriu)
but it won't be that pretty.

I'm down for any solution, just to fix this inconvenience (and realistically barrier for newbies).

optional string images_dir = 68; /* used only if images_dir_fd == -1 */
optional int32 pid = 2; /* if not set on dump, will dump requesting process */

Expand Down
Loading