Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds proxy server to minio / aws s3 storage #962

Merged
merged 10 commits into from
Oct 1, 2021
Merged

Adds proxy server to minio / aws s3 storage #962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
322ae0e
Revert "Merge pull request #825 from dimitri-yatsenko/master"
MaxFBurg Sep 16, 2021
aa5819c
[wip] try for gwdg hpc
MaxFBurg Sep 16, 2021
f1c2795
[wip] add print for debugging
MaxFBurg Sep 16, 2021
94e259d
add proxy_server key to stores config, use it in interface
MaxFBurg Sep 16, 2021
58aed20
clean up comments
MaxFBurg Sep 16, 2021
c61947d
Merge branch '0.12.7_minio_proxy' into add_minio_proxy_server
MaxFBurg Sep 16, 2021
cc0db13
Use ternary operator to not add additional lines without accompanying…
MaxFBurg Sep 27, 2021
583c9e6
Comply with 94 characters line limit
MaxFBurg Sep 27, 2021
aa574e3
Fix PEP8 styling error
MaxFBurg Sep 27, 2021
82d4310
Fix PEP8 styling error
MaxFBurg Sep 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions datajoint/s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"""
from io import BytesIO
import minio # https://docs.minio.io/docs/python-client-api-reference
import urllib3
import warnings
import uuid
import logging
Expand All @@ -16,9 +17,24 @@ class Folder:
"""
A Folder instance manipulates a flat folder of objects within an S3-compatible object store
"""
def __init__(self, endpoint, bucket, access_key, secret_key, *, secure=False, **_):
self.client = minio.Minio(endpoint, access_key=access_key, secret_key=secret_key,
secure=secure)
def __init__(self, endpoint, bucket, access_key, secret_key, *, secure=False,
proxy_server=None, **_):
# from https://docs.min.io/docs/python-client-api-reference
self.client = minio.Minio(
endpoint,
access_key=access_key,
secret_key=secret_key,
secure=secure,
http_client=(
urllib3.ProxyManager(proxy_server,
timeout=urllib3.Timeout.DEFAULT_TIMEOUT,
cert_reqs="CERT_REQUIRED",
retries=urllib3.Retry(total=5,
backoff_factor=0.2,
status_forcelist=[500, 502, 503,
504]))
if proxy_server else None),
)
self.bucket = bucket
if not self.client.bucket_exists(bucket):
raise errors.BucketInaccessible('Inaccessible s3 bucket %s' % bucket)
Expand Down
3 changes: 2 additions & 1 deletion datajoint/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ def get_store_spec(self, store):
spec['subfolding'] = spec.get('subfolding', DEFAULT_SUBFOLDING)
spec_keys = { # REQUIRED in uppercase and allowed in lowercase
'file': ('PROTOCOL', 'LOCATION', 'subfolding', 'stage'),
's3': ('PROTOCOL', 'ENDPOINT', 'BUCKET', 'ACCESS_KEY', 'SECRET_KEY', 'LOCATION', 'secure', 'subfolding', 'stage')}
's3': ('PROTOCOL', 'ENDPOINT', 'BUCKET', 'ACCESS_KEY', 'SECRET_KEY', 'LOCATION',
'secure', 'subfolding', 'stage', 'proxy_server')}

try:
spec_keys = spec_keys[spec.get('protocol', '').lower()]
Expand Down