mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-10 12:32:03 +00:00
Merge pull request #123886 from adrianreber/2024-03-12-criu-not-found
Handle containerd "CRIU not found" error message
This commit is contained in:
commit
de1674829c
@ -217,6 +217,9 @@ var _ = SIGDescribe("Checkpoint Container", nodefeature.CheckpointContainer, fun
|
|||||||
// or
|
// or
|
||||||
// '(rpc error: code = Unknown desc = checkpoint/restore support not available)'
|
// '(rpc error: code = Unknown desc = checkpoint/restore support not available)'
|
||||||
// if the container engine explicitly disabled the checkpoint/restore support
|
// if the container engine explicitly disabled the checkpoint/restore support
|
||||||
|
// or
|
||||||
|
// '(rpc error: code = Unknown desc = CRIU binary not found or too old (<31600). Failed to checkpoint container'
|
||||||
|
// if the CRIU binary was not found if it is too old
|
||||||
if (int(statusError.ErrStatus.Code)) == http.StatusInternalServerError {
|
if (int(statusError.ErrStatus.Code)) == http.StatusInternalServerError {
|
||||||
if strings.Contains(
|
if strings.Contains(
|
||||||
statusError.ErrStatus.Message,
|
statusError.ErrStatus.Message,
|
||||||
@ -239,6 +242,13 @@ var _ = SIGDescribe("Checkpoint Container", nodefeature.CheckpointContainer, fun
|
|||||||
ginkgo.Skip("Container engine does not implement 'CheckpointContainer'")
|
ginkgo.Skip("Container engine does not implement 'CheckpointContainer'")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if strings.Contains(
|
||||||
|
statusError.ErrStatus.Message,
|
||||||
|
"(rpc error: code = Unknown desc = CRIU binary not found or too old (<31600). Failed to checkpoint container",
|
||||||
|
) {
|
||||||
|
ginkgo.Skip("Container engine reports missing or too old CRIU binary")
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
framework.Failf(
|
framework.Failf(
|
||||||
"Unexpected status code (%d) during 'CheckpointContainer': %q",
|
"Unexpected status code (%d) during 'CheckpointContainer': %q",
|
||||||
|
Loading…
Reference in New Issue
Block a user