Skip to content

runtime: revert part of #6206#6535

Closed
fuweid wants to merge 1 commit intocontainerd:mainfrom
fuweid:fix-6534
Closed

runtime: revert part of #6206#6535
fuweid wants to merge 1 commit intocontainerd:mainfrom
fuweid:fix-6534

Conversation

@fuweid
Copy link
Copy Markdown
Member

@fuweid fuweid commented Feb 9, 2022

runtime: revert part of #6206

In container bundle, the runtime file has been reserved for runtime's
BinaryName like runc or crun 1. In #6206, we supported to use
absolute path as shim runtime name and also stored it in runtime
file2. It will be conflict if user wants to use BinaryName instead of
empty default value.

Before we figure out new filename for shim binary path, I would like to
revert the code from #6206 because the information has been stored in
container store service. If the shim runtime is absolute binary path,
we can just read it from container store service. If it is normal shim name
like io.containerd.runc.v2, we need to resolve it into binary path again,
which is the same to before pr #6206.

Fixes: #6534

Signed-off-by: Wei Fu [email protected]

In container bundle, the `runtime` file has been reserved for runtime's
`BinaryName` like runc or crun[1]. In containerd#6206, we supported to use
absolute path as shim runtime name and also stored it in `runtime`
file[2]. It will be conflict if user wants to use BinaryName instead of
empty default value.

Before we figure out new filename for shim binary path, I would like to
revert the code from containerd#6206 because the information has been stored in
container store service. If the shim runtime is absolute binary path,
we can just read it from container store service. If it is normal shim name
like `io.containerd.runc.v2`, we need to resolve it into binary path again,
which is the same to before pr containerd#6206.

Reference:

[1]: containerd@6bcbf88
[2]: containerd#6206

Fixes: containerd#6534

Signed-off-by: Wei Fu <[email protected]>
@mxpv
Copy link
Copy Markdown
Member

mxpv commented Feb 9, 2022

Before we figure out new filename for shim binary path, I would like to
revert the code

Should we figure out new name instead of reverting? :)
runtime-path ?

@fuweid
Copy link
Copy Markdown
Member Author

fuweid commented Feb 9, 2022

Before we figure out new filename for shim binary path, I would like to

revert the code

Should we figure out new name instead of reverting? :)

runtime-path ?

In container ecosystem, runtime is confusing word :) at least to me. And we are introducing sandbox api and so yeah. Runtime looks like any words 😂 I am ok to use other filename to fix it. Maybe less-confusing word

@mxpv
Copy link
Copy Markdown
Member

mxpv commented Feb 9, 2022

would shim-binary-path better?

@mxpv
Copy link
Copy Markdown
Member

mxpv commented Feb 9, 2022

Changed in #6536

@fuweid fuweid deleted the fix-6534 branch February 9, 2022 22:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

docker live-restore not working

2 participants