containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15909 from cdoern/restore 

fix restore API endpoint
This commit is contained in:
OpenShift Merge Robot 2022-09-29 23:02:00 +02:00 committed by GitHub
parent 9cdd8964ad 2478e32ca3
commit 61068649fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/handlers/libpod/containers.go
View File

@ -305,6 +305,7 @@ func Restore(w http.ResponseWriter, r *http.Request) {
PrintStats bool `schema:"printStats"` PrintStats bool `schema:"printStats"`
FileLocks bool `schema:"fileLocks"` FileLocks bool `schema:"fileLocks"`
PublishPorts string `schema:"publishPorts"` PublishPorts string `schema:"publishPorts"`
Pod string `schema:"pod"`
}{ }{
// override any golang type defaults // override any golang type defaults
} }
@ -324,6 +325,7 @@ func Restore(w http.ResponseWriter, r *http.Request) {
PrintStats: query.PrintStats, PrintStats: query.PrintStats,
FileLocks: query.FileLocks, FileLocks: query.FileLocks,
PublishPorts: strings.Fields(query.PublishPorts), PublishPorts: strings.Fields(query.PublishPorts),
Pod: query.Pod,
} }
var names []string var names []string

4
pkg/api/server/register_containers.go
View File

@ -1516,6 +1516,10 @@ func (s *APIServer) registerContainersHandlers(r *mux.Router) error {
// name: printStats // name: printStats
// type: boolean // type: boolean
// description: add restore statistics to the returned RestoreReport // description: add restore statistics to the returned RestoreReport
// - in: query
// name: pod
// type: string
// description: pod to restore into
// produces: // produces:
// - application/json // - application/json
// responses: // responses:

4
test/e2e/checkpoint_test.go
View File

@ -1170,10 +1170,6 @@ var _ = Describe("Podman checkpoint", func() {
share := share // copy into local scope, for use inside function share := share // copy into local scope, for use inside function
It(testName, func() { It(testName, func() {
if podmanTest.Host.Distribution == "ubuntu" && IsRemote() {
Skip("FIXME: #15018. Cannot restore --pod under cgroupsV1 and remote")
}
if !criu.CheckForCriu(criu.PodCriuVersion) { if !criu.CheckForCriu(criu.PodCriuVersion) {
Skip("CRIU is missing or too old.") Skip("CRIU is missing or too old.")
} }