Merge branch 'master' into skip_gpu_reservation

Author: anton-ubi

cuebot/src/main/java/com/imageworks/spcue/DispatchFrame.java

@@ -50,13 +50,13 @@ public class DispatchFrame extends FrameEntity implements FrameInterface {
     // The Operational System this frame is expected to run in
     public String os;
 
-    // Memory requirement for this frame in bytes
+    // Memory requirement for this frame in Kb
     private long minMemory;
 
-    // Soft limit to be enforced for this frame in bytes
+    // Soft limit to be enforced for this frame in Kb
     public long softMemoryLimit;
 
-    // Hard limit to be enforced for this frame in bytes
+    // Hard limit to be enforced for this frame in Kb
     public long hardMemoryLimit;
 
     public void setMinMemory(long minMemory) {

cuebot/src/main/java/com/imageworks/spcue/DispatchHost.java

@@ -30,6 +30,7 @@ public class DispatchHost extends Entity
 
     public String facilityId;
     public String allocationId;
+    public String allocationName;
     public LockState lockState;
     public HardwareState hardwareState;
 

cuebot/src/main/java/com/imageworks/spcue/SortableShow.java

@@ -27,19 +27,25 @@ public class SortableShow implements Comparable<SortableShow> {
 
     private static final Logger logger = LogManager.getLogger(SortableShow.class);
 
-    private String show;
+    private String show_id;
+    private String show_name;
     private float tier;
 
     private Map<String, long[]> failed = new ConcurrentHashMap<String, long[]>();
     private Set<AllocationInterface> failedAllocs = new HashSet<AllocationInterface>();
 
-    public SortableShow(String show, float value) {
-        this.show = show;
+    public SortableShow(String show_id, String show_name, float value) {
+        this.show_id = show_id;
+        this.show_name = show_name;
         this.tier = value;
     }
 
+    public String getShowName() {
+        return show_name;
+    }
+
     public String getShowId() {
-        return show;
+        return show_id;
     }
 
     public float getValue() {
@@ -96,7 +102,7 @@ public int compareTo(SortableShow o) {
 
     @Override
     public int hashCode() {
-        return show.hashCode();
+        return show_id.hashCode();
     };
 
     @Override

cuebot/src/main/java/com/imageworks/spcue/dao/postgres/DispatchQuery.java

@@ -1244,12 +1244,16 @@ private static final String replaceQueryForFifo(String query) {
         "SELECT " +
             "vs_waiting.pk_show, " +
             "s.float_tier, " +
-            "s.int_burst " +
+            "s.int_burst, " +
+            "show.str_name as str_show_name " +
         "FROM " +
             "subscription s, " +
-            "vs_waiting " +
+            "vs_waiting, " +
+            "show " +
         "WHERE " +
             "vs_waiting.pk_show = s.pk_show " +
+        "AND " +
+            "s.pk_show = show.pk_show " +
         "AND " +
             "s.pk_alloc = ? " +
         "AND " +

cuebot/src/main/java/com/imageworks/spcue/dao/postgres/DispatcherDaoJdbc.java

@@ -72,7 +72,8 @@ public String mapRow(ResultSet rs, int rowNum) throws SQLException {
 
     private static final RowMapper<SortableShow> SHOW_MAPPER = new RowMapper<SortableShow>() {
         public SortableShow mapRow(ResultSet rs, int rowNum) throws SQLException {
-            return new SortableShow(rs.getString("pk_show"), rs.getFloat("float_tier"));
+            return new SortableShow(rs.getString("pk_show"), rs.getString("str_show_name"),
+                    rs.getFloat("float_tier"));
         }
     };
 
@@ -120,11 +121,25 @@ public List<SortableShow> getShows() {
      * Choose between different scheduling strategies
      */
     private SchedulingMode schedulingMode;
+    private Set<String> exclusionList;
 
     @Autowired
     public DispatcherDaoJdbc(Environment env) {
         this.schedulingMode = SchedulingMode.valueOf(
                 env.getProperty("dispatcher.scheduling_mode", String.class, "PRIORITY_ONLY"));
+
+        // Parse the exclusion list from environment variable
+        // Expected format: "show1:allocation1,show2:allocation2"
+        String exclusionListStr = env.getProperty("dispatcher.exclusion_list", String.class, "");
+        this.exclusionList = new LinkedHashSet<String>();
+        if (!exclusionListStr.isEmpty()) {
+            for (String item : exclusionListStr.split(",")) {
+                String trimmedItem = item.trim();
+                if (!trimmedItem.isEmpty()) {
+                    this.exclusionList.add(trimmedItem);
+                }
+            }
+        }
     }
 
     @Override
@@ -178,8 +193,23 @@ private Set<String> findDispatchJobs(DispatchHost host, int numJobs, boolean shu
         }
 
         long loopTime = System.currentTimeMillis();
+        // Filter out shows/allocs that are being dispatched by the new scheduler
+        // A list of show_name:alloc_name is read from the env to define which jobs
+        // should not be dispatched by Cuebot's dispatcher
         for (SortableShow s : shows) {
             long lastTime = System.currentTimeMillis();
+
+            // Check if this show:allocation combination is in the exclusion list
+            if (!exclusionList.isEmpty()) {
+                String showName = s.getShowName();
+                String exclusionKey = showName + ":" + host.allocationName;
+                if (exclusionList.contains(exclusionKey)) {
+                    logger.info("skipping show " + showName + " on allocation "
+                            + host.allocationName + " due to exclusion list");
+                    continue;
+                }
+            }
+
             if (s.isSkipped(host.tags, (long) host.cores, host.memory)) {
                 logger.info("skipping show " + s.getShowId());
                 continue;