opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-16 07:19:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed default beaker cache table name to beaker_cache for all caches

Browse Source 
All 3 beaker caches, mulled_resolution, citations, biotools service,
now use the same default cache table, beaker_cache. This reduces the
number of open db connections because beaker creates a separate
sqlalchemy engine and associated connection pool for each distinct
table and each connection pool opens up a certain number of connections.
This was causing the integration tests to fail because the max
postgress connections(100) were being exceeded.
This commit is contained in:
claudiofr
2023-06-21 22:45:12 +02:00
committed by mvdbeek
parent 57e9502f33
commit cb9ff7c7b8
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/source/admin/galaxy_options.rst
+3 -3
View File
@@ -1289,7 +1289,7 @@
When biotools_service_cache_type = ext:database, this is
the database table name used by beaker for
bio.tools web service request related caching.
:Default: ``biotools_service_beaker_cache``
:Default: ``beaker_cache``
:Type: str
@@ -1369,7 +1369,7 @@
When citation_cache_type = ext:database, this is
the database table name used by beaker for
citation related caching.
:Default: ``citation_beaker_cache``
:Default: ``beaker_cache``
:Type: str
@@ -1455,7 +1455,7 @@
When mulled_resolution_cache_type = ext:database, this is
the database table name used by beaker for
caching mulled resolution requests.
:Default: ``mulled_resolution_beaker_cache``
:Default: ``beaker_cache``
:Type: str
lib/galaxy/config/schemas/config_schema.yml
+3 -3
View File
@@ -914,7 +914,7 @@ mapping:
biotools_service_cache_table_name:
type: str
default: biotools_service_beaker_cache
default: beaker_cache
required: false
desc: |
Database table used by beaker for bio.tools web service request
@@ -964,7 +964,7 @@ mapping:
citation_cache_table_name:
type: str
default: citation_beaker_cache
default: beaker_cache
required: false
desc: |
Database table used by beaker for citation related caching.
@@ -1014,7 +1014,7 @@ mapping:
mulled_resolution_cache_table_name:
type: str
default: mulled_resolution_beaker_cache
default: beaker_cache
required: false
desc: |
Database table used by beaker for caching mulled resolution requests.
lib/galaxy/managers/citations.py
+1 -1
View File
@@ -42,7 +42,7 @@ class DoiCache:
"cache.data_dir": getattr(config, "citation_cache_data_dir", None),
"cache.lock_dir": getattr(config, "citation_cache_lock_dir", None),
"cache.url": getattr(config, "citation_cache_url", None),
"cache.table_name": getattr(config, "citation_cache_table_name", "citation_beaker_cache"),
"cache.table_name": getattr(config, "citation_cache_table_name", None),
"cache.schema_name": getattr(config, "citation_cache_schema_name", None),
}
self._cache = CacheManager(**parse_cache_config_options(cache_opts)).get_cache("doi")
lib/galaxy/tools/biotools.py
+1 -1
View File
@@ -20,7 +20,7 @@ def get_galaxy_biotools_metadata_source(config) -> BiotoolsMetadataSource:
"cache.data_dir": getattr(config, "biotools_service_cache_data_dir", None),
"cache.lock_dir": getattr(config, "biotools_service_cache_lock_dir", None),
"cache.url": getattr(config, "biotools_service_cache_url", config.database_connection),
"cache.table_name": getattr(config, "biotools_service_cache_table_name", "biotools_service_beaker_cache"),
"cache.table_name": getattr(config, "biotools_service_cache_table_name", None),
"cache.schema_name": getattr(config, "biotools_service_cache_schema_name", None),
}
cache = CacheManager(**parse_cache_config_options(cache_opts)).get_cache("doi")
test/unit/app/managers/test_CitationsManager_db.py
+1 -1
View File
@@ -13,7 +13,7 @@ class MockDoiCache(DoiCache):
"cache.data_dir": getattr(config, "citation_cache_data_dir", None),
"cache.lock_dir": getattr(config, "citation_cache_lock_dir", None),
"cache.url": "sqlite://",
"cache.table_name": getattr(config, "citation_cache_table_name", "citation_beaker_cache"),
"cache.table_name": getattr(config, "citation_cache_table_name", None),
"cache.schema_name": getattr(config, "citation_cache_schema_name", None),
}
self._cache = CacheManager(**parse_cache_config_options(cache_opts)).get_cache("doi")