Make configuration file clearer and add new parameters to dundee-conf

diff --git a/conf/Engine.cluster.properties b/conf/Engine.cluster.properties
index e18fa4c..4cf86b2 100644 (file)
--- a/conf/Engine.cluster.properties
+++ b/conf/Engine.cluster.properties
@@ -1,33 +1,36 @@
-### Local Binaries root path ###\r
-\r
+#################################################################################\r
 # enable or disable engine true | false\r
 # OPTIONAL defaults to false\r
 engine.cluster.enable=false\r
 \r
+#################################################################################\r
 # Directory to use for temporary files storage\r
 # REQUIRED - cluster nodes must have access to this directory!\r
-# An absolute path is required \r
-\r
+# WARNING!!! An absolute path is required \r
+#\r
 # Please note that statistic web application will only be able to generate links\r
 # to the job folders if this path is within JABA web application. \r
 # JABAWS statistic application just assume that the last name in the path is the \r
 # application folder in the root of JABAWS web application. \r
 cluster.tmp.directory=/cluster/gjb_lab/fc/www-jws2/jaba/jobsout\r
 \r
+#################################################################################\r
 # Enable/disable cluster statistics collector \r
 cluster.stat.collector.enable=false\r
 # Frequency of statistics collecting (in minutes)\r
 # normal rate: once a date = 24 * 60 = 1440\r
 cluster.stat.collector.update.frequency=1440\r
 \r
+#################################################################################\r
 # Maximum amount of time the job is considered running in hours\r
 # Optional defaults to 7 days (168h) \r
 cluster.stat.maxruntime=24\r
 \r
+#################################################################################\r
 # Maximum amount of time the job directory is living (in hours), \r
 # -1 means the directories are never deleted\r
 # Defaults is one week, i.e. 168 hours\r
 cluster.jobdir.maxlifespan=168\r
 # Frequency of cleaning job directory (in minutes)\r
 # normal rate: once a date = 24 * 60 = 1440\r
-cluster.jobdir.cleaning.frequency=1
\ No newline at end of file
+cluster.jobdir.cleaning.frequency=1\r

diff --git a/conf/Engine.local.properties b/conf/Engine.local.properties
index 71a8174..dd2a0db 100644 (file)
--- a/conf/Engine.local.properties
+++ b/conf/Engine.local.properties
@@ -1,19 +1,23 @@
+#################################################################################\r
 # enable or disable engine true | false\r
 # OPTIONAL defaults to true\r
 engine.local.enable=true \r
 \r
+#################################################################################\r
 # Directory to use for temporary files storage\r
 # OPTIONAL defaults to java temporary directory \r
 # Relative path within the project will be converted in absolute at runtime\r
-# /cluster/gjb_lab/fc/www-jws2/jaba/local_jobsout \r
+#local.tmp.directory=/cluster/gjb_lab/fc/www-jws2/jaba/local_jobsout \r
 local.tmp.directory=jobsout \r
- \r
+\r
+#################################################################################\r
 # Number of threads for tasks execution (valid values between 1 and 2x cpu. \r
 # Where x is a number of cores available in the system)\r
 # OPTIONAL defaults to the number of cores for core number <=4 and \r
 # number of cores-1 for greater core numbers\r
-#engine.local.thread.number=3\r
+engine.local.thread.number=2\r
 \r
+#################################################################################\r
 # Enable/disable cluster statistics collector\r
 local.stat.collector.enable=true\r
 # Frequency of statistics collecting (in minutes)\r
@@ -22,8 +26,9 @@ local.stat.collector.update.frequency=1
 \r
 # Maximum amount of time the job is considered running in hours\r
 # Optional defaults to 24 hours\r
-local.stat.maxruntime=24\r
+local.stat.maxruntime=6\r
 \r
+#################################################################################\r
 # Maximum amount of time the job directory is living (in hours), \r
 # -1 means the directories are never deleted\r
 # Defaults is one week, i.e. 168 hours\r

diff --git a/dundee-conf/Engine.cluster.properties b/dundee-conf/Engine.cluster.properties
index d75c228..ffe09bf 100644 (file)
--- a/dundee-conf/Engine.cluster.properties
+++ b/dundee-conf/Engine.cluster.properties
@@ -1,23 +1,36 @@
-### Local Binaries root path ###\r
-\r
+#################################################################################\r
 # enable or disable engine true | false\r
 # OPTIONAL defaults to false\r
 engine.cluster.enable=true\r
 \r
+#################################################################################\r
 # Directory to use for temporary files storage\r
 # REQUIRED - cluster nodes must have access to this directory!\r
-# An absolute path is required \r
-\r
+# WARNING!!! An absolute path is required \r
+#\r
 # Please note that statistic web application will only be able to generate links\r
 # to the job folders if this path is within JABA web application. \r
 # JABAWS statistic application just assume that the last name in the path is the \r
 # application folder in the root of JABAWS web application. \r
 cluster.tmp.directory=/cluster/gjb_lab/fc/www-jws2/jaba/jobsout\r
- \r
 \r
+#################################################################################\r
 # Enable/disable cluster statistics collector \r
 cluster.stat.collector.enable=true\r
+# Frequency of statistics collecting (in minutes)\r
+# normal rate: once a date = 24 * 60 = 1440\r
+cluster.stat.collector.update.frequency=1440\r
 \r
+#################################################################################\r
 # Maximum amount of time the job is considered running in hours\r
 # Optional defaults to 7 days (168h) \r
 cluster.stat.maxruntime=24\r
+\r
+#################################################################################\r
+# Maximum amount of time the job directory is living (in hours), \r
+# -1 means the directories are never deleted\r
+# Defaults is one week, i.e. 168 hours\r
+cluster.jobdir.maxlifespan=168\r
+# Frequency of cleaning job directory (in minutes)\r
+# normal rate: once a date = 24 * 60 = 1440\r
+cluster.jobdir.cleaning.frequency=1\r

diff --git a/dundee-conf/Engine.local.properties b/dundee-conf/Engine.local.properties
index d9314c2..2ce1671 100644 (file)
--- a/dundee-conf/Engine.local.properties
+++ b/dundee-conf/Engine.local.properties
@@ -1,21 +1,38 @@
+#################################################################################\r
 # enable or disable engine true | false\r
 # OPTIONAL defaults to true\r
 engine.local.enable=true \r
 \r
+#################################################################################\r
 # Directory to use for temporary files storage\r
 # OPTIONAL defaults to java temporary directory \r
 # Relative path within the project will be converted in absolute at runtime\r
 local.tmp.directory=/cluster/gjb_lab/fc/www-jws2/jaba/local_jobsout \r
- \r
+#local.tmp.directory=jobsout \r
+\r
+#################################################################################\r
 # Number of threads for tasks execution (valid values between 1 and 2x cpu. \r
 # Where x is a number of cores available in the system)\r
 # OPTIONAL defaults to the number of cores for core number <=4 and \r
 # number of cores-1 for greater core numbers\r
 engine.local.thread.number=2\r
 \r
+#################################################################################\r
 # Enable/disable cluster statistics collector\r
 local.stat.collector.enable=true\r
+# Frequency of statistics collecting (in minutes)\r
+# normal rate: once a date = 24 * 60 = 1440\r
+local.stat.collector.update.frequency=1\r
 \r
 # Maximum amount of time the job is considered running in hours\r
 # Optional defaults to 24 hours\r
-local.stat.maxruntime=6
\ No newline at end of file
+local.stat.maxruntime=6\r
+\r
+#################################################################################\r
+# Maximum amount of time the job directory is living (in hours), \r
+# -1 means the directories are never deleted\r
+# Defaults is one week, i.e. 168 hours\r
+local.jobdir.maxlifespan=168\r
+# Frequency of cleaning job directory (in minutes)\r
+# normal rate: once a date = 24 * 60 = 1440\r
+local.jobdir.cleaning.frequency=1\r