projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '13517-buffer-leak'
[arvados.git]
/
services
/
crunch-dispatch-slurm
/
crunch-dispatch-slurm.go
diff --git
a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index e3801df41bce1f1d1801e0a45b39cd808434ab3c..9e3baab95080d8e578792b8cf4ab1beff15d4425 100644
(file)
--- a/
services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
+++ b/
services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
@@
-202,7
+202,7
@@
func (disp *Dispatcher) checkSqueueForOrphans() {
}
}
}
}
-func (disp *Dispatcher) s
batchArgs(container arvados.Container) ([]string, error)
{
+func (disp *Dispatcher) s
lurmConstraintArgs(container arvados.Container) []string
{
mem := int64(math.Ceil(float64(container.RuntimeConstraints.RAM+container.RuntimeConstraints.KeepCacheRAM+disp.ReserveExtraRAM) / float64(1048576)))
var disk int64
mem := int64(math.Ceil(float64(container.RuntimeConstraints.RAM+container.RuntimeConstraints.KeepCacheRAM+disp.ReserveExtraRAM) / float64(1048576)))
var disk int64
@@
-212,32
+212,33
@@
func (disp *Dispatcher) sbatchArgs(container arvados.Container) ([]string, error
}
}
disk = int64(math.Ceil(float64(disk) / float64(1048576)))
}
}
disk = int64(math.Ceil(float64(disk) / float64(1048576)))
-
- var args []string
- args = append(args, disp.SbatchArguments...)
- args = append(args,
- fmt.Sprintf("--job-name=%s", container.UUID),
- fmt.Sprintf("--nice=%d", initialNiceValue))
-
- constraintArgs := []string{
+ return []string{
fmt.Sprintf("--mem=%d", mem),
fmt.Sprintf("--cpus-per-task=%d", container.RuntimeConstraints.VCPUs),
fmt.Sprintf("--tmp=%d", disk),
}
fmt.Sprintf("--mem=%d", mem),
fmt.Sprintf("--cpus-per-task=%d", container.RuntimeConstraints.VCPUs),
fmt.Sprintf("--tmp=%d", disk),
}
+}
+
+func (disp *Dispatcher) sbatchArgs(container arvados.Container) ([]string, error) {
+ var args []string
+ args = append(args, disp.SbatchArguments...)
+ args = append(args, "--job-name="+container.UUID, fmt.Sprintf("--nice=%d", initialNiceValue))
+
if disp.cluster == nil {
// no instance types configured
if disp.cluster == nil {
// no instance types configured
+ args = append(args, disp.slurmConstraintArgs(container)...)
} else if it, err := dispatchcloud.ChooseInstanceType(disp.cluster, &container); err == dispatchcloud.ErrInstanceTypesNotConfigured {
// ditto
} else if it, err := dispatchcloud.ChooseInstanceType(disp.cluster, &container); err == dispatchcloud.ErrInstanceTypesNotConfigured {
// ditto
+ args = append(args, disp.slurmConstraintArgs(container)...)
} else if err != nil {
return nil, err
} else {
// use instancetype constraint instead of slurm mem/cpu/tmp specs
} else if err != nil {
return nil, err
} else {
// use instancetype constraint instead of slurm mem/cpu/tmp specs
- constraintArgs = []string{"--constraint=instancetype=" + it.Name}
+ args = append(args, "--constraint=instancetype="+it.Name)
}
}
- args = append(args, constraintArgs...)
if len(container.SchedulingParameters.Partitions) > 0 {
if len(container.SchedulingParameters.Partitions) > 0 {
- args = append(args,
fmt.Sprintf("--partition=%s", strings.Join(container.SchedulingParameters.Partitions, ",")
))
+ args = append(args,
"--partition="+strings.Join(container.SchedulingParameters.Partitions, ","
))
}
return args, nil
}
return args, nil