projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15397: Remove code, configs, and docs for hosted git repo feature.
[arvados.git]
/
lib
/
crunchrun
/
singularity.go
diff --git
a/lib/crunchrun/singularity.go
b/lib/crunchrun/singularity.go
index 1da401f859f94b36655f771e5fea5af750b0cbe7..fd26297713c4a77b084d58e72512f6c22b1e670e 100644
(file)
--- a/
lib/crunchrun/singularity.go
+++ b/
lib/crunchrun/singularity.go
@@
-6,6
+6,7
@@
package crunchrun
import (
"bytes"
import (
"bytes"
+ "context"
"errors"
"fmt"
"io/ioutil"
"errors"
"fmt"
"io/ioutil"
@@
-21,7
+22,6
@@
import (
"time"
"git.arvados.org/arvados.git/sdk/go/arvados"
"time"
"git.arvados.org/arvados.git/sdk/go/arvados"
- "golang.org/x/net/context"
)
type singularityExecutor struct {
)
type singularityExecutor struct {
@@
-353,8
+353,9
@@
func (e *singularityExecutor) Start() error {
return nil
}
return nil
}
-func (e *singularityExecutor) CgroupID() string {
- return ""
+func (e *singularityExecutor) Pid() int {
+ // see https://dev.arvados.org/issues/17244#note-21
+ return 0
}
func (e *singularityExecutor) Stop() error {
}
func (e *singularityExecutor) Stop() error {