From 279a4ac77a848a37ee5c61c3e40ff39fead35ff6 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Mon, 28 Nov 2022 17:27:06 +0100 Subject: [PATCH 1/4] Remove leaveRunning from swagger restore endpoint The restore action does not support leaveRunning as argument. [NO NEW TESTS NEEDED] Signed-off-by: Jelle van der Waa --- pkg/api/server/register_containers.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkg/api/server/register_containers.go b/pkg/api/server/register_containers.go index 2cf5169ba0..c16d97a5e8 100644 --- a/pkg/api/server/register_containers.go +++ b/pkg/api/server/register_containers.go @@ -1489,10 +1489,6 @@ func (s *APIServer) registerContainersHandlers(r *mux.Router) error { // type: boolean // description: keep all temporary checkpoint files // - in: query - // name: leaveRunning - // type: boolean - // description: leave the container running after writing checkpoint to disk - // - in: query // name: tcpEstablished // type: boolean // description: checkpoint a container with established TCP connections From 1d031bf3bd17f7fc2de9254a11ad4bba07b0dd72 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Mon, 28 Nov 2022 17:34:05 +0100 Subject: [PATCH 2/4] Document ignoreVolumes in checkpoint/restore endpoint [NO NEW TESTS NEEDED] Signed-off-by: Jelle van der Waa --- pkg/api/server/register_containers.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkg/api/server/register_containers.go b/pkg/api/server/register_containers.go index c16d97a5e8..d45eb2318d 100644 --- a/pkg/api/server/register_containers.go +++ b/pkg/api/server/register_containers.go @@ -1455,6 +1455,10 @@ func (s *APIServer) registerContainersHandlers(r *mux.Router) error { // type: boolean // description: do not include root file-system changes when exporting // - in: query + // name: ignoreVolumes + // type: boolean + // description: do not include associated volumes. can only be used with export + // - in: query // name: printStats // type: boolean // description: add checkpoint statistics to the returned CheckpointReport @@ -1501,6 +1505,10 @@ func (s *APIServer) registerContainersHandlers(r *mux.Router) error { // type: boolean // description: do not include root file-system changes when exporting // - in: query + // name: ignoreVolumes + // type: boolean + // description: do not restore associated volumes. can only be used with import + // - in: query // name: ignoreStaticIP // type: boolean // description: ignore IP address if set statically From 32d80378ecd3b857f187f25b3bf85b0ffa7be3b7 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Mon, 28 Nov 2022 17:38:54 +0100 Subject: [PATCH 3/4] Document that ignoreRootFS depends on export/import As described in the man page, ignoreRootFS only works with a tar.gz. [NO NEW TESTS NEEDED] Signed-off-by: Jelle van der Waa --- pkg/api/server/register_containers.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/api/server/register_containers.go b/pkg/api/server/register_containers.go index d45eb2318d..8099d63e35 100644 --- a/pkg/api/server/register_containers.go +++ b/pkg/api/server/register_containers.go @@ -1453,7 +1453,7 @@ func (s *APIServer) registerContainersHandlers(r *mux.Router) error { // - in: query // name: ignoreRootFS // type: boolean - // description: do not include root file-system changes when exporting + // description: do not include root file-system changes when exporting. can only be used with export // - in: query // name: ignoreVolumes // type: boolean @@ -1503,7 +1503,7 @@ func (s *APIServer) registerContainersHandlers(r *mux.Router) error { // - in: query // name: ignoreRootFS // type: boolean - // description: do not include root file-system changes when exporting + // description: do not include root file-system changes when exporting. can only be used with import // - in: query // name: ignoreVolumes // type: boolean From cb96eac45b7fb2d044a365dfa91d5a22d011d94d Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Mon, 28 Nov 2022 20:17:25 +0100 Subject: [PATCH 4/4] Add missing parameters for checkpoint/restore endpoint Document the remaining missing options for container checkpoint and restore. [NO NEW TESTS NEEDED] Signed-off-by: Jelle van der Waa --- pkg/api/server/register_containers.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkg/api/server/register_containers.go b/pkg/api/server/register_containers.go index 8099d63e35..8097aa5c36 100644 --- a/pkg/api/server/register_containers.go +++ b/pkg/api/server/register_containers.go @@ -1459,6 +1459,18 @@ func (s *APIServer) registerContainersHandlers(r *mux.Router) error { // type: boolean // description: do not include associated volumes. can only be used with export // - in: query + // name: preCheckpoint + // type: boolean + // description: dump the container's memory information only, leaving the container running. only works on runc 1.0-rc or higher + // - in: query + // name: withPrevious + // type: boolean + // description: check out the container with previous criu image files in pre-dump. only works on runc 1.0-rc or higher + // - in: query + // name: fileLocks + // type: boolean + // description: checkpoint a container with filelocks + // - in: query // name: printStats // type: boolean // description: add checkpoint statistics to the returned CheckpointReport @@ -1517,6 +1529,10 @@ func (s *APIServer) registerContainersHandlers(r *mux.Router) error { // type: boolean // description: ignore MAC address if set statically // - in: query + // name: fileLocks + // type: boolean + // description: restore a container with file locks + // - in: query // name: printStats // type: boolean // description: add restore statistics to the returned RestoreReport