From f9ff0525c5fea21bdf8ed398547f861211249a83 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Thu, 14 Oct 2021 14:08:51 -0400
Subject: Don't include ctr.log if not using file logging
Checkpoint is blowing up when you use --log-driver=none
[NO NEW TESTS NEEDED] No way currently to test checkpoint restore.
Fixes: https://github.com/containers/podman/issues/11974
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
libpod/container_internal_linux.go | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'libpod')
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index f652a3ebb..d8385961f 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -1008,12 +1008,15 @@ func (c *Container) exportCheckpoint(options ContainerCheckpointOptions) error {
includeFiles := []string{
"artifacts",
- "ctr.log",
metadata.ConfigDumpFile,
metadata.SpecDumpFile,
metadata.NetworkStatusFile,
}
+ if c.LogDriver() == define.KubernetesLogging ||
+ c.LogDriver() == define.JSONLogging {
+ includeFiles = append(includeFiles, "ctr.log")
+ }
if options.PreCheckPoint {
includeFiles = append(includeFiles, preCheckpointDir)
} else {
--
cgit v1.2.3-54-g00ecf