1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/4637dfed79d3/
Changeset: 4637dfed79d3
User: dannon
Date: 2014-08-18 21:16:13
Summary: Fix more typos in jobs/rule_helper.py, some new, some old.
Affected #: 1 file
diff -r e6d6d98adcf3af152d8da21fd28f0e73c0ee2205 -r 4637dfed79d37c05e3caa3e0d4d5b1d44f892904 lib/galaxy/jobs/rule_helper.py
--- a/lib/galaxy/jobs/rule_helper.py
+++ b/lib/galaxy/jobs/rule_helper.py
@@ -17,7 +17,7 @@
class RuleHelper( object ):
- """ Utillity to allow job rules to interface cleanly with the rest of
+ """ Utility to allow job rules to interface cleanly with the rest of
Galaxy and shield them from low-level details of models, metrics, etc....
Currently focus is on figuring out job statistics for a given user, but
@@ -127,7 +127,7 @@
See stock_rules for an simple example of using this function - but to
get the most out of it - it should probably be used with custom job
- rules that can respond to the bursting by allocatin resources,
+ rules that can respond to the bursting by allocating resources,
launching cloud nodes, etc....
"""
if job_states is None:
@@ -160,9 +160,9 @@
def job_hash( self, job, hash_by=None ):
""" Produce a reproducible hash for the given job on various
criteria - for instance if hash_by is "workflow_invocation,history" -
- all jobs within the same workflow invocation will recieve the same
+ all jobs within the same workflow invocation will receive the same
hash - for jobs outside of workflows all jobs within the same history
- will recieve the same hash, other jobs will be hashed on job's id
+ will receive the same hash, other jobs will be hashed on job's id
randomly.
Primarily intended for use with ``choose_one`` above - to consistent
@@ -176,7 +176,7 @@
if job_hash:
return job_hash
- # Fallback to just hashing by job id, should always return a value.
+ # Fall back to just hashing by job id, should always return a value.
return self._try_hash_for_job( job, "job" )
def _try_hash_for_job( self, job, hash_by ):
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/e6d6d98adcf3/
Changeset: e6d6d98adcf3
User: dannon
Date: 2014-08-18 21:13:44
Summary: Typo from pr 465 in job_conf sample commentary.
Affected #: 1 file
diff -r 3c9a169936720219b60be32dd790fa2f14a139cd -r e6d6d98adcf3af152d8da21fd28f0e73c0ee2205 job_conf.xml.sample_advanced
--- a/job_conf.xml.sample_advanced
+++ b/job_conf.xml.sample_advanced
@@ -237,11 +237,11 @@
</destination><destination id="load_balance" runner="dynamic"><param id="type">choose_one</param>
- <!-- Randomly assign jobs to various static destinatin ids -->
+ <!-- Randomly assign jobs to various static destination ids --><param id="destination_ids">cluster1,cluster2,cluster3</param></destination><destination id="load_balance_with_data_locality" runner="dynamic">
- <!-- Randomly assign jobs to various static destinatin ids,
+ <!-- Randomly assign jobs to various static destination ids,
but keep jobs in the same workflow invocation together and
for those jobs ran outside of workflows keep jobs in same
history together.
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/e66936a92feb/
Changeset: e66936a92feb
User: jmchilton
Date: 2014-08-18 14:43:37
Summary: Fix for running LSF DRMAA jobs as 'real' user.
Fix thanks to Chong Chen at IBM - "When invoking the LSF drmma api to submit a job, the API will print the message like 'Job <78> is submitted to default queue <normal>'. So if the Galaxy want to use this API, need modify the drmaa_external_runner.py script to handle this message. LSF already support a env variable to disable this message print out, "BSUB_QUIET", set this into env can disable this message output."
A second issue was related to subsequent querying of the job state as a user other than the submitter - according to Chong Chen this has been fixed in latest LSF DRMAA changes on github (https://github.com/PlatformLSF/lsf-drmaa/commit/43e62546172b90d9f95e90273d7…).
Affected #: 1 file
diff -r 572a8d5ee218aeb37f77660948cb75a439936868 -r e66936a92febf952017586742db36ed44be4d08b scripts/drmaa_external_runner.py
--- a/scripts/drmaa_external_runner.py
+++ b/scripts/drmaa_external_runner.py
@@ -124,6 +124,9 @@
userid, json_filename, assign_all_groups = validate_paramters()
set_user(userid, assign_all_groups)
json_file_exists(json_filename)
+ # Added to disable LSF generated messages that would interfer with this
+ # script. Fix thank to Chong Chen at IBM.
+ os.environ['BSUB_QUIET'] = 'Y'
s = drmaa.Session()
s.initialize()
jt = s.createJobTemplate()
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/109f40daa21a/
Changeset: 109f40daa21a
User: dannon
Date: 2014-08-15 22:35:02
Summary: Add c3.2xlarge instances to the cloudlaunch list. This list is being moved to bioblend.cloudman and will be updated there in the future, but this is a stopgap measure enabling use of this particularly useful instance type.
Affected #: 1 file
diff -r 2d509288d484025de4f882b28b2c22069f12422e -r 109f40daa21ad0348662805f93f1cf1c9fbd6003 templates/webapps/galaxy/cloud/index.mako
--- a/templates/webapps/galaxy/cloud/index.mako
+++ b/templates/webapps/galaxy/cloud/index.mako
@@ -240,6 +240,7 @@
<select name="instance_type" id="id_instance_type"><option value="m1.large">Large</option><option value="m1.xlarge">Extra Large</option>
+ <option value="c3.2xlarge">Compute Optimized Double Extra Large</option><option value="m2.4xlarge">High-Memory Quadruple Extra Large</option></select></div>
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.