From 8fbe06b8cbd8e3bc425d83130d562eb0c19f309b Mon Sep 17 00:00:00 2001 From: "wuhua.ck" Date: Thu, 15 Apr 2021 22:36:50 +0800 Subject: add flag "--pidfile" for podman create/run Signed-off-by: chenkang --- libpod/container_config.go | 2 ++ libpod/oci_conmon_linux.go | 7 ++++++- libpod/options.go | 11 +++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) (limited to 'libpod') diff --git a/libpod/container_config.go b/libpod/container_config.go index be24b54d6..e6c3be1bd 100644 --- a/libpod/container_config.go +++ b/libpod/container_config.go @@ -364,4 +364,6 @@ type ContainerMiscConfig struct { Timezone string `json:"timezone,omitempty"` // Umask is the umask inside the container. Umask string `json:"umask,omitempty"` + // PidFile is the file that saves the pid of the container process + PidFile string `json:"pid_file,omitempty"` } diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 5e8ed12e7..c5735d114 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -1025,7 +1025,12 @@ func (r *ConmonOCIRuntime) createOCIContainer(ctr *Container, restoreOptions *Co } } - args := r.sharedConmonArgs(ctr, ctr.ID(), ctr.bundlePath(), filepath.Join(ctr.state.RunDir, "pidfile"), ctr.LogPath(), r.exitsDir, ociLog, ctr.LogDriver(), logTag) + pidfile := ctr.config.PidFile + if pidfile == "" { + pidfile = filepath.Join(ctr.state.RunDir, "pidfile") + } + + args := r.sharedConmonArgs(ctr, ctr.ID(), ctr.bundlePath(), pidfile, ctr.LogPath(), r.exitsDir, ociLog, ctr.LogDriver(), logTag) if ctr.config.Spec.Process.Terminal { args = append(args, "-t") diff --git a/libpod/options.go b/libpod/options.go index 333a7c4a5..5cd0f7b88 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -1692,6 +1692,17 @@ func WithSecrets(secretNames []string) CtrCreateOption { } } +// WithPidFile adds pidFile to the container +func WithPidFile(pidFile string) CtrCreateOption { + return func(ctr *Container) error { + if ctr.valid { + return define.ErrCtrFinalized + } + ctr.config.PidFile = pidFile + return nil + } +} + // Pod Creation Options // WithInfraImage sets the infra image for libpod. -- cgit v1.2.3-54-g00ecf From b963a5eb4a62688d3fc5c11815bc626055201187 Mon Sep 17 00:00:00 2001 From: chenkang Date: Sat, 17 Apr 2021 20:55:57 +0800 Subject: add pidfile in inspection Signed-off-by: chenkang --- libpod/container_inspect.go | 1 + libpod/define/container_inspect.go | 1 + 2 files changed, 2 insertions(+) (limited to 'libpod') diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index e0569e2d4..57968039f 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -141,6 +141,7 @@ func (c *Container) getContainerInspectData(size bool, driverData *define.Driver Mounts: inspectMounts, Dependencies: c.Dependencies(), IsInfra: c.IsInfra(), + PidFile: config.PidFile, } if c.state.ConfigPath != "" { diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go index 0f355d20a..126ce85a6 100644 --- a/libpod/define/container_inspect.go +++ b/libpod/define/container_inspect.go @@ -647,6 +647,7 @@ type InspectContainerData struct { IsInfra bool `json:"IsInfra"` Config *InspectContainerConfig `json:"Config"` HostConfig *InspectContainerHostConfig `json:"HostConfig"` + PidFile string `json:"PidFile"` } // InspectExecSession contains information about a given exec session. -- cgit v1.2.3-54-g00ecf From 728b73d7c4186f4f0f9431d84ec2c5883f38ff20 Mon Sep 17 00:00:00 2001 From: chenkang Date: Sat, 17 Apr 2021 21:15:08 +0800 Subject: set pidfile default value int containerconfig Signed-off-by: chenkang --- libpod/oci_conmon_linux.go | 7 +------ libpod/runtime_ctr.go | 4 ++++ 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'libpod') diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index c5735d114..dbe91c232 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -1025,12 +1025,7 @@ func (r *ConmonOCIRuntime) createOCIContainer(ctr *Container, restoreOptions *Co } } - pidfile := ctr.config.PidFile - if pidfile == "" { - pidfile = filepath.Join(ctr.state.RunDir, "pidfile") - } - - args := r.sharedConmonArgs(ctr, ctr.ID(), ctr.bundlePath(), pidfile, ctr.LogPath(), r.exitsDir, ociLog, ctr.LogDriver(), logTag) + args := r.sharedConmonArgs(ctr, ctr.ID(), ctr.bundlePath(), ctr.config.PidFile, ctr.LogPath(), r.exitsDir, ociLog, ctr.LogDriver(), logTag) if ctr.config.Spec.Process.Terminal { args = append(args, "-t") diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index f9b5c5c51..6290479a8 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -366,6 +366,10 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (_ *Contai ctr.config.ConmonPidFile = filepath.Join(ctr.state.RunDir, "conmon.pid") } + if ctr.config.PidFile == "" { + ctr.config.PidFile = filepath.Join(ctr.state.RunDir, "pidfile") + } + // Go through named volumes and add them. // If they don't exist they will be created using basic options. // Maintain an array of them - we need to lock them later. -- cgit v1.2.3-54-g00ecf From a1002beb78e3a63c0704f5cd8f6ff6556e60bb2f Mon Sep 17 00:00:00 2001 From: chenkang Date: Sat, 17 Apr 2021 23:35:27 +0800 Subject: fix start it Signed-off-by: chenkang --- libpod/container_inspect.go | 2 +- libpod/define/container_inspect.go | 2 +- test/e2e/start_test.go | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'libpod') diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index 57968039f..61cc43314 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -128,6 +128,7 @@ func (c *Container) getContainerInspectData(size bool, driverData *define.Driver StaticDir: config.StaticDir, OCIRuntime: config.OCIRuntime, ConmonPidFile: config.ConmonPidFile, + PidFile: config.PidFile, Name: config.Name, RestartCount: int32(runtimeInfo.RestartCount), Driver: driverData.Name, @@ -141,7 +142,6 @@ func (c *Container) getContainerInspectData(size bool, driverData *define.Driver Mounts: inspectMounts, Dependencies: c.Dependencies(), IsInfra: c.IsInfra(), - PidFile: config.PidFile, } if c.state.ConfigPath != "" { diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go index 126ce85a6..1a38f5b0a 100644 --- a/libpod/define/container_inspect.go +++ b/libpod/define/container_inspect.go @@ -627,6 +627,7 @@ type InspectContainerData struct { OCIConfigPath string `json:"OCIConfigPath,omitempty"` OCIRuntime string `json:"OCIRuntime,omitempty"` ConmonPidFile string `json:"ConmonPidFile"` + PidFile string `json:"PidFile"` Name string `json:"Name"` RestartCount int32 `json:"RestartCount"` Driver string `json:"Driver"` @@ -647,7 +648,6 @@ type InspectContainerData struct { IsInfra bool `json:"IsInfra"` Config *InspectContainerConfig `json:"Config"` HostConfig *InspectContainerHostConfig `json:"HostConfig"` - PidFile string `json:"PidFile"` } // InspectExecSession contains information about a given exec session. diff --git a/test/e2e/start_test.go b/test/e2e/start_test.go index d5d12fc71..cb2db0810 100644 --- a/test/e2e/start_test.go +++ b/test/e2e/start_test.go @@ -219,6 +219,7 @@ var _ = Describe("Podman start", func() { cid := session.OutputToString() session = podmanTest.Podman([]string{"start", cid}) + session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) readFirstLine := func(path string) string { content, err := ioutil.ReadFile(path) -- cgit v1.2.3-54-g00ecf From a35e16c23456a8fba8d2f627ac64f647aa6f0722 Mon Sep 17 00:00:00 2001 From: chenkang Date: Sun, 18 Apr 2021 00:02:50 +0800 Subject: support pidfile on container restore Signed-off-by: chenkang --- libpod/runtime_ctr.go | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'libpod') diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 6290479a8..0acf88cbc 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -69,6 +69,13 @@ func (r *Runtime) RestoreContainer(ctx context.Context, rSpec *spec.Spec, config ctr.config.ConmonPidFile = "" } + // If the path to PidFile starts with the default value (RunRoot), then + // the user has not specified '--pidfile' during run or create (probably). + // In that case reset PidFile to be set to the default value later. + if strings.HasPrefix(ctr.config.PidFile, r.storageConfig.RunRoot) { + ctr.config.PidFile = "" + } + return r.setupContainer(ctx, ctr) } -- cgit v1.2.3-54-g00ecf