Unverified Commit f633ef38 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #13995 from natefoo/gravity-enable-service-options 

A few small Gravity updates
parents 33e48ec7 b427d3a5

doc/source/admin/scaling.md

+6 −6
Original line number Diff line number Diff line
@@ -377,22 +377,22 @@ gravity: 
    handler:

      processes: 3

      pools:

        - job-handler

        - workflow-scheduler

        - job-handlers

        - workflow-schedulers

    special:

      pools:

        - job-handler.special

        - job-handlers.special

```



In this example 4 processes will be started in total:

3 processes will act as job handler and workflow scheduler, and one process will be dedicated to handling jobs for the `special` tag only. With the `job_conf.xml` configuration above these would be jobs created by the `test1` tool.

3 processes will act as job handlers and workflow schedulers, and one process will be dedicated to handling jobs for the `special` tag only. With the `job_conf.xml` configuration above these would be jobs created by the `test1` tool.

You can omit the `pools` argument, this will then default to:



```yaml

        ...

        pools:

          - job-handler

          - workflow-scheduler

          - job-handlers

          - workflow-schedulers

        ...

```

lib/galaxy/config/sample/galaxy.yml.sample

+30 −2
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ gravity: 
  # Configuration for Gunicorn.

  gunicorn:



    # Enable Galaxy gunicorn server.

    # enable: true



    # The socket to bind. A string of the form: ``HOST``, ``HOST:PORT``, ``unix:PATH``, ``fd://FD``. An IP is a valid HOST.

    # bind: localhost:8080
@@ -64,12 +67,22 @@ gravity: 
    # extra_args:



    # Use Gunicorn's --preload option to fork workers after loading the Galaxy Application.

    # Consumes less memory when multiple processes are configured.

    # preload: true

    # Consumes less memory when multiple processes are configured. Default is ``false`` if using unicornherder, else ``true``.

    # preload:



    # Extra environment variables and their values to set when running the service. A dictionary where keys are the variable

    # names.

    # environment: {}



  # Configuration for Celery Processes.

  celery:



    # Enable Celery distributed task queue.

    # enable: true



    # Enable Celery Beat periodic task runner.

    # enable_beat: true



    # Number of Celery Workers to start.

    # concurrency: 2
@@ -87,6 +100,10 @@ gravity: 
    # Extra arguments to pass to Celery command line.

    # extra_args:



    # Extra environment variables and their values to set when running the service. A dictionary where keys are the variable

    # names.

    # environment: {}



  # Configuration for gx-it-proxy.

  gx_it_proxy:
@@ -118,6 +135,10 @@ gravity: 
    # This is an advanced option that is only needed when proxying to remote interactive tool container that cannot be reached through the local network.

    # reverse_proxy: false



    # Extra environment variables and their values to set when running the service. A dictionary where keys are the variable

    # names.

    # environment: {}



  # Configuration for tusd server (https://github.com/tus/tusd).

  # The ``tusd`` binary must be installed manually and made available on PATH (e.g in galaxy's .venv/bin directory).

  tusd:
@@ -126,6 +147,9 @@ gravity: 
    # If enabled, you also need to set up your proxy as outlined in https://docs.galaxyproject.org/en/latest/admin/nginx.html#receiving-files-via-the-tus-protocol.

    # enable: false



    # Path to tusd binary

    # tusd_path: tusd



    # Host to bind the tusd server to

    # host: localhost
@@ -139,6 +163,10 @@ gravity: 
    # Extra arguments to pass to tusd command line.

    # extra_args:



    # Extra environment variables and their values to set when running the service. A dictionary where keys are the variable

    # names.

    # environment: {}



  # Configure dynamic handlers in this section.

  # See https://docs.galaxyproject.org/en/latest/admin/scaling.html#dynamically-defined-handlers for details.

  # handlers: {}

lib/galaxy/dependencies/dev-requirements.txt

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ fs==2.4.16 
funcsigs==1.0.2

future==0.18.2; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0")

galaxy-sequence-utils==1.1.5

gravity==0.12.0; python_version >= "3.6"

gravity==0.13.1; python_version >= "3.6"

greenlet==1.1.2; python_version >= "3" and python_full_version < "3.0.0" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0") and (python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.7") and (python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.6.0") or python_version >= "3" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0") and (python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.7") and (python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.6.0") and python_full_version >= "3.5.0"

gunicorn==20.1.0; python_version >= "3.5"

gxformat2==0.15.0

lib/galaxy/dependencies/pinned-requirements.txt

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ fs==2.4.16 
funcsigs==1.0.2

future==0.18.2; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0")

galaxy-sequence-utils==1.1.5

gravity==0.12.0; python_version >= "3.6"

gravity==0.13.1; python_version >= "3.6"

greenlet==1.1.2; python_version >= "3" and python_full_version < "3.0.0" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0") and (python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.7") and (python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.6.0") or python_version >= "3" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0") and (python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.7") and (python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.6.0") and python_full_version >= "3.5.0"

gunicorn==20.1.0; python_version >= "3.5"

gxformat2==0.15.0