Skip to content

Commit

Permalink
Set Java memory on reserved destinations as well
Browse files Browse the repository at this point in the history
  • Loading branch information
natefoo committed Oct 14, 2016
1 parent 505e875 commit b3aa090
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions templates/galaxy/usegalaxy.org/config/job_conf.xml.j2
Expand Up @@ -219,7 +219,7 @@
<env id="LD_LIBRARY_PATH">/cvmfs/main.galaxyproject.org/venv/lib</env>
<env id="TEMP">/galaxy-repl/main/scratch</env>
<env id="TMPDIR">/galaxy-repl/main/scratch</env>
<env id="_JAVA_OPTIONS">-Djava.io.tmpdir=/galaxy-repl/main/scratch</env>
<env id="_JAVA_OPTIONS">-Djava.io.tmpdir=/galaxy-repl/main/scratch -Xmx7680m -Xms256m</env>
<env file="/cvmfs/main.galaxyproject.org/venv/bin/activate" />
</destination>
<destination id="reserved_16gb" runner="slurm">
Expand All @@ -230,7 +230,7 @@
<env id="LD_LIBRARY_PATH">/cvmfs/main.galaxyproject.org/venv/lib</env>
<env id="TEMP">/galaxy-repl/main/scratch</env>
<env id="TMPDIR">/galaxy-repl/main/scratch</env>
<env id="_JAVA_OPTIONS">-Djava.io.tmpdir=/galaxy-repl/main/scratch</env>
<env id="_JAVA_OPTIONS">-Djava.io.tmpdir=/galaxy-repl/main/scratch -Xmx15872m -Xms256m</env>
<env file="/cvmfs/main.galaxyproject.org/venv/bin/activate" />
</destination>
<destination id="reserved_64gb" runner="slurm">
Expand All @@ -241,7 +241,7 @@
<env id="LD_LIBRARY_PATH">/cvmfs/main.galaxyproject.org/venv/lib</env>
<env id="TEMP">/galaxy-repl/main/scratch</env>
<env id="TMPDIR">/galaxy-repl/main/scratch</env>
<env id="_JAVA_OPTIONS">-Djava.io.tmpdir=/galaxy-repl/main/scratch</env>
<env id="_JAVA_OPTIONS">-Djava.io.tmpdir=/galaxy-repl/main/scratch -Xmx65024m -Xms256m</env>
<env file="/cvmfs/main.galaxyproject.org/venv/bin/activate" />
</destination>
<destination id="reserved_multi" runner="slurm">
Expand Down

0 comments on commit b3aa090

Please sign in to comment.