9bf2db776b
Implement `list` for snapshotter request
...
This PR follows up on @wedsonaf's #126 and pass the filters through the list input.
Note that this is not backward compatible but this is a step closer to the protocol
conformance.
2023-04-21 18:39:32 +00:00
16e9695e80
Bump snapshots crate
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-04-14 12:26:18 -07:00
dc856c67bf
containerd-shim: bump containerd-shim-protos to v0.3.0
...
Signed-off-by: Tim Zhang <tim@hyper.sh>
2023-04-14 16:02:48 +08:00
18609f2762
release containerd-shim-protos: v0.3.0
...
Bump containerd-shim-protos from 0.2.0 to 0.3.0 to
include changes made in #95 .
Because the update in #95 is not compatible we need a major
version update.
Signed-off-by: Tim Zhang <tim@hyper.sh>
2023-04-14 15:43:13 +08:00
ad90c998ef
runc-shim: fix tty fd multi close error
...
use File::from_raw_fd() to create the tty io file, when the io copy
thread ends, it will drop the file object which will close the fd, but
as we made three file objects from the same fd, it will be closed
three times, if other opened files occupied this fd number, the
second or third drop of the file object may close the fds of other files.
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2023-04-11 20:16:39 +08:00
dad95076c4
Move Stdio to runc-shim
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-03-16 11:35:03 -07:00
2fcf8af423
Move processes to runc-shim
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-03-16 11:24:31 -07:00
33d37c0c0d
Move console to runc-shim
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-03-16 11:16:24 -07:00
115029bb63
Merge pull request #127 from mxpv/refactor
...
Make shim / runc-shim APIs more consistent
2023-03-16 11:01:47 -07:00
b284957f88
Merge pull request #130 from wedsonaf/kind-eq
...
Derive `PartialEq` for `Kind`
2023-03-16 04:39:15 +00:00
68c227a774
Derive `PartialEq` for `Kind`
...
This allows us to use the `==` and `!=` operators to compare instances
of `Kind`, which is useful when we require that a snapshot be of some
specific kind (e.g., committed) before performing an operation on it.
Signed-off-by: Wedson Almeida Filho <walmeida@microsoft.com>
2023-03-16 01:16:09 -03:00
7380fe8528
Use `futures` version from workspace
...
Co-authored-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
Signed-off-by: Wedson Almeida Filho <wedsonaf@users.noreply.github.com>
2023-03-16 00:59:56 -03:00
45c0c0d4e0
Move async container and task modules to runc-shim
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-03-15 14:26:15 -07:00
f071faafc8
Implement `list` function
...
This is needed by remote snapshotters: once they report "already
exists", containerd tries to find the snapshot via `list`. If
it's not implemented, the "already exists" trick to prevent
layer download doesn't work.
This is still missing a filtering function, but allows remote
snapshotters to work.
Signed-off-by: Wedson Almeida Filho <walmeida@microsoft.com>
2023-03-14 23:59:29 -03:00
af7ec66df5
Implement `Serialize` and `Deserialize` for `Kind` and `Info`
...
This allows us to use `serde` to serialize and deserialize the
information about a particular snapshot so that we can write it
to and read it from storage.
Signed-off-by: Wedson Almeida Filho <walmeida@microsoft.com>
2023-03-14 15:16:58 -03:00
98754fd771
Update tokio
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2023-03-13 09:43:52 -07:00
2cf2fd4a92
build(deps): update oci-spec requirement from 0.5.8 to 0.6.0
...
Updates the requirements on [oci-spec](https://github.com/containers/oci-spec-rs ) to permit the latest version.
- [Release notes](https://github.com/containers/oci-spec-rs/releases )
- [Changelog](https://github.com/containers/oci-spec-rs/blob/main/release.md )
- [Commits](https://github.com/containers/oci-spec-rs/compare/v0.5.8...v0.6.0 )
---
updated-dependencies:
- dependency-name: oci-spec
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-03-13 01:44:43 +00:00
2d0d5c5602
docs: Update link for containerd shimv2 proto file
...
The `shim.proto` file is now under `api/runtime` instead of just `runtime`.
Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>
2023-03-08 15:15:19 +01:00
27a92fc606
Merge pull request #117 from wedsonaf/status
...
Add `Into<tonic::Status>` bound to `Snapshotter::Error`
2023-01-19 13:36:28 -08:00
cdb52e74e5
Use `?` instead of `match` expression
...
This is just a simplification of the code to use `map_err` and
the question mark operator to improve readability.
Signed-off-by: Wedson Almeida Filho <walmeida@microsoft.com>
2023-01-19 16:22:50 -03:00
3aeeea0f55
Add `Into<tonic::Status>` bound to `Snapshotter::Error`
...
This allows implementers to express which grpc status should be
returned to clients on errors.
Prior to this patch, all errors got converted to "internal"
errors (`tonic::Status::internal`), which doesn't work when
specific status are needed. For example, remote snapshotters
need to return "already exists" to indicate that a layer
doesn't need to be downloaded.
Signed-off-by: Wedson Almeida Filho <walmeida@microsoft.com>
2023-01-19 16:18:05 -03:00
65921d09dc
Remove unused declaration
...
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2023-01-16 23:37:45 +08:00
ffa56dbf3b
runc-shim: fix leaking thread and fd
...
The stdin fifo fd should be closed when containerd
calls close io, otherwise, runc-shim would hold
this fd and the copy console thread forever.
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2023-01-16 23:37:44 +08:00
62798a0745
runc-shim: fix leaking files for exec process
...
A pid file under bundle path will be created after
the exec process created, so it should also be deleted
before process deleted.
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2023-01-08 10:57:31 +08:00
faf24cbd42
Merge pull request #106 from containerd/dependabot/cargo/page_size-0.5.0
...
build(deps): update page_size requirement from 0.4.2 to 0.5.0
2023-01-07 11:49:28 -08:00
80c6d9edf0
Merge pull request #107 from containerd/dependabot/cargo/nix-0.26
...
build(deps): update nix requirement from 0.25 to 0.26
2023-01-07 11:49:13 -08:00
07a98518d4
Merge pull request #109 from utam0k/rust-1.66
...
Update Rust to 1.66 and fix some lints
2023-01-07 11:48:17 -08:00
3822d608e9
runc-shim: retrieve OCI runtime error if OCI command failed
...
If an error is encountered when running the OCI command, shim process
should walk the OCI command logfile and retrieve the last error.
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2023-01-06 21:21:13 +08:00
fe1b3b0f73
Fix the warns from clippy lints
...
Signed-off-by: utam0k <k0ma@utam0k.jp>
2022-12-29 21:21:55 +09:00
8a20e3b2c3
build(deps): update page_size requirement from 0.4.2 to 0.5.0
...
Updates the requirements on [page_size](https://github.com/Elzair/page_size_rs ) to permit the latest version.
- [Release notes](https://github.com/Elzair/page_size_rs/releases )
- [Commits](https://github.com/Elzair/page_size_rs/compare/0.4.2...0.5.0 )
---
updated-dependencies:
- dependency-name: page_size
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-12-17 23:28:10 +00:00
909b41b4fe
Update oci-spec
2022-12-17 14:10:18 +09:00
7558fe4c49
build(deps): update nix requirement from 0.25 to 0.26
...
Updates the requirements on [nix](https://github.com/nix-rust/nix ) to permit the latest version.
- [Release notes](https://github.com/nix-rust/nix/releases )
- [Changelog](https://github.com/nix-rust/nix/blob/master/CHANGELOG.md )
- [Commits](https://github.com/nix-rust/nix/compare/v0.25.0...v0.26.1 )
---
updated-dependencies:
- dependency-name: nix
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-11-29 21:09:10 +00:00
80e7945674
Use workspace inheritance to describe crates
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-11-04 14:34:49 -07:00
55aa661b4d
Update Rust to 1.65
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-11-04 14:34:49 -07:00
00b836f8de
build(deps): update simple_logger requirement from 3.0 to 4.0
...
Updates the requirements on [simple_logger](https://github.com/borntyping/rust-simple_logger ) to permit the latest version.
- [Release notes](https://github.com/borntyping/rust-simple_logger/releases )
- [Commits](https://github.com/borntyping/rust-simple_logger/compare/v3.0.0...v4.0.0 )
---
updated-dependencies:
- dependency-name: simple_logger
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-27 21:49:35 +00:00
0409907ac4
build(deps): update simple_logger requirement from 2.0 to 3.0
...
Updates the requirements on [simple_logger](https://github.com/borntyping/rust-simple_logger ) to permit the latest version.
- [Release notes](https://github.com/borntyping/rust-simple_logger/releases )
- [Commits](https://github.com/borntyping/rust-simple_logger/compare/v2.0.0...v3.0.0 )
---
updated-dependencies:
- dependency-name: simple_logger
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-20 21:52:22 +00:00
6203977cbf
runc-shim: Update README with performance test
...
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2022-10-16 16:41:01 +08:00
5ddd3e37bb
Run fmt
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-09-29 11:55:31 -07:00
d3d97df549
Remove generated code from shim-protos
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-09-27 08:57:33 -07:00
97d00b4947
Merge pull request #95 from mxpv/ttrpc
2022-09-23 19:08:42 -07:00
26ae44e5c3
Update ttrpc dependencies and switch to Protobuf 3
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-09-23 08:54:45 -07:00
78cd9dda69
Fix docs
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-09-22 18:50:31 -07:00
51a27ee268
Update nix dependency ( fix #93 )
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-09-21 11:32:39 -07:00
132b3fb221
shim: fix bug in mount rootfs flag
...
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2022-09-20 22:16:03 +08:00
9d2ad01aa7
Remove vulnerable dependency found by cargo deny
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-09-19 15:12:58 -07:00
de34dc8760
Update snapshots dependencies
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-09-19 15:12:52 -07:00
774ef5df56
Update client dependencies
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-09-19 15:12:40 -07:00
a83ff8e8d2
Update README.md
...
ctr pull needs to be replaced by ctr i pull for the command to work.
Signed-off-by: Manu Gupta <manugupt1@gmail.com>
2022-09-05 21:54:39 -07:00
d5b72ce007
Merge pull request #80 from yuqitao/support-more-overlayfs-layers
...
synchronous: supprt more overlayfs layers
2022-05-30 13:09:13 -07:00
fdd5d7c7d1
synchronous: supprt more overlayfs layers
...
Signed-off-by: yuqitao <yuqitao1024@qq.com>
2022-05-27 15:27:08 +08:00
be8d9d479e
runc-shim: Update console copy
...
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2022-05-17 22:57:58 +08:00
cfe09e2227
Update nix dependency
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-05-05 14:55:34 -07:00
f9ae07236d
removed unsafe codes on runc client and shim
...
Signed-off-by: Yuna Tomida <ytomida.mmm@gmail.com>
2022-05-04 15:39:41 +09:00
83dec597de
Remove docs.rs badge from runc-shim
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-05-03 13:59:15 -07:00
9193b476c2
build(deps): update uuid requirement from 0.8.2 to 1.0.0
...
Updates the requirements on [uuid](https://github.com/uuid-rs/uuid ) to permit the latest version.
- [Release notes](https://github.com/uuid-rs/uuid/releases )
- [Commits](https://github.com/uuid-rs/uuid/compare/0.8.2...1.0.0 )
---
updated-dependencies:
- dependency-name: uuid
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-04-20 21:37:17 +00:00
497f88ca86
Update proto dependencies
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-04-06 09:19:21 -07:00
df87a63c8e
add exit-signal for container
...
to exit io copy tasks when deleting container
Signed-off-by: Feng Shaobao <fshb1988@gmail.com>
2022-03-22 14:47:41 +08:00
93cc73cf9b
upgrade rust toolchain version to 1.59
...
the dependent path-dedot crate updated to rust edition 2021, we have to
upgrade out toolchain version to compile
Signed-off-by: Feng Shaobao <fshb1988@gmail.com>
2022-03-18 17:26:24 +08:00
63a4e5c891
fix tokio not exit and signal handle exit issue
...
make all integartion tests passed
Signed-off-by: Feng Shaobao <fshb1988@gmail.com>
2022-03-18 12:39:36 +08:00
b48cc3d993
add update/stats/pids for async
...
Signed-off-by: Feng Shaobao <fshb1988@gmail.com>
2022-03-16 10:07:31 +08:00
b3ac82d9cc
Fix badges
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-03-10 16:18:47 -08:00
21e298aef3
Bump versions
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-03-10 15:58:28 -08:00
70c7f85b45
Update runc shim README
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-03-10 15:49:59 -08:00
80e6588c53
Fix runtime name for integration tests
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-03-10 15:24:10 -08:00
d7ceb45072
[runc-shim] Implement Connect
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-03-10 09:42:10 -08:00
2fd561e290
runc-shim: support remote publisher and extra some common methods
...
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2022-03-10 17:23:50 +08:00
3ff1fc0a6d
bugfix: return a tmp dir when 'XDG_RUNTIME_DIR' was not set
...
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2022-03-09 23:46:47 +08:00
74ac192726
runc-shim: implement ShimExecutor in synchronous version
...
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2022-03-09 21:17:26 +08:00
6bc49c007c
Merge pull request #50 from abel-von/add-async-runc
...
[runc-shim] support of async runc shim
2022-03-08 12:58:18 -08:00
1e1a6a8d97
change Executor to Spawner and make it trait object
2022-03-08 15:39:43 +08:00
c0baac598f
[Client] Bump to 0.2.0
...
Close : #54
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-03-07 11:09:02 -08:00
cdc78f7760
split async and sync codes for runc-shim and shim
...
Signed-off-by: Feng Shaobao <fshb1988@gmail.com>
2022-03-07 22:34:51 +08:00
777fe2ad23
support async feature for runc shim
...
Signed-off-by: Feng Shaobao <fshb1988@gmail.com>
2022-03-07 16:38:19 +08:00
01f4916f95
shim: Support async traits and helper functions
...
Signed-off-by: Feng Shaobao <fshb1988@gmail.com>
2022-03-07 15:33:49 +08:00
3aa4a4da77
Merge pull request #48 from Burning1020/shim-cgroup
...
runc-shim: support shim cgroup and oom score
2022-03-05 14:50:42 -08:00
4e1c3a2a69
runc-shim: support shim cgroup and oom score
...
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2022-03-04 15:47:29 +08:00
fda23cd59f
shim: refine set subreaper
...
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2022-03-03 20:46:01 +08:00
a06ec3df2d
runc-shim: implement pids task
...
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2022-03-01 19:04:12 +08:00
3ffe778e4b
runc-shim: implement close io task
...
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2022-03-01 19:02:31 +08:00
dd90a9180f
runc: Set piped stdio as default
...
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2022-02-28 21:36:03 +08:00
cdb93f2358
runc-shim: implement update task
...
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2022-02-27 18:12:33 +08:00
9b93f39ee1
runc-shim: implement stats task
...
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2022-02-27 18:12:33 +08:00
c630c56e57
Merge pull request #41 from mxpv/exit
...
Rework exit signals and task creation
2022-02-25 12:30:37 -08:00
fa0d72f516
Fix clippy warnings
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-02-24 11:46:22 -08:00
996c8e6aa8
Rework exit signal and task creation
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-02-24 11:32:34 -08:00
33e940b9c8
runc: refine the way to setup Io
...
Refine the way to setup Io drivers for runC.
The capability to capture output/error messages from runc depends on
the Io driver used. Some add two more Io drivers: InheritedStdIo and
PipedStdIo. Also document whether the Io driver supports capturing
output/error messages.
Signed-off-by: Liu Jiang <gerry@linux.alibaba.com>
2022-02-24 18:47:08 +08:00
41c2083eac
runc: simple syntax improvments
...
Simple syntax only improvements.
Signed-off-by: Liu Jiang <gerry@linux.alibaba.com>
2022-02-24 18:46:38 +08:00
fc50adf2dc
runc: implement sync version of ps() and stats()
...
Implement sync version of ps() and stats().
Signed-off-by: Liu Jiang <gerry@linux.alibaba.com>
2022-02-24 18:46:37 +08:00
95cda30597
runc: fix two bugs in preparing command line arguments
...
1) it should use "runc resume" instead of "runc pause" for resume()
2) the order of arguments to run() is wrong, other options may appear
between "--bundle" and "bundle_id".
Signed-off-by: Liu Jiang <gerry@linux.alibaba.com>
2022-02-24 18:46:36 +08:00
6c6fa1ac09
runc: make async version of Runc::create() to return Response
...
Make async version of Runc::create() to return `Response` instead of
`()`, to keep symmetry with sync version.
Signed-off-by: Liu Jiang <gerry@linux.alibaba.com>
2022-02-24 18:46:35 +08:00
f5f18ec52b
runc: avoid unwrap() in runc::launch()
...
In runc::launch(), it does
let stdout = String::from_utf8(result.stdout).unwrap();
let stderr = String::from_utf8(result.stderr).unwrap();
This is risk of DoS attack because the content result.stdout/sterr may
contain contents generated by the container, so it may contain malicious
non-UTF8 characters.
Signed-off-by: Liu Jiang <gerry@linux.alibaba.com>
2022-02-24 18:46:33 +08:00
fa766d4e75
Merge pull request #38 from Burning1020/fix-files-leak
2022-02-23 15:47:37 -08:00
b08e4090ea
runc: fix bug that exec command leaks files
...
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2022-02-23 21:16:16 +08:00
43f4702b7a
shim-proto: group common proto types into types
...
Group generated soruce files for common protobuf source files into
src/types, also simplify the build.rs.
Signed-off-by: Liu Jiang <gerry@linux.alibaba.com>
Signed-off-by: Quanwei Zhou <quanweiZhou@linux.alibaba.com>
2022-02-23 16:39:09 +08:00
78521c80bf
Remove runc dependency from shim crate
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-02-21 10:26:19 -08:00
a1b2a25987
Update Cargo.toml for runc-shim
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-02-21 09:59:16 -08:00
03496c936b
Merge pull request #34 from quanweiZhou/develop
...
support async for containerd-shim-protos
2022-02-21 09:52:01 -08:00
c4471c4cbf
shim-proto: add async example
...
Fixes : #33
Signed-off-by:Quanwei Zhou <quanweiZhou@linux.alibaba.com>
2022-02-21 18:10:12 +08:00
6e50c8741c
shim-proto: support async
...
Fixes : #33
Signed-off-by: Quanwei Zhou <quanweiZhou@linux.alibaba.com>
2022-02-21 16:52:45 +08:00
117263d9be
Move Io and Console
...
Signed-off-by: Zhang Tianyang <burning9699@gmail.com>
2022-02-17 23:06:35 +08:00
Simon Mo
Maksym Pavlenko
Tim Zhang
Zhang Tianyang
Wedson Almeida Filho
Wedson Almeida Filho
dependabot[bot]
Christophe de Dinechin
utam0k
Manu Gupta
yuqitao
Yuna Tomida
Feng Shaobao
Liu Jiang
Quanwei Zhou