Commit Graph
7348 Commits
Author SHA1 Message Date
Dave Bouvier af815ee1bf Merge bugfix from stable. 2014-06-09 11:15:45 -04:00
Dave Bouvier d1d9f568ca Fix step handling for setup of perl and ruby environments. 2014-06-09 11:11:24 -04:00
Dannon Baker 82ca2fcc77 Swap require_admin decorator and trans.user_is_amdin to use the newer correctly filtered admin_users_list in app.config 2014-06-09 10:42:33 -04:00
Dannon Baker f2a711be12 Add correctly prefiltered admin_users_list to app.config and use it for remote auth. 2014-06-09 10:37:10 -04:00
John Chilton 530265d718 Merge. 2014-06-09 08:32:24 -05:00
John Chilton 069a9f61a1 Tools: MATCH (pair) multi-run datasets by default instead of doing ALL-V-ALL.
Worried this might be responsible for problems on main. TODO is to make this an optional and explicit like with workflows.
2014-06-09 08:30:40 -05:00
Dannon Baker 5ff2875549 Wrap remote user conditional on multiple lines. 2014-06-09 09:09:45 -04:00
Dannon Baker eeb946cec9 Slightly simplify remote_user_header access logic. 2014-06-09 08:40:40 -04:00
Dannon Baker 480ea96d90 Cleanup/pep8 of remoteuser middleware. 2014-06-09 08:38:47 -04:00
Dannon Baker 6f9d687269 One more touchup in webframework -- correct raise form and use multiple lines. 2014-06-09 08:35:32 -04:00
Dannon Baker 23b488f7bb pep8/cleanup. set NERD_tree_1noqa for impossible sqlalchemy lines. 2014-06-09 08:33:25 -04:00
Dannon Baker 5769ea88fa Fix impersonation when using external authentication. Admins can now impersonate (and then log out of) users when using external auth. 2014-06-09 08:14:18 -04:00
Dannon Baker a01ccc9f4a Update user honeypot error message. 2014-06-09 07:58:18 -04:00
Greg Von Kuster 5d56c27f9c More fixes for handling 307 redirects not being handled nicely by urllib2.urlopen() when the urllib2.Request has data provided. 2014-06-08 08:45:16 -04:00
Dannon Baker 5ccd70ebea Clarify language in DeleteIntermediateDataset PJA. 2014-06-06 17:12:30 -04:00
Dannon Baker 54a6ebe355 Cleanup, pep8 for postjobactions. 2014-06-06 16:44:47 -04:00
Dannon Baker 4fb8b2d9f0 Initial version of delete intermediate output steps action for workflows. 2014-06-06 16:32:44 -04:00
Dannon Baker 82941fa9f8 Add Workflow.has_outputs_defined to the Workflow model. 2014-06-06 15:36:07 -04:00
Greg Von Kuster 9580a076d5 Fix for getting updates to an installed repository that has a dependency on a Tool dependency definition repository that also has available updates. 2014-06-06 09:45:37 -04:00
John Chilton 2a90811ea3 Another fix for remotely populated metadata FileParameters.
Requires update to remote LWR as well.
2014-06-05 17:08:24 -05:00
Nate Coraor 41a7637a76 Allow hiding tools from the toolbox config. 2014-06-05 14:46:56 -04:00
John Chilton 036168bdad Fix working directory used for remote metadata command generation.
In short - should fix bam outputs for LWR jobs when setting metadata on remote resource. Thanks to @natefoo for tracking down problem.
2014-06-05 11:54:58 -05:00
Dave Bouvier 67718f9d52 Merge bugfix from stable. 2014-06-04 15:15:23 -04:00
Dave Bouvier d206339d2b Fix resetting all metadata based on issue found by Nicola Soranzo. 2014-06-04 15:04:33 -04:00
John Chilton 51762ac859 Update LWR client throught LWR changeset 860ba9c.
Allows asynchornous submission of LWR jobs to remote servers without a remote LWR service running. LWR still needs to be configured there and job updates are should be configured to be sent back to Galaxy through AMQP.

A long running process will be executed on the remote server to monitor the job - while this will always be needed in some cases - for others it would be great to be able to embedded the update steps into the job to be submitted to the DRM itself so that this long running process can be just a submission.

This is one more potential step down the road toward allowing remote execution of Galaxy jobs with ever fewer remote constraints. Extensions to this would include allowing Galaxy job updates via the jobs API (along with staging) so MQ becomes optional, allowing auto-configuration of remote LWR application if unavailable or unconfigured, more transfer options (scp), more CLI shell options (fabric, ansible, etc...).
2014-06-04 12:16:38 -05:00
Daniel Blankenberg 42d9136147 Fix for installing from toolshed that uses 307 redirects that are not being handled nicely by urllib2.urlopen when the urllib2.Request has data provided. 2014-06-04 11:05:36 -04:00
Daniel Blankenberg 104d36a187 Fix for installing from toolshed that uses 307 redirects that are not being handled nicely by urllib2.urlopen when the urllib2.Request has data provided. 2014-06-04 11:05:36 -04:00
Greg Von Kuster 0285192a4c Fix the exception handler in the Tool Shed APi submit() function so that an expected dict is returned instead of a string. 2014-06-04 09:21:18 -04:00
Dave Bouvier 57440965e7 Merge fix from stable. 2014-06-03 17:04:13 -04:00
Daniel Blankenberg a391491747 Fix for Safari Caching External View application 302 redirect links. See https://trello.com/c/optldnPm 2014-06-03 17:03:17 -04:00
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
Dave Bouvier dd95c9303a Add change that was lost when resolving a merge conflict. 2014-06-03 16:52:18 -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