From 9e863fe4d0bc43850b5829ad3cdb91b52d6600e3 Mon Sep 17 00:00:00 2001 From: Ezequiel Valencia Date: Wed, 9 Oct 2024 10:37:39 -0400 Subject: [PATCH] Grab Min Memory Property When Required --- .../java/cbit/vcell/message/server/htc/HtcProxy.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/vcell-server/src/main/java/cbit/vcell/message/server/htc/HtcProxy.java b/vcell-server/src/main/java/cbit/vcell/message/server/htc/HtcProxy.java index 3cfb5ca9bd..9b0245a154 100644 --- a/vcell-server/src/main/java/cbit/vcell/message/server/htc/HtcProxy.java +++ b/vcell-server/src/main/java/cbit/vcell/message/server/htc/HtcProxy.java @@ -242,8 +242,6 @@ public static String toUnixStyleText(String javaString) throws IOException { public abstract String getSubmissionFileExtension(); public static class MemLimitResults { - private static final long FALLBACK_MEM_LIMIT_MB= Integer.parseInt(PropertyLoader.getRequiredProperty(PropertyLoader.htcMinMemoryMB)); // MAX memory allowed if not set in limitFile, currently 4g - private static final long POWER_USER_MEMORY_FLOOR=Integer.parseInt(PropertyLoader.getRequiredProperty(PropertyLoader.htcPowerUserMemoryFloorMB)); // MIN memory allowed if declared to be a power user, currently 50g private long memLimit; private String memLimitSource; public MemLimitResults(long memLimit, String memLimitSource) { @@ -258,15 +256,16 @@ public String getMemLimitSource() { return memLimitSource; } private static MemLimitResults getJobRequestedMemoryLimit(SolverDescription solverDescription, double estimatedMemSizeMB, boolean isPowerUser) { - long batchJobMemoryLimit = FALLBACK_MEM_LIMIT_MB; + long batchJobMemoryLimit = Integer.parseInt(PropertyLoader.getRequiredProperty(PropertyLoader.htcMinMemoryMB)); // MAX memory allowed if not set in limitFile, currently 4g String detailedMessage = "default memory limit"; if(estimatedMemSizeMB > batchJobMemoryLimit) {//Use estimated if bigger batchJobMemoryLimit = (long)estimatedMemSizeMB; detailedMessage = "used Estimated"; } - if (isPowerUser && batchJobMemoryLimit < POWER_USER_MEMORY_FLOOR){ - batchJobMemoryLimit = POWER_USER_MEMORY_FLOOR; + long powerUserMemory = Integer.parseInt(PropertyLoader.getRequiredProperty(PropertyLoader.htcPowerUserMemoryFloorMB)); // MIN memory allowed if declared to be a power user, currently 50g + if (isPowerUser && batchJobMemoryLimit < powerUserMemory){ + batchJobMemoryLimit = powerUserMemory; detailedMessage = "poweruser's memory override"; }