Add Required Properties for Submit and Post-Processor

virtualcell · Oct 9, 2024 · c3b6977 · c3b6977
1 parent 9e863fe
commit c3b6977
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/docker/build/Dockerfile-submit-dev b/docker/build/Dockerfile-submit-dev
@@ -170,4 +170,7 @@ ENTRYPOINT java \
 	-Dvcell.simdatadir.archive.external=${simdatadir_archive_external} \
 	-Dvcell.ssh.cmd.cmdtimeout=${vcell_ssh_cmd_cmdtimeout} \
 	-Dvcell.ssh.cmd.restoretimeout=${vcell_ssh_cmd_restoretimeout} \
+	-Dvcell.htc.memory.min.mb=${htcMinMemoryMB} \
+    -Dvcell.htc.memory.max.mb=${htcMaxMemoryMB} \
+    -Dvcell.htc.memory.pu.floor.mb=${htcPowerUserMemoryFloorMB} \
 	-cp "./lib/*" cbit.vcell.message.server.batch.sim.HtcSimulationWorker
diff --git a/vcell-server/src/main/java/cbit/vcell/message/server/batch/sim/HtcSimulationWorker.java b/vcell-server/src/main/java/cbit/vcell/message/server/batch/sim/HtcSimulationWorker.java
@@ -678,7 +678,10 @@ public static void main(String[] args) throws IOException {
 		PropertyLoader.slurm_qos,
 		PropertyLoader.slurm_partition_pu,
 		PropertyLoader.slurm_reservation_pu,
-		PropertyLoader.slurm_qos_pu
+		PropertyLoader.slurm_qos_pu,
+		PropertyLoader.htcMinMemoryMB,
+		PropertyLoader.htcMaxMemoryMB,
+		PropertyLoader.htcPowerUserMemoryFloorMB
 	};
 
 

diff --git a/vcell-server/src/main/java/cbit/vcell/message/server/batch/sim/SolverPostprocessor.java b/vcell-server/src/main/java/cbit/vcell/message/server/batch/sim/SolverPostprocessor.java
@@ -146,7 +146,11 @@ private static Exception runPostprocessingCommands(String filename, Logger lg) {
 	}
 	private static final String POST_PROCESSOR_PROPERTIES[] = {
 			PropertyLoader.primarySimDataDirInternalProperty,
-			PropertyLoader.secondarySimDataDirInternalProperty
+			PropertyLoader.secondarySimDataDirInternalProperty,
+			PropertyLoader.mongodbDatabase,
+			PropertyLoader.jmsSimHostInternal,
+			PropertyLoader.jmsSimPortInternal,
+			PropertyLoader.jmsBlobMessageUseMongo
 		};
 
 }