Unverified Commit 5aad0131 authored by Martin Cech's avatar Martin Cech Committed by GitHub
Browse files

Merge pull request #13718 from mvdbeek/fix_quay_io_cache_use 

[22.01] Fix persistent mulled cache unused for repo_has_name
parents 1db61fc5 da61e770

doc/source/admin/galaxy_options.rst

+11 −3
Original line number Diff line number Diff line
@@ -1292,6 +1292,17 @@ 
:Type: str





~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

``mulled_resolution_cache_expire``

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~



:Description:

    Seconds until the beaker cache is considered old and a new value

    is created.

:Default: ``3600``

:Type: int





~~~~~~~~~~~~~~~~~~~~~~~~~~~~

``object_store_config_file``

~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -4835,6 +4846,3 @@ 
    <config_dir>.

:Default: ``vault_conf.yml``

:Type: str

lib/galaxy/app.py

+4 −3
Original line number Diff line number Diff line
@@ -218,9 +218,10 @@ class ConfiguresGalaxyMixin: 
        mulled_resolution_cache = None

        if self.config.mulled_resolution_cache_type:

            cache_opts = {

                'cache.type': self.config.mulled_resolution_cache_type,

                'cache.data_dir': self.config.mulled_resolution_cache_data_dir,

                'cache.lock_dir': self.config.mulled_resolution_cache_lock_dir,

                "cache.type": self.config.mulled_resolution_cache_type,

                "cache.data_dir": self.config.mulled_resolution_cache_data_dir,

                "cache.lock_dir": self.config.mulled_resolution_cache_lock_dir,

                "cache.expire": self.config.mulled_resolution_cache_expire,

            }

            mulled_resolution_cache = CacheManager(**parse_cache_config_options(cache_opts)).get_cache('mulled_resolution')

        self.container_finder = containers.ContainerFinder(app_info, mulled_resolution_cache=mulled_resolution_cache)

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

+4 −0
Original line number Diff line number Diff line
@@ -847,6 +847,10 @@ galaxy: 
  # <cache_dir>.

  #mulled_resolution_cache_lock_dir: mulled/locks



  # Seconds until the beaker cache is considered old and a new value is

  # created.

  #mulled_resolution_cache_expire: 3600



  # Configuration file for the object store If this is set and exists,

  # it overrides any other objectstore settings.

  # The value of this option will be resolved with respect to

lib/galaxy/config/schemas/config_schema.yml

+7 −0
Original line number Diff line number Diff line
@@ -930,6 +930,13 @@ mapping: 
        desc: |

          Lock directory used by beaker for caching mulled resolution requests.



      mulled_resolution_cache_expire:

        type: int

        default: 3600

        required: false

        desc: |

          Seconds until the beaker cache is considered old and a new value is created.



      object_store_config_file:

        type: str

        default: object_store_conf.xml

lib/galaxy/tool_util/deps/container_resolvers/__init__.py

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ class ResolutionCache(Bunch): 
    one resolution at a time in a single thread.

    """



    mulled_resolution_cache = None





class ContainerResolver(Dictifiable, metaclass=ABCMeta):

    """Description of a technique for resolving container images for tool execution."""