proto: spoof out oom exit paths

Signed-off-by: Peter Hunt <pehunt@redhat.com>
containers · May 4, 2022 · 22a1616 · 22a1616
1 parent 54978f7
commit 22a1616
Show file tree

Hide file tree

Showing 3 changed files with 163 additions and 131 deletions.
diff --git a/conmon-rs/common/proto/conmon.capnp b/conmon-rs/common/proto/conmon.capnp
@@ -21,7 +21,8 @@ interface Conmon {
         bundlePath @1 :Text;
         terminal @2 :Bool;
         exitPaths @3 :List(Text);
-        logDrivers @4 :List(LogDriver);
+        oomExitPaths @4 :List(Text);
+        logDrivers @5 :List(LogDriver);
     }
 
     struct LogDriver {

diff --git a/internal/proto/conmon.capnp.go b/internal/proto/conmon.capnp.go
diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -404,6 +404,9 @@ type CreateContainerConfig struct {
 	// ExitPaths is a slice of paths to write the exit statuses.
 	ExitPaths []string
 
+	// OOMExitPaths is a slice of files that should be created if the given container is OOM killed.
+	OOMExitPaths []string
+
 	// LogDrivers is a slice of selected log drivers.
 	LogDrivers []LogDriver
 }
@@ -458,6 +461,9 @@ func (c *ConmonClient) CreateContainer(
 		if err := stringSliceToTextList(cfg.ExitPaths, req.NewExitPaths); err != nil {
 			return fmt.Errorf("convert string slice to text list: %w", err)
 		}
+		if err := stringSliceToTextList(cfg.OOMExitPaths, req.NewOomExitPaths); err != nil {
+			return err
+		}
 
 		if err := c.initLogDrivers(&req, cfg.LogDrivers); err != nil {
 			return fmt.Errorf("init log drivers: %w", err)