projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18346: Only disable websockets when all container mounts are by PDH
[arvados.git]
/
lib
/
crunchrun
/
crunchrun.go
diff --git
a/lib/crunchrun/crunchrun.go
b/lib/crunchrun/crunchrun.go
index 8f3a30203911187c28b71c405a92caac8cab14e5..33558b5d9b9135000e6d51ba13e8660cdea608f3 100644
(file)
--- a/
lib/crunchrun/crunchrun.go
+++ b/
lib/crunchrun/crunchrun.go
@@
-617,10
+617,15
@@
func (runner *ContainerRunner) SetupMounts() (map[string]bindmount, error) {
}
if pdhOnly {
}
if pdhOnly {
- arvMountCmd = append(arvMountCmd, "--mount-by-pdh", "by_id")
+ // If we are only mounting collections by pdh, make
+ // sure we don't subscribe to websocket events to
+ // avoid putting undesired load on the API server
+ arvMountCmd = append(arvMountCmd, "--mount-by-pdh", "by_id", "--disable-event-listening")
} else {
arvMountCmd = append(arvMountCmd, "--mount-by-id", "by_id")
}
} else {
arvMountCmd = append(arvMountCmd, "--mount-by-id", "by_id")
}
+ // the by_uuid mount point is used by singularity when writing
+ // out docker images converted to SIF
arvMountCmd = append(arvMountCmd, "--mount-by-id", "by_uuid")
arvMountCmd = append(arvMountCmd, runner.ArvMountPoint)
arvMountCmd = append(arvMountCmd, "--mount-by-id", "by_uuid")
arvMountCmd = append(arvMountCmd, runner.ArvMountPoint)