X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4879256386a5be9566f31f2c266b682993029e14..c3d26486e5d4e4bd11964285a6fece4897120cf8:/lib/crunchrun/executor.go

diff --git a/lib/crunchrun/executor.go b/lib/crunchrun/executor.go
index f4feaa06c2..29abab631f 100644
--- a/lib/crunchrun/executor.go
+++ b/lib/crunchrun/executor.go
@@ -4,9 +4,10 @@
 package crunchrun
 
 import (
+	"context"
 	"io"
 
-	"golang.org/x/net/context"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
 )
 
 type bindmount struct {
@@ -15,31 +16,29 @@ type bindmount struct {
 }
 
 type containerSpec struct {
-	Image         string
-	VCPUs         int
-	RAM           int64
-	WorkingDir    string
-	Env           map[string]string
-	BindMounts    map[string]bindmount
-	Command       []string
-	EnableNetwork bool
-	NetworkMode   string // docker network mode, normally "default"
-	CgroupParent  string
-	Stdin         io.Reader
-	Stdout        io.Writer
-	Stderr        io.Writer
+	Image           string
+	VCPUs           int
+	RAM             int64
+	WorkingDir      string
+	Env             map[string]string
+	BindMounts      map[string]bindmount
+	Command         []string
+	EnableNetwork   bool
+	CUDADeviceCount int
+	NetworkMode     string // docker network mode, normally "default"
+	CgroupParent    string
+	Stdin           io.Reader
+	Stdout          io.Writer
+	Stderr          io.Writer
 }
 
 // containerExecutor is an interface to a container runtime
 // (docker/singularity).
 type containerExecutor interface {
-	// ImageLoaded determines whether the given image is already
-	// available to use without calling ImageLoad.
-	ImageLoaded(imageID string) bool
-
 	// ImageLoad loads the image from the given tarball such that
 	// it can be used to create/start a container.
-	LoadImage(filename string) error
+	LoadImage(imageID string, imageTarballPath string, container arvados.Container, keepMount string,
+		containerClient *arvados.Client) error
 
 	// Wait for the container process to finish, and return its
 	// exit code. If applicable, also remove the stopped container
@@ -52,12 +51,19 @@ 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 or
+	// negative if container is finished or no process has started
+	// yet)
+	Pid() int
 
 	// Stop the container immediately
 	Stop() error
 
 	// Release resources (temp dirs, stopped containers)
 	Close()
+
+	// Name and version of runtime engine ("docker 20.10.16", "singularity-ce version 3.9.9")
+	Runtime() string
+
+	GatewayTarget
 }