From 1ecd08c95c1f381835e6dccbae9e8824f59a85cf Mon Sep 17 00:00:00 2001 From: Sasha Date: Mon, 17 Jun 2013 17:00:34 +0100 Subject: [PATCH] Make configuration file clearer and add new parameters to dundee-conf --- conf/Engine.cluster.properties | 13 ++++++++----- conf/Engine.local.properties | 13 +++++++++---- dundee-conf/Engine.cluster.properties | 23 ++++++++++++++++++----- dundee-conf/Engine.local.properties | 21 +++++++++++++++++++-- 4 files changed, 54 insertions(+), 16 deletions(-) diff --git a/conf/Engine.cluster.properties b/conf/Engine.cluster.properties index e18fa4c..4cf86b2 100644 --- a/conf/Engine.cluster.properties +++ b/conf/Engine.cluster.properties @@ -1,33 +1,36 @@ -### Local Binaries root path ### - +################################################################################# # enable or disable engine true | false # OPTIONAL defaults to false engine.cluster.enable=false +################################################################################# # Directory to use for temporary files storage # REQUIRED - cluster nodes must have access to this directory! -# An absolute path is required - +# WARNING!!! An absolute path is required +# # Please note that statistic web application will only be able to generate links # to the job folders if this path is within JABA web application. # JABAWS statistic application just assume that the last name in the path is the # application folder in the root of JABAWS web application. cluster.tmp.directory=/cluster/gjb_lab/fc/www-jws2/jaba/jobsout +################################################################################# # Enable/disable cluster statistics collector cluster.stat.collector.enable=false # Frequency of statistics collecting (in minutes) # normal rate: once a date = 24 * 60 = 1440 cluster.stat.collector.update.frequency=1440 +################################################################################# # Maximum amount of time the job is considered running in hours # Optional defaults to 7 days (168h) cluster.stat.maxruntime=24 +################################################################################# # Maximum amount of time the job directory is living (in hours), # -1 means the directories are never deleted # Defaults is one week, i.e. 168 hours cluster.jobdir.maxlifespan=168 # Frequency of cleaning job directory (in minutes) # normal rate: once a date = 24 * 60 = 1440 -cluster.jobdir.cleaning.frequency=1 \ No newline at end of file +cluster.jobdir.cleaning.frequency=1 diff --git a/conf/Engine.local.properties b/conf/Engine.local.properties index 71a8174..dd2a0db 100644 --- a/conf/Engine.local.properties +++ b/conf/Engine.local.properties @@ -1,19 +1,23 @@ +################################################################################# # enable or disable engine true | false # OPTIONAL defaults to true engine.local.enable=true +################################################################################# # Directory to use for temporary files storage # OPTIONAL defaults to java temporary directory # Relative path within the project will be converted in absolute at runtime -# /cluster/gjb_lab/fc/www-jws2/jaba/local_jobsout +#local.tmp.directory=/cluster/gjb_lab/fc/www-jws2/jaba/local_jobsout local.tmp.directory=jobsout - + +################################################################################# # Number of threads for tasks execution (valid values between 1 and 2x cpu. # Where x is a number of cores available in the system) # OPTIONAL defaults to the number of cores for core number <=4 and # number of cores-1 for greater core numbers -#engine.local.thread.number=3 +engine.local.thread.number=2 +################################################################################# # Enable/disable cluster statistics collector local.stat.collector.enable=true # Frequency of statistics collecting (in minutes) @@ -22,8 +26,9 @@ local.stat.collector.update.frequency=1 # Maximum amount of time the job is considered running in hours # Optional defaults to 24 hours -local.stat.maxruntime=24 +local.stat.maxruntime=6 +################################################################################# # Maximum amount of time the job directory is living (in hours), # -1 means the directories are never deleted # Defaults is one week, i.e. 168 hours diff --git a/dundee-conf/Engine.cluster.properties b/dundee-conf/Engine.cluster.properties index d75c228..ffe09bf 100644 --- a/dundee-conf/Engine.cluster.properties +++ b/dundee-conf/Engine.cluster.properties @@ -1,23 +1,36 @@ -### Local Binaries root path ### - +################################################################################# # enable or disable engine true | false # OPTIONAL defaults to false engine.cluster.enable=true +################################################################################# # Directory to use for temporary files storage # REQUIRED - cluster nodes must have access to this directory! -# An absolute path is required - +# WARNING!!! An absolute path is required +# # Please note that statistic web application will only be able to generate links # to the job folders if this path is within JABA web application. # JABAWS statistic application just assume that the last name in the path is the # application folder in the root of JABAWS web application. cluster.tmp.directory=/cluster/gjb_lab/fc/www-jws2/jaba/jobsout - +################################################################################# # Enable/disable cluster statistics collector cluster.stat.collector.enable=true +# Frequency of statistics collecting (in minutes) +# normal rate: once a date = 24 * 60 = 1440 +cluster.stat.collector.update.frequency=1440 +################################################################################# # Maximum amount of time the job is considered running in hours # Optional defaults to 7 days (168h) cluster.stat.maxruntime=24 + +################################################################################# +# Maximum amount of time the job directory is living (in hours), +# -1 means the directories are never deleted +# Defaults is one week, i.e. 168 hours +cluster.jobdir.maxlifespan=168 +# Frequency of cleaning job directory (in minutes) +# normal rate: once a date = 24 * 60 = 1440 +cluster.jobdir.cleaning.frequency=1 diff --git a/dundee-conf/Engine.local.properties b/dundee-conf/Engine.local.properties index d9314c2..2ce1671 100644 --- a/dundee-conf/Engine.local.properties +++ b/dundee-conf/Engine.local.properties @@ -1,21 +1,38 @@ +################################################################################# # enable or disable engine true | false # OPTIONAL defaults to true engine.local.enable=true +################################################################################# # Directory to use for temporary files storage # OPTIONAL defaults to java temporary directory # Relative path within the project will be converted in absolute at runtime local.tmp.directory=/cluster/gjb_lab/fc/www-jws2/jaba/local_jobsout - +#local.tmp.directory=jobsout + +################################################################################# # Number of threads for tasks execution (valid values between 1 and 2x cpu. # Where x is a number of cores available in the system) # OPTIONAL defaults to the number of cores for core number <=4 and # number of cores-1 for greater core numbers engine.local.thread.number=2 +################################################################################# # Enable/disable cluster statistics collector local.stat.collector.enable=true +# Frequency of statistics collecting (in minutes) +# normal rate: once a date = 24 * 60 = 1440 +local.stat.collector.update.frequency=1 # Maximum amount of time the job is considered running in hours # Optional defaults to 24 hours -local.stat.maxruntime=6 \ No newline at end of file +local.stat.maxruntime=6 + +################################################################################# +# Maximum amount of time the job directory is living (in hours), +# -1 means the directories are never deleted +# Defaults is one week, i.e. 168 hours +local.jobdir.maxlifespan=168 +# Frequency of cleaning job directory (in minutes) +# normal rate: once a date = 24 * 60 = 1440 +local.jobdir.cleaning.frequency=1 -- 1.7.10.2