Merge pull request #423 from broadinstitute/jt_pdexheimer_patch

Changed name of jobs submitted to cluster job runners

public/scala/src/org/broadinstitute/sting/queue/engine/drmaa/DrmaaJobRunner.scala

@@ -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)

public/scala/src/org/broadinstitute/sting/queue/engine/lsf/Lsf706JobRunner.scala

@@ -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

public/scala/src/org/broadinstitute/sting/queue/function/QFunction.scala

@@ -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.