Changed name of jobs submitted to cluster job runners
-- Added 'jobRunnerJobName' definition to QFunction, defaults to value of shortDescription -- Edited Lsf and Drmaa JobRunners to use this string instead of description for naming jobs in the scheduler Signed-off-by: Joel Thibault <thibault@broadinstitute.org>
This commit is contained in:
parent
adb939521a
commit
296bcc7fb1
|
|
@ -50,7 +50,7 @@ class DrmaaJobRunner(val session: Session, val function: CommandLineFunction) ex
|
|||
session.synchronized {
|
||||
val drmaaJob: JobTemplate = session.createJobTemplate
|
||||
|
||||
drmaaJob.setJobName(function.description.take(jobNameLength).replaceAll(jobNameFilter, "_"))
|
||||
drmaaJob.setJobName(function.jobRunnerJobName.take(jobNameLength).replaceAll(jobNameFilter, "_"))
|
||||
|
||||
// Set the current working directory
|
||||
drmaaJob.setWorkingDirectory(function.commandDirectory.getPath)
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ class Lsf706JobRunner(val function: CommandLineFunction) extends CommandLineJobR
|
|||
for (i <- 0 until LibLsf.LSF_RLIM_NLIMITS)
|
||||
request.rLimits(i) = LibLsf.DEFAULT_RLIMIT;
|
||||
|
||||
request.jobName = function.description.take(LibBat.MAX_JOB_NAME_LEN)
|
||||
request.jobName = function.jobRunnerJobName.take(LibBat.MAX_JOB_NAME_LEN)
|
||||
request.options |= LibBat.SUB_JOB_NAME
|
||||
|
||||
// Set the output file for stdout
|
||||
|
|
|
|||
|
|
@ -150,6 +150,11 @@ trait QFunction extends Logging with QJobReport {
|
|||
case _ => analysisName
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The name of the job as submitted to the job runner
|
||||
*/
|
||||
def jobRunnerJobName = shortDescription
|
||||
|
||||
/**
|
||||
* Returns true if the function is done.
|
||||
|
|
|
|||
Loading…
Reference in New Issue