Commit Graph
7317 Commits
Author SHA1 Message Date
Daniel Blankenberg 285d807afc Fix for Safari Caching External View application 302 redirect links. See https://trello.com/c/optldnPm 2014-06-03 17:03:17 -04:00
Greg Von Kuster 3965200d69 Fix import in the Tool Shed's common_install_util module. 2014-06-03 16:34:59 -04:00
Dave Bouvier f23b10961c Merge in set_environment bugfix from stable. 2014-06-03 16:09:03 -04:00
Greg Von Kuster 96f28b6e17 Fix for installing tool dependencies with type set_environment. 2014-06-03 15:34:53 -04:00
Greg Von Kuster 4e6d091a56 Pes-8 fixes for the Tool Shed's repository_registry module. 2014-06-03 15:19:54 -04:00
Greg Von Kuster 71690cc9a5 Fix debug typo in the Tool Shed's step handler. 2014-06-03 13:56:51 -04:00
Greg Von Kuster 49b105446d Fix documentation in the Tool Shed API users controller. 2014-06-03 13:53:12 -04:00
John Chilton 7dc073a8b7 Mechanism to define site-specific parameters to aid defining job destinations.
This is based on work by Hector del Risco at the University of Florida.

Various tool-style parameters can be defined in job_resource_params_conf.xml (see sample) and these define the pool of all possible resource parameters that can be injected into a tool. These can be groupped together and assigned to tools in job_conf.xml (see documented changes to job_conf.xml.sample_advanced).

A conditional is then injected into each tool that gives the end-user the ability to select these parameters. The values of these parameters (as a dict) can then be obtained by dynamic job destination that define a 'resource_params' argument.

Lots here still needs to be tested/verified - can workflows exported from Galaxies without resource parameters (or different ones, be reused in Galaxies with resource parameters) (I think yes?)? can workflows exported with resource parameters be used in other Galaxies (I think yes?), how best to present UI while running workflows? (maybe nothing needs to be changed), should exported job parameter data be swept clean (say when exporting a workflow for instance).

A great extension to this would be to support conditional when defining parameters.

Finally, the Galaxy team will make a reasonable effort to support this syntax for job_conf.xml, job_resource_params_conf.xml, and internal interface for job parameters for sometime once this changeset has reached -stable but until these interfaces may change.
2014-06-03 12:48:18 -05:00
Nate Coraor 359b310498 Rename the ambiguous concurrent_jobs limit to destination_user_concurrent jobs
and add a destination_total_concurrent_jobs limit that prevents Galaxy from
queueing *any* jobs at a destination or tagged group of destinations once the
limit is reached.
2014-06-02 18:22:33 -04:00
Dannon Baker e6e2eb7889 Merge next-stable. 2014-06-02 11:14:30 -04:00
Dannon Baker 5f3c681ac4 Cleanly terminate the control worker. Resolves a buildbot issue. 2014-06-02 11:14:18 -04:00
John Chilton e767c4ed6b Move logic for creating LwrExchange out of MessageQueueClientManager...
So can reuse server side when connecting server components to AMQP.
2014-06-02 00:13:55 -05:00
John Chilton 7a3fc98320 Restore ability to disable LWR-MQ consumer timeout.
Mis-translated this parameter when converting it to use runner spec.
2014-06-02 00:13:55 -05:00
John Chilton 818b18c5dd Allow configuration of more AMQP parameters.
In particular ampq_publish_retry can now be set to True to retry disconnected connections on publication. Hopefully, this will fix producer-related disconnect problems seen in production.
2014-06-01 22:34:39 -05:00
John Chilton 4627e651bc Small tweaks to LWR configuring to reduce code duplication.
Refactor amqp_exchange to move logic for SSL into shared spot and rework SSL parsing to reuse similar logic used to parse destination parameters.
2014-06-01 22:34:39 -05:00
John Chilton 6d8fd45ba8 Build on 1ed8dd5 for even simpler LWR param handling. 2014-06-01 22:34:39 -05:00
John Chilton 7ae38c5088 Rework LWR runner parameters to use @natefoo's spec mechanism.
Add new module - galaxy.util.specs - with utilities for things I predict would be common spec types.

This simplifies some things in terms of defaults and empty values that means other simplifications outside the LWR job runner constructor as well (e.g. for ssl_ parameters).
2014-06-01 20:46:45 -05:00
John Chilton df7e282a00 Update LWR client through LWR changeset db9ea0e6d6a7. 2014-06-01 19:34:04 -05:00
John Chilton 6b464c49f3 All tool_data_table paths must now be declared with field name "path"...
... or they will not work correctly with the LWR. This is making explicit a convention that was already followed by all devteam tools. If need arises for multiple paths in the same data table or there is an important tool out there that does not label it's paths as "path" let me know and we can try to implement some XML markup in the tool_data_table.xml file to declare these fields as paths.

Use new assumption to cleanup what LWR considers unstructured paths (unstructured paths is no longer even a good name for this concept unfortunately).
2014-05-30 16:12:40 -05:00
Dannon Baker dd59e7c196 Merge. 2014-05-29 17:24:03 -04:00
Dannon Baker 8f0990e6b2 Improve assertion logging for upload_store mismatch 2014-05-29 17:23:51 -04:00
Carl Eberhard 4a1204aa90 merge 2014-05-29 16:25:59 -04:00
Carl Eberhard 2c9637f42b Silence log warnings when class names are not found in the visualizations registry applicability tests 2014-05-29 16:25:44 -04:00
John Chilton 5c8eb6afaf Generalize RunnerParams.
Create ParamsWithSpecs class in galaxy.util. If we are going to build out specs for all LWR client parameters - would be nice if they could be reused on the LWR server side where relevant (e.g. AMQP connection parameters).

Slightly modified implementation that extends collections.defaultdict so that operations like iterating over parameters, fetching keys, etc... are available so LWR runner param handling code can look like destination param handling code.
2014-05-29 00:15:38 -05:00
John Chilton 533cdb9ce7 Unit tests for RunnerParams.
Small changes to make this easier - mostly just defining constants.
2014-05-29 00:15:38 -05:00
John Chilton a726f11df7 More extract functional tests.
Add test for extracting copied, mapped datasets and copied input dataset collections from history.
2014-05-28 20:25:53 -05:00
John Chilton 605532e5ba Bugfix for a06c6c9.
With improved testing :).
2014-05-28 20:25:53 -05:00
John Chilton 2e667131a8 Collections: Add API ability to copy HDCA mirroring HDA operations. 2014-05-28 15:28:55 -05:00
Greg Von Kuster ea6a3c5be4 Import fix in the Tool Shed's hg_util.py module. 2014-05-28 16:06:46 -04:00
Greg Von Kuster 390d05bbd1 Eliminate the Tool Shed's td_common_util.py module by moving the functions to appropriate classes. 2014-05-28 15:49:02 -04:00
Greg Von Kuster c6ceacc3fb Handle Tool Shed category administration in the Tool Shed's repository registry. 2014-05-28 12:08:04 -04:00
Greg Von Kuster b2f3d6a551 Continued down-sizing of the Tool Shed's shed_util_common module by moving certain functions to more appropriate locations. Some fixes for adding and removing entries to the Tool Shed's repository registry. 2014-05-28 11:17:50 -04:00
Dannon Baker 3f72698adc merge next-stable. 2014-05-27 17:11:13 -04:00
Dannon Baker 72d1da540b Fix dep_value being undefined at use. Someone needs to look at the logic here, this is purely an operational fix preventing a crash -- there's logic that still needs to happen somewhere in the chain here. 2014-05-27 17:11:01 -04:00
John Chilton f009c80d6d Merge next-stable. 2014-05-27 12:53:20 -05:00
John Chilton 3e7b1b511a Bugfix: Hadn't implemented clean way to iterate of collection element names in tools.
Perhaps stretching the definition of bugfix here to get this in next-stable.
2014-05-27 12:52:41 -05:00
Greg Von Kuster 2c8d56e28f Merged next-stable 2014-05-27 13:33:16 -04:00
Greg Von Kuster 82334f9ae7 Improve exception handling for generated Tool Shed URLs. 2014-05-27 13:32:49 -04:00
Greg Von Kuster ec1688d1da Clarify problematic members of tar archives being uploaded to Tool Shed repositories. 2014-05-27 11:13:05 -04:00
John Chilton c02233a0cc Merge latest next-stable. 2014-05-27 09:07:03 -05:00
John Chilton ebd48be297 English fix: Spelling error in a5f0972. 2014-05-27 09:06:44 -05:00
John Chilton d6ff59ee0e Bugfix: Don't show deleted HDCAs when displaying tool selection options. 2014-05-27 09:06:44 -05:00
John Chilton c29c730ab9 Merge latest next-stable. 2014-05-27 08:21:18 -05:00
John Chilton fc8ee54ce2 Bugfix: Explicitly enforce implicit collection unique element identifier constraint.
Think this is responsible for bug when collections API does not create as many collections as requested.
2014-05-27 08:20:39 -05:00
John Chilton d636f62a77 Add some more colllection creation logging.
Bug report from takadonet of collection request with 280 items only creating 60 - want to know if request got chopped off by proxy or paste, there was some logic error in my code, or if it hit some sort of db/transaction limit. This logging should help dianose that (hopefully). If I find the bug, I will remove this extra logging.
2014-05-23 17:20:55 -05:00
John Chilton fd96ce12cd Add some more colllection creation logging.
Bug report from takadonet of collection request with 280 items only creating 60 - want to know if request got chopped off by proxy or paste, there was some logic error in my code, or if it hit some sort of db/transaction limit. This logging should help dianose that (hopefully). If I find the bug, I will remove this extra logging.
2014-05-23 17:20:55 -05:00
Greg Von Kuster 04398b865c Reuse (rather than copy) the Galaxy API AuthenticationController class in the Tool Shed. 2014-05-23 15:09:35 -04:00
Greg Von Kuster f13d6fde70 Enhance the Tool Shed API as well as the Tool Shed's install and test framework in order to integrate the latter into the Tool Shed's new repository registry. 2014-05-23 13:18:06 -04:00
Dannon Baker 5fd8615938 Add noqa comments to prevent pep8 from asking folks to change == to 'is' here. 2014-05-23 12:42:29 -04:00
Dannon Baker 9596ebb259 Merge next-stable. 2014-05-23 12:00:40 -04:00