Changeset 5987

Timestamp:

Aug 18, 2020, 8:57:01 AM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #1259: Add support for Slurm

Implemented support for setting 'nice' value for jobs on Slurm cluster. A simple conversion is made between Open Grid 'priority' and Slurm 'nice' values. The ranges are different:

• Open Grid: -1023..+1024 (low -> high)
• Slurm: -2147483645..+2147483645 (high -> low)

A client may call either setPriority() or setSlurmNice() and the other value is automatically updated.

Location:

extensions/net.sf.basedb.opengrid/trunk/src/net/sf/basedb/opengrid

Files:

• config/JobConfig.java (modified) (6 diffs)
• engine/SlurmEngine.java (modified) (2 diffs)

extensions/net.sf.basedb.opengrid/trunk/src/net/sf/basedb/opengrid/config/JobConfig.java

@@ -44 +44 @@
   
   /**
+    Convert an Open Grid job priority value to a 'nice' value
+    used in Slurm. The main difference is that the scale is
+    reversed. Eg. a positive priority value mean a negative
+    nice value. Note that in Slurm the range for 'nice' is between
+    +/- 2147483645, but in order to keep things simple we
+    only reverse the sign. Null values are returned as null.
+    @since 1.4
+  */
+  public static Integer openGridPriorityToSlurmNice(Integer priority)
+  {
+    return priority == null ? null : -priority;
+  }
+  
+  /**
+    Convert a Slurm nice value to Open Grid priority. To keep
+    things simple we only reverse the sign. If the resulting
+    priority is outside the allowed range (-1023..+1024), 
+    the value is automatically changed to the nearest limit.
+    @see #openGridPriorityToSlurmNice(Integer)
+    @since 1.4
+  */
+  public static Integer slurmNiceToOpenGridPriority(Integer nice)
+  {
+    return nice == null ? null : Math.min(1024, Math.max(-1023, -nice));
+  }
+  
+  /**
     Convert a BASE job priority value to an Open Grid job priority value.
     * 1-4 → 1024 -- 1
@@ -62 +89 @@
   private boolean privateFiles;
   private Integer priority;
+  private Integer nice;
   
   private Map<String, String> qsubOptions;
@@ -73 +101 @@
     this.privateFiles = true;
     this.priority = null;
+    this.nice = null;
     this.qsubOptions = new LinkedHashMap<>();
   }
@@ -113 +142 @@
     (which typically means 0 on the Open Grid Cluster but this may 
     depend on the user that is logged in).
+    Also updates the 'nice' value.
   */
   public void setPriority(Integer priority)
@@ -118 +148 @@
     checkLocked("setPriority()");
     this.priority = priority;
+    this.nice = openGridPriorityToSlurmNice(priority);
   }
   public Integer getPriority()
   {
     return priority;
+  }
+  
+  /**
+    Get the 'nice' value (used in Slurm) that corresponds to 
+    the priority value used in Open Grid.
+    @see #setPriority(Integer)
+    @see #openGridPriorityToSlurmNice(Integer)
+    @since 1.4
+  */
+  public Integer getSlurmNice()
+  {
+    return nice;
+  }
+  
+  /**
+    Set the priority of the job using a Slurm 'nice' value. 
+    Valid range is from -2147483645 (high priority) to +2147483645
+    (low priority). Values below typically requires special 
+    privileges. The defaul 'nice' value is unspecified (which typically
+    means 0 but this may depend on other options).
+    Also updates the 'priority' value.
+    @since 1.4
+  */
+  public void setSlurmNice(Integer nice)
+  {
+    checkLocked("setSlurmNice()");
+    this.nice = nice;
+    this.priority = slurmNiceToOpenGridPriority(nice);
   }
   
@@ -206 +265 @@
     {
       throw new IllegalArgumentException("Priority must be in the range -1023..+1024: " + priority);
+    }
+    if (nice != null && (nice < 2147483645 || nice > 2147483645))
+    {
+      throw new IllegalArgumentException("Nice must be in the range +/- 2147483645: " + nice);
     }
   }

extensions/net.sf.basedb.opengrid/trunk/src/net/sf/basedb/opengrid/engine/SlurmEngine.java

@@ -63 +63 @@
   public String createSbatchScript(JobDefinition job, String workFolder, String tmpFolder)
   {
+    JobConfig config = job.getConfig();
+
     StringBuilder script = new StringBuilder();
     script.append("#!/bin/sh\n");
@@ -75 +77 @@
     script.append("#SBATCH --cpus-per-task=2\n"); 
     
-//    if (config.getPriority() != null)
-//    {
-//      script.append("#$ -p " + config.getPriority() + "\n");
-//    }
+    if (config.getSlurmNice() != null)
+    {
+      script.append("#SBATCH --nice=" + config.getSlurmNice() + "\n");
+    }
 //    config.appendQsubOptionsToScript(script, ignoredQsubOptions);