Default to one core when none are requested

nimbusproject · Mar 2, 2011 · 077537a · 077537a
1 parent 7201554
commit 077537a
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/...ce/java/source/src/org/globus/workspace/scheduler/defaults/pilot/PilotSlotManagement.java b/...ce/java/source/src/org/globus/workspace/scheduler/defaults/pilot/PilotSlotManagement.java
@@ -613,7 +613,7 @@ public Reservation reserveCoscheduledSpace(NodeRequest[] requests,
      *        than one VM is mapped to the same node, the returned node
      *        assignment array will include duplicates.
      * @param memory megabytes needed
-     * @param cores needed
+     * @param requestedCores needed
      * @param duration seconds needed
      * @param uuid group ID, can not be null if vmids is length > 1
      * @param creatorDN the DN of the user who requested creation of the VM
@@ -622,7 +622,7 @@ public Reservation reserveCoscheduledSpace(NodeRequest[] requests,
      */
     private void reserveSpace(final int[] vmids,
                               final int memory,
-                              final int cores,
+                              final int requestedCores,
                               final int duration,
                               final String uuid,
                               final String creatorDN)
@@ -640,6 +640,16 @@ private void reserveSpace(final int[] vmids,
             throw new ResourceRequestDeniedException(msg);
         }
 
+        // When there is no core request, the default is -1,
+        // we would actually like one core.
+        int cores;
+        if (requestedCores <= 0) {
+            cores = 1;
+        }
+        else {
+            cores = requestedCores;
+        }
+
         if (vmids.length > 1 && uuid == null) {
             logger.error("cannot make group space request without group ID");
             throw new ResourceRequestDeniedException("internal " +