engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(region for s3 storage): added configurable region of s3 storage.

Browse source
This commit is contained in:
Serhii Ilin 2024-07-03 14:17:17 +03:00
parent 9019f7e9c8
commit 61c700577b
5 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
configs/development.ini
View file

@ -307,6 +307,9 @@ archive_cache.objectstore.key = key
; secret for s3 auth
archive_cache.objectstore.secret = secret
;region for s3 storage
archive_cache.objectstore.region = eu-central-1
; number of sharded buckets to create to distribute archives across
; default is 8 shards
archive_cache.objectstore.bucket_shards = 8

3
configs/production.ini
View file

@ -275,6 +275,9 @@ archive_cache.objectstore.key = key
; secret for s3 auth
archive_cache.objectstore.secret = secret
;region for s3 storage
archive_cache.objectstore.region = eu-central-1
; number of sharded buckets to create to distribute archives across
; default is 8 shards
archive_cache.objectstore.bucket_shards = 8

1
rhodecode/config/config_maker.py
View file

@ -204,6 +204,7 @@ def sanitize_settings_and_apply_defaults(global_config, settings):
settings_maker.make_setting('archive_cache.objectstore.url', jn(default_cache_dir, 'archive_cache'), default_when_empty=True,)
settings_maker.make_setting('archive_cache.objectstore.key', '')
settings_maker.make_setting('archive_cache.objectstore.secret', '')
settings_maker.make_setting('archive_cache.objectstore.region', 'eu-central-1')
settings_maker.make_setting('archive_cache.objectstore.bucket', 'rhodecode-archive-cache', default_when_empty=True,)
settings_maker.make_setting('archive_cache.objectstore.bucket_shards', 8, parser='int')

3
rhodecode/lib/archive_cache/backends/objectstore_cache.py
View file

@ -142,10 +142,11 @@ class ObjectStoreCache(BaseCache):
endpoint_url = settings.pop('archive_cache.objectstore.url')
key = settings.pop('archive_cache.objectstore.key')
secret = settings.pop('archive_cache.objectstore.secret')
region = settings.pop('archive_cache.objectstore.region')
log.debug('Initializing %s archival cache instance', self)
fs = fsspec.filesystem('s3', anon=False, endpoint_url=endpoint_url, key=key, secret=secret)
fs = fsspec.filesystem('s3', anon=False, endpoint_url=endpoint_url, key=key, secret=secret, region=region)
# init main bucket
if not fs.exists(self._bucket):

3
rhodecode/tests/rhodecode.ini
View file

@ -275,6 +275,9 @@ archive_cache.objectstore.key = key
; secret for s3 auth
archive_cache.objectstore.secret = secret
;region for s3 storage
archive_cache.objectstore.region = eu-central-1
; number of sharded buckets to create to distribute archives across
; default is 8 shards
archive_cache.objectstore.bucket_shards = 8