Merge pull request #2068 from HubSpot/mem_cpu_cutoff

Consistently compare memory in GB, not MB/B
HubSpot · Feb 6, 2020 · 2335a58 · 2335a58
2 parents 5b78ddf + 2841654
commit 2335a58
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...ityService/src/main/java/com/hubspot/singularity/mesos/SingularitySlaveAndRackHelper.java b/...ityService/src/main/java/com/hubspot/singularity/mesos/SingularitySlaveAndRackHelper.java
@@ -155,15 +155,15 @@ public CpuMemoryPreference getCpuMemoryPreferenceForSlave(SingularityOfferHolder
   }
 
   private double getCpuMemoryRatioForSlave(SingularityOfferHolder offerHolder) {
-    double memory = MesosUtils.getMemory(offerHolder.getCurrentResources(), Optional.empty());
+    double memoryGB = MesosUtils.getMemory(offerHolder.getCurrentResources(), Optional.empty()) / 1024;
     double cpus = MesosUtils.getNumCpus(offerHolder.getCurrentResources(), Optional.empty());
-    return memory/cpus;
+    return cpus/memoryGB;
   }
 
   private double getCpuMemoryRatioForRequest(RequestUtilization requestUtilization) {
     double cpuUsageForRequest = getEstimatedCpuUsageForRequest(requestUtilization);
-    double memUsageForRequest = requestUtilization.getAvgMemBytesUsed();
-    return cpuUsageForRequest/memUsageForRequest;
+    double memUsageGBForRequest = requestUtilization.getAvgMemBytesUsed() / 1024 / 1024;
+    return cpuUsageForRequest/memUsageGBForRequest;
   }
 
   public double getEstimatedCpuUsageForRequest(RequestUtilization requestUtilization) {