Commit Graph
35045 Commits
Author SHA1 Message Date
Dannon Baker 4cdd210bb2 Use os.pardir instead of ../. Thanks @nsoranzo 2018-06-15 14:49:46 -04:00
Dannon Baker 8364ebebcd Add static-safe mapping for uwsgi for plugin static dirs, which are accessible via symlink 2018-06-15 14:11:19 -04:00
Dannon Baker 370ea25d2c Minor refactoring, comments. 2018-06-15 12:48:02 -04:00
Dannon Baker e110489cc5 Call plugin static dir regeneration in the event client isn't being built (which also does this, albeit slightly differently) 2018-06-15 11:46:08 -04:00
Dannon Baker fc47618f67 Initial python-based plugin staging. to be used from common startup. 2018-06-15 11:41:06 -04:00
Nate Coraor e7b7bee82e Merge pull request #6293 from nsoranzo/release_18.05_strip_slurm_warning
[18.05] Strip a spurious Slurm warning from job stderr
2018-06-11 09:05:46 -04:00
John Chilton dba21dc8a4 Merge pull request #6311 from martenson/backport-and-build
[18.05] Backport and build client changes
2018-06-08 13:32:45 -04:00
Martin Cech 96fbe9702d backport and build client 2018-06-08 13:28:40 -04:00
Sebastian Kapust 3c36bec290 Fix tool search overlay link 2018-06-08 13:24:50 -04:00
John Chilton 9957c02737 Fix file type error in RuleCollectionBuilder. 2018-06-08 13:24:40 -04:00
John Chilton 7eb927b631 Fix delete "Collection Only" option in history menu.
Broken with https://github.com/galaxyproject/galaxy/commit/7cc01380afd017c5cac2af2b2d735b2265774a68.
2018-06-08 13:24:24 -04:00
Martin Cech a56c4e9cf6 Merge pull request #6260 from dannon/history-view-fixes
[18.05] History view 'import' button display based on ownership.
2018-06-08 12:20:38 -05:00
Martin Cech 85265ebd79 Merge pull request #6237 from dannon/history_contents_multiview
[18.05] Fix history contents w/ proxy prefix (multiview error)
2018-06-08 12:19:36 -05:00
Martin Cech 54ec854c13 remove outdated comment 2018-06-08 13:19:13 -04:00
Martin Cech 20cf8b5bf0 Merge pull request #6226 from dannon/minor_style_fixes
[18.05] Two minor aliases for (exterior) backwards compatibility, minor badge tweaks
2018-06-08 12:16:33 -05:00
Martin Cech 75c9610fda Merge pull request #6243 from dannon/workflow_submit_text_backport
[18.05] Backport of Workflow Execution Text Fixup
2018-06-08 12:15:05 -05:00
Martin Cech f1adf0a792 Merge pull request #6238 from dannon/1805stylefixes_rebased
[18.05] Various style fixes for history, toolshed, messages (backport)
2018-06-08 12:12:50 -05:00
Nicola Soranzo 12f51a4789 Merge pull request #6304 from mvdbeek/sleep_more
[18.05] Increase sleep if encountering (DB locking) exception
2018-06-08 14:28:15 +01:00
mvdbeek 753ecd625c Increase sleep if encountering exception 2018-06-08 11:07:51 +02:00
Martin Cech 36fcb5c1b7 Merge pull request #6301 from martenson/grt-config
[18.05] add the canonical url to grt config
2018-06-07 15:01:03 -05:00
Martin Cech ed56454ca0 add the canonical url to grt config 2018-06-07 09:15:47 -04:00
Nicola Soranzo 711070dc4c Merge branch 'release_18.01' into release_18.05 2018-06-07 10:28:42 +01:00
Martin Cech 3007c93d7c Merge pull request #6266 from jmchilton/from_param_fixes_backport
[18.01] Backport fixes for collection output actions.
2018-06-06 16:39:55 -05:00
Nate Coraor a2fe4b0c76 Merge pull request #6295 from nsoranzo/release_18.01_followup_on_6262
[18.01] Fix `GALAXY_RUN_ALL=1 ./run.sh --daemon`
2018-06-06 14:43:26 -04:00
Nicola Soranzo 7b741a32cd Fix GALAXY_RUN_ALL=1 ./run.sh --daemon
Broken in commit 0ea8107191 .
Reported by @lparsons in
https://github.com/galaxyproject/galaxy/pull/6262#issuecomment-395113621
2018-06-06 18:29:15 +01:00
Helena Rasche acb4cdf584 Merge pull request #6285 from martenson/grt-defensive
[18.05] telescope export: change to a more defensive approach
2018-06-06 15:15:27 +00:00
Nicola Soranzo 2b8beb69c4 Merge branch 'release_18.01' into release_18.05 2018-06-06 15:58:08 +01:00
Nate Coraor a0004db720 Merge pull request #6262 from nsoranzo/release_18.01_fix_run_scripts
[18.01] Various fixes for the run scripts
2018-06-06 10:52:01 -04:00
Nicola Soranzo 5a0f98802c Strip a spurious Slurm warning from job stderr
Reason for the Slurm warning
----------------------------

The Linux kernel memory controller (responsible for the memory cgroup) may
run out of cgroup subsystem state (CSS) IDs. When a cgroup is created it is
assigned a CSS ID to manage its state. Upon removal of the cgroup the
corresponding state information (e.g. cache entries) may still exist and
therefore the CSS ID is still held. When multiple frequent short-lived jobs
are run on a cluster node, the number of available CSS IDs becomes exhausted
and creating a new memory cgroup results in a ENOSPC ("No space left on
device"), which is reported by SLURM with the message "unable to add
task[pid=<PID>] to memory cg '(null)'" (even if jobs run fine).

There is a bugfix for the kernel that releases the CSS ID upon cgroup
destruction, but it appears to be only available after Linux 4.4. We use
CentOS 7, which is based on Linux 3.10. The only temporary solutions is to
reboot the affected cluster node.

Thanks to @tuxtobin for the detailed analysis above.

Reason for this patch
---------------------

Many tools rely on an empty stderr to determine if the job was successful,
either because they were never updated to use `<stdio>`/`detect_errors`, or
because the underlying tool returns a non-zero exit code when successful,
e.g. `tranalign` from
https://toolshed.g2.bx.psu.edu/view/devteam/emboss_5/832c20329690 .
Even using a `<regex>` inside `<stdio>` would not work because the Slurm
warning contains the word `error`.
2018-06-06 14:34:02 +01:00
Martin Cech e767438afc add spaces before inline comment 2018-06-05 16:38:56 -04:00
Martin Cech b62099f418 change to a more defensive approach, clarify varnames 2018-06-05 16:19:04 -04:00
Martin Cech a40abcd6e4 Merge pull request #6263 from atyryshkina/modify-grt-export
[18.05] Fix dataset sizes in GRT export script
2018-06-05 12:02:51 -05:00
Anastasia Tyryshkina c37e384454 style fix 2018-06-05 12:47:19 -04:00
Anastasia Tyryshkina dd4de3f3b2 catch dataset_id=None 2018-06-05 12:23:02 -04:00
Anastasia Tyryshkina 6db9fd3d51 style fix 2018-06-04 16:01:32 -04:00
Anastasia Tyryshkina 191a134bbc got rid of things that are no longer necessary 2018-06-04 15:57:22 -04:00
Anastasia Tyryshkina 948d0767eb more style fixes 2018-06-04 14:34:09 -04:00
Anastasia Tyryshkina ba45c15fff tried to fix some of stylization fails 2018-06-04 14:27:24 -04:00
Anastasia Tyryshkina 4630994fd0 get output datasets as well 2018-06-04 13:33:59 -04:00
Anastasia Tyryshkina 5b7055fc6f respect blacklisted tools 2018-06-04 12:56:47 -04:00
Anastasia Tyryshkina 0c852257bb delete comment thats no longer necessary 2018-06-04 12:39:55 -04:00
Anastasia Tyryshkina aa062f8546 fixed the issues with the last pull 2018-06-04 11:53:14 -04:00
mvdbeek 3e22b0b11b Test case for mapping over inputs with output ftype determined via input extension 2018-06-04 07:00:41 -04:00
mvdbeek bc8254faec Do not adapt target collection to child collection type
Otherwise mapping over list:list:pair to a pair input breaks
at https://github.com/galaxyproject/galaxy/blob/21b44bf348ae10d170ab96a3b6f30bf9dbbd5a4a/lib/galaxy/dataset_collections/subcollections.py#L12.

This and the previous commit should fix
https://github.com/galaxyproject/tools-iuc/issues/1563.
2018-06-04 07:00:38 -04:00
mvdbeek 49a1be4f1d Allow from_param to reference a child collection
This is necessary when mapping over a collection over an input
that is referenced in the output section, like so:
```
...
<when value="paired_collection">
    <action type="format">
        <option type="from_param" name="library.input_1" param_attribute="reverse.ext" />
    </action>
</when>
...
```
2018-06-04 07:00:36 -04:00
Nicola Soranzo aaff474142 Use consistent preference order for config files
1) galaxy.yml
2) galaxy.ini
3) universe_wsgi.ini

Also:
- properly quote variables which may contain spaces
- no need to pass the config file to `./scripts/manage_tool_dependencies.py`
- simplify `scripts/maintenance.sh` by moving the `cd` up and reusing
  functions from `scripts/common_startup_functions.sh`
2018-06-02 03:28:54 +01:00
Nicola Soranzo c9daa60e91 Look for config file inside galaxy.dependencies.optional()
Also don't fail if no config file is found, just print a message on
stderr.
This allows the removal of the code to set `GALAXY_CONFIG_FILE` from
`scripts/common_startup.sh` .
2018-06-02 03:14:38 +01:00
Nicola Soranzo 87719b9f8e Check for empty pid file when using --wait
Fix this error message:

```
Executing: python ./scripts/paster.py serve config/galaxy.ini  --daemon --server-name="main" --pid-file="main.pid" --log-file="main.log"
Entering daemon mode
../run.sh: 96: [: Illegal number:
.....
```
2018-06-02 01:09:10 +01:00
Nicola Soranzo 0ea8107191 Use separate pid_log_paster_args variable
to store --pid-file and --log-file options of `./scripts/paster.py` .

https://github.com/galaxyproject/galaxy/pull/6239 fixed 3 bugs:

- `GALAXY_RUN_ALL=1 ./run.sh` was reusing the same pid and log files for
  all Galaxy processes;
- `./run.sh restart` was always using `paster.pid` and `paster.log` instead
  of the configured files
- `./run.sh status` was always using `paster.pid`

but also introduced a regression, i.e. the plain `./run.sh` started
writing to the log file instead of the standard output (console).

This fixes the regression by using a separate variable for these options
instead of conflating them in `paster_args` or `server_args`.
2018-06-02 01:09:10 +01:00
Anastasia Tyryshkina 11575132dc exports a dataset tsv 2018-06-01 16:47:57 -04:00