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.

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

add exec delete timeout #303

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Conversation

mingfukuang
Copy link

add exec delete timeout

@github-actions github-actions bot added C-runc-shim Runc shim C-shim Containerd shim labels Jul 30, 2024
@bryantbiggs
Copy link
Contributor

@mingfukuang you'll need to rebase off main to pull in changes to make CI checks happy across your PRs

#[tokio::main]
async fn main() {
fn main() {
let num_threads = std::env::var("RUSTMAXPROCS")
Copy link
Member

Choose a reason for hiding this comment

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

Looks like rebase didn't go well. This change shouldn't be in this PR.

Copy link
Author

Choose a reason for hiding this comment

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

I'v already updated.

@github-actions github-actions bot added T-docs Improvements or additions to documentation C-shim-protos Shim protos C-client Containerd client C-snapshots Remote snapshotter C-runc runc helper T-CI Changes in project's CI labels Aug 3, 2024
@mingfukuang
Copy link
Author

@mingfukuang you'll need to rebase off main to pull in changes to make CI checks happy across your PRs

It's done , pls have a look. thanks.

@bryantbiggs
Copy link
Contributor

the GitHub UI is still showing that there are merge conflicts, and it looks like your diff contains a lot of prior changes that are already on main

Signed-off-by: kuangmingfu <[email protected]>
@mingfukuang
Copy link
Author

mingfukuang commented Aug 5, 2024

conflicts exists at here: 
[dependencies]
async-trait = { workspace = true, optional = true }
<<<<<<< f7
protobuf = "=3.1"
=======
protobuf = "=3.5"
>>>>>>> main
ttrpc = "0.8"

but this conflicts could be still exists in commit 6a5c9c2:

crates/shim-protos/Cargo.toml :
$ git reset --hard 6a5c9c26295b1e2c1eb14aa1b22edb17f0b07f86 
HEAD now  6a5c9c2 fix: Correct clippy lint suggestion part tres
$ cat crates/shim-protos/Cargo.toml |grep protobuf 
protobuf = "=3.1"

I'm not sure how to handle it properly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-client Containerd client C-runc runc helper C-runc-shim Runc shim C-shim Containerd shim C-shim-protos Shim protos C-snapshots Remote snapshotter needs update T-CI Changes in project's CI T-docs Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants