[ARVADOS] updated: 1.2.0-324-g9efc48dfc

[Git user]

Summary of changes:
 services/crunch-run/crunchrun.go | 83 ++++++++++++++++++++++++----------------
 1 file changed, 50 insertions(+), 33 deletions(-)

       via  9efc48dfc341b4d4e3143b01183d067d58b0b8ec (commit)
      from  b4f1614a50e00e7a0de718fce693b4ed4ea3a2bb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 9efc48dfc341b4d4e3143b01183d067d58b0b8ec
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Nov 9 11:36:01 2018 -0500

    14198: Add comment about different client objects used by runner
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 33eb5d02d..7247b339d 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -93,42 +93,59 @@ type PsProcess interface {
 // ContainerRunner is the main stateful struct used for a single execution of a
 // container.
 type ContainerRunner struct {
-	Docker               ThinDockerClient
+	Docker ThinDockerClient
+
+	// Dispatcher client is initialized with the Dispatcher token.
+	// This is a priviledged token used to manage container status
+	// and logs.
+	//
+	// We have both dispatcherClient and DispatcherArvClient
+	// because there are two different incompatible Arvados Go
+	// SDKs and we have to use both (hopefully this gets fixed in
+	// #14467)
 	dispatcherClient     *arvados.Client
-	containerClient      *arvados.Client
 	DispatcherArvClient  IArvadosClient
 	DispatcherKeepClient IKeepClient
-	ContainerArvClient   IArvadosClient
-	ContainerKeepClient  IKeepClient
-	Container            arvados.Container
-	ContainerConfig      dockercontainer.Config
-	HostConfig           dockercontainer.HostConfig
-	token                string
-	ContainerID          string
-	ExitCode             *int
-	NewLogWriter         NewLogWriter
-	loggingDone          chan bool
-	CrunchLog            *ThrottledLogger
-	Stdout               io.WriteCloser
-	Stderr               io.WriteCloser
-	logUUID              string
-	logMtx               sync.Mutex
-	LogCollection        arvados.CollectionFileSystem
-	LogsPDH              *string
-	RunArvMount          RunArvMount
-	MkTempDir            MkTempDir
-	ArvMount             *exec.Cmd
-	ArvMountPoint        string
-	HostOutputDir        string
-	Binds                []string
-	Volumes              map[string]struct{}
-	OutputPDH            *string
-	SigChan              chan os.Signal
-	ArvMountExit         chan error
-	SecretMounts         map[string]arvados.Mount
-	MkArvClient          func(token string) (IArvadosClient, IKeepClient, *arvados.Client, error)
-	finalState           string
-	parentTemp           string
+
+	// Container client is initialized with the Container token
+	// This token controls the permissions of the container, and
+	// must be used for operations such as reading collections.
+	//
+	// Same comment as above applies to
+	// containerClient/ContainerArvClient.
+	containerClient     *arvados.Client
+	ContainerArvClient  IArvadosClient
+	ContainerKeepClient IKeepClient
+
+	Container       arvados.Container
+	ContainerConfig dockercontainer.Config
+	HostConfig      dockercontainer.HostConfig
+	token           string
+	ContainerID     string
+	ExitCode        *int
+	NewLogWriter    NewLogWriter
+	loggingDone     chan bool
+	CrunchLog       *ThrottledLogger
+	Stdout          io.WriteCloser
+	Stderr          io.WriteCloser
+	logUUID         string
+	logMtx          sync.Mutex
+	LogCollection   arvados.CollectionFileSystem
+	LogsPDH         *string
+	RunArvMount     RunArvMount
+	MkTempDir       MkTempDir
+	ArvMount        *exec.Cmd
+	ArvMountPoint   string
+	HostOutputDir   string
+	Binds           []string
+	Volumes         map[string]struct{}
+	OutputPDH       *string
+	SigChan         chan os.Signal
+	ArvMountExit    chan error
+	SecretMounts    map[string]arvados.Mount
+	MkArvClient     func(token string) (IArvadosClient, IKeepClient, *arvados.Client, error)
+	finalState      string
+	parentTemp      string
 
 	ListProcesses func() ([]PsProcess, error)
 

-----------------------------------------------------------------------


hooks/post-receive
--