Merge pull request #149 from corindwyer/visibility-improvements

add tier resource numbers to no guaranteed capacity message

Author: corindwyer

fenzo-core/src/main/java/com/netflix/fenzo/AssignableVMs.java

@@ -162,14 +162,6 @@ private int addLeases(List<VirtualMachineLease> leases) {
         return rejected;
     }
 
-    // TODO Remove after confirming new VMCollection class is ready
-//    private void createAvmIfAbsent(String hostname) {
-//        if(virtualMachinesMap.get(hostname) == null)
-//            virtualMachinesMap.putIfAbsent(hostname,
-//                    new AssignableVirtualMachine(vmIdToHostnameMap, leaseIdToHostnameMap, hostname,
-//                            leaseRejectAction, leaseOfferExpirySecs, taskTracker, singleLeaseMode));
-//    }
-
     void expireLease(String leaseId) {
         final String hostname = leaseIdToHostnameMap.get(leaseId);
         if(hostname==null) {

fenzo-core/src/main/java/com/netflix/fenzo/ScaleDownConstraintEvaluator.java

@@ -18,10 +18,10 @@
 import java.util.Optional;
 
 /**
- * An evaluator that for each VM computes a score from 0 to 1, with 0 being the lowest, and 1 highest. Evaluation
- * equal to 0, means that the VM should not be terminated at all. To allow state sharing during evaluation of a
+ * An evaluator that for each VM computes a score from 0.0 to 1.0, with 0.0 being the lowest, and 1.0 highest. Evaluation
+ * equal to 0.0, means that the VM should not be terminated at all. To allow state sharing during evaluation of a
  * sequence of candidate VMs, an evaluator implementation specific context is provided on each invocation. A new
- * context value is returned as part of {@link Result}.
+ * context value is returned as part of the {@link Result}.
  */
 public interface ScaleDownConstraintEvaluator<CONTEXT> {
 
@@ -64,11 +64,11 @@ default String getName() {
     }
 
     /**
-     * Return score from 0 to 1 for a candidate VM to be terminating. The higher the score, the higher priority of
-     * the VM to get terminated. Value 0 means that it should not be terminated.
+     * Return score from 0.0 to 1.0 for a candidate VM to be terminating. The higher the score, the higher priority of
+     * the VM to get terminated. Value 0.0 means that it should not be terminated.
      *
      * @param candidate candidate VM to be removed
-     * @param context evaluator specific data, hold for single evaluation cycle. Initial value is set to Optional.empty().
+     * @param context evaluator specific data, held for single evaluation cycle. Initial value is set to Optional.empty().
      *                Evaluator should return new context as part of {@link Result} result. The new state will be passed
      *                during subsequent method invocation.
      *

fenzo-core/src/main/java/com/netflix/fenzo/VMCollection.java

@@ -43,7 +43,7 @@ class VMCollection {
 
     Collection<AssignableVirtualMachine> getAllVMs() {
         List<AssignableVirtualMachine> result = new LinkedList<>();
-        vms.values().forEach(m -> m.values().forEach(result::add));
+        vms.values().forEach(m -> result.addAll(m.values()));
         return result;
     }
 
@@ -175,7 +175,7 @@ boolean addLease(VirtualMachineLease l) {
 
     public int size() {
         final Optional<Integer> size = vms.values().stream().map(Map::size).reduce((i1, i2) -> i1 + i2);
-        return size.isPresent()? size.get() : 0;
+        return size.orElse(0);
     }
 
     public int size(String group) {

fenzo-core/src/main/java/com/netflix/fenzo/queues/tiered/QueueBucket.java

@@ -73,6 +73,10 @@ void setBucketGuarantees(ResAllocs bucketGuarantees) {
         updateEffectiveUsage();
     }
 
+    ResAllocs getBucketGuarantees() {
+        return bucketGuarantees;
+    }
+
     @Override
     public void queueTask(QueuableTask t) throws TaskQueueException {
         if (iterator != null)
@@ -178,6 +182,17 @@ public ResAllocs getEffectiveUsage() {
         return effectiveUsage;
     }
 
+    public String getBucketCapacityAsString() {
+        StringBuilder sb = new StringBuilder();
+        if (bucketGuarantees != null) {
+            sb.append("Bucket ").append(name).append(" Total Capacity: ").append(bucketGuarantees.getAsString());
+        }
+        if (effectiveUsage != null) {
+            sb.append("\nBucket ").append(name).append(" Used Capacity: ").append(effectiveUsage.getAsString());
+        }
+        return sb.toString();
+    }
+
     @Override
     public void reset() {
         iterator = null;

fenzo-core/src/main/java/com/netflix/fenzo/queues/tiered/Tier.java

@@ -16,18 +16,17 @@
 
 package com.netflix.fenzo.queues.tiered;
 
+import java.util.*;
+import java.util.function.BiFunction;
+
 import com.netflix.fenzo.AssignmentFailure;
 import com.netflix.fenzo.VMResource;
 import com.netflix.fenzo.queues.*;
-import com.netflix.fenzo.queues.TaskQueue;
 import com.netflix.fenzo.sla.ResAllocs;
 import com.netflix.fenzo.sla.ResAllocsUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
-import java.util.function.BiFunction;
-
 /**
  * This class represents a tier of the multi-tiered queue that {@link TieredQueue} represents. The tier holds one or
  * more buckets for queues, {@link QueueBucket} and maintains them in an order defined by the dynamic value for
@@ -133,8 +132,10 @@ public Assignable<QueuableTask> nextTaskToLaunch() throws TaskQueueException {
                     return taskOrFailure;
                 }
                 return Assignable.error(task, new AssignmentFailure(VMResource.ResAllocs, 0, 0, 0,
-                        "No guaranteed capacity left for queue " + bucket.getName()
-                                + ", and no spare capacity is available"));
+                        "No guaranteed capacity left for queue."
+                                + "\n" + bucket.getBucketCapacityAsString()
+                                + "\n" + getTierCapacityAsString()
+                ));
             }
         }
         return null;
@@ -270,6 +271,20 @@ private String getSortedListString() {
         return b.toString();
     }
 
+    private String getTierCapacityAsString() {
+        StringBuilder sb = new StringBuilder();
+        if (tierResources != null) {
+            sb.append("Tier ").append(tierNumber).append(" Total Capacity: ").append(tierResources.getAsString());
+        }
+        if (effectiveUsedResources != null) {
+            sb.append("\nTier ").append(tierNumber).append(" Used Capacity: ").append(effectiveUsedResources.getAsString());
+        }
+        if (remainingResources != null) {
+            sb.append("\nTier ").append(tierNumber).append(" Remaining Capacity: ").append(remainingResources.getAsString());
+        }
+        return sb.toString();
+    }
+
     @Override
     public void setTotalResources(Map<VMResource, Double> totalResourcesMap) {
         if (totalResMapChanged(currTotalResourcesMap, totalResourcesMap)) {

fenzo-core/src/main/java/com/netflix/fenzo/sla/ResAllocs.java

@@ -56,4 +56,16 @@ public interface ResAllocs {
      * @return the maximum disk space, in MB
      */
     double getDisk();
+
+    /**
+     * Returns the the resource allocations in a string representation.
+     *
+     * @return the resources as a string
+     */
+    default String getAsString() {
+        return "{ cpu: " + getCores() +
+                ", memory: " + getMemory() +
+                ", disk: " + getDisk() +
+                ", networkMbps: " + getNetworkMbps() + " }";
+    }
 }