Merge branch '21766-disk-cache-size'

[arvados.git] / lib / crunchrun / executor.go

diff --git a/lib/crunchrun/executor.go b/lib/crunchrun/executor.go
index b5b7884339152acab09778c689863afd2c062941..308b05cdeb33b529d46564658cdb5c6dcfc8b1af 100644 (file)
--- a/lib/crunchrun/executor.go
+++ b/lib/crunchrun/executor.go
@@ -4,10 +4,10 @@
 package crunchrun
 
 import (
+       "context"
        "io"
 
        "git.arvados.org/arvados.git/sdk/go/arvados"
-       "golang.org/x/net/context"
 )
 
 type bindmount struct {
@@ -51,8 +51,9 @@ type containerExecutor interface {
        // Start the container
        Start() error
 
-       // CID the container will belong to
-       CgroupID() string
+       // Process ID of a process in the container.  Return 0 if
+       // container is finished or no process has started yet.
+       Pid() int
 
        // Stop the container immediately
        Stop() error
@@ -60,7 +61,7 @@ type containerExecutor interface {
        // Release resources (temp dirs, stopped containers)
        Close()
 
-       // Name of runtime engine ("docker", "singularity")
+       // Name and version of runtime engine ("docker 20.10.16", "singularity-ce version 3.9.9")
        Runtime() string
 
        GatewayTarget