Skip to content

Fixing Minio newest package version incompability #847

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

Merged
merged 8 commits into from
Dec 10, 2020
Merged

Fixing Minio newest package version incompability #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a5ea986
Update exception to more general form. Need to find out exactly what …
Synicix Dec 10, 2020
780d57b
Update print(e) statements to avoid github action errors
Synicix Dec 10, 2020
d489b47
Added more specifc cases for error
Synicix Dec 10, 2020
78c208a
Change error handling to be more specific to minio.error.S3Error
Synicix Dec 10, 2020
912a31a
Change error handling to be a bit more specific simlar to the old ver…
Synicix Dec 10, 2020
a11dd92
Update requirement to set minio>=7.0.0
Synicix Dec 10, 2020
0fb4e52
Remove white space
Synicix Dec 10, 2020
b541887
Remove additonal white space
Synicix Dec 10, 2020
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
21 changes: 15 additions & 6 deletions datajoint/s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,11 @@ def get(self, name):
logger.debug('get: {}:{}'.format(self.bucket, name))
try:
return self.client.get_object(self.bucket, str(name)).data
except minio.error.NoSuchKey:
raise errors.MissingExternalFile('Missing s3 key %s' % name) from None
except minio.error.S3Error as e:
if e.code == 'NoSuchKey':
raise errors.MissingExternalFile('Missing s3 key %s' % name) from None
else:
raise e

def fget(self, name, local_filepath):
"""get file from object name to local filepath"""
Expand All @@ -59,16 +62,22 @@ def exists(self, name):
logger.debug('exists: {}:{}'.format(self.bucket, name))
try:
self.client.stat_object(self.bucket, str(name))
except minio.error.NoSuchKey:
return False
except minio.error.S3Error as e:
if e.code == 'NoSuchKey':
return False
else:
raise e
return True

def get_size(self, name):
logger.debug('get_size: {}:{}'.format(self.bucket, name))
try:
return self.client.stat_object(self.bucket, str(name)).size
except minio.error.NoSuchKey:
raise errors.MissingExternalFile from None
except minio.error.S3Error as e:
if e.code == 'NoSuchKey':
raise errors.MissingExternalFile from None
else:
raise e

def remove_object(self, name):
logger.debug('remove_object: {}:{}'.format(self.bucket, name))
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ pandas
tqdm
networkx
pydot
minio
minio>=7.0.0
matplotlib
14 changes: 8 additions & 6 deletions tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,9 @@ def setup_package():
region = "us-east-1"
try:
minioClient.make_bucket(S3_MIGRATE_BUCKET, location=region)
except minio.error.BucketAlreadyOwnedByYou:
pass
except minio.error.S3Error as e:
if e.code != 'BucketAlreadyOwnedByYou':
raise e

pathlist = Path(source).glob('**/*')
for path in pathlist:
Expand All @@ -149,8 +150,9 @@ def setup_package():
# Add S3
try:
minioClient.make_bucket(S3_CONN_INFO['bucket'], location=region)
except minio.error.BucketAlreadyOwnedByYou:
pass
except minio.error.S3Error as e:
if e.code != 'BucketAlreadyOwnedByYou':
raise e

# Add old File Content
try:
Expand Down Expand Up @@ -179,14 +181,14 @@ def teardown_package():
remove("dj_local_conf.json")

# Remove old S3
objs = list(minioClient.list_objects_v2(
objs = list(minioClient.list_objects(
S3_MIGRATE_BUCKET, recursive=True))
objs = [minioClient.remove_object(S3_MIGRATE_BUCKET,
o.object_name.encode('utf-8')) for o in objs]
minioClient.remove_bucket(S3_MIGRATE_BUCKET)

# Remove S3
objs = list(minioClient.list_objects_v2(S3_CONN_INFO['bucket'], recursive=True))
objs = list(minioClient.list_objects(S3_CONN_INFO['bucket'], recursive=True))
objs = [minioClient.remove_object(S3_CONN_INFO['bucket'],
o.object_name.encode('utf-8')) for o in objs]
minioClient.remove_bucket(S3_CONN_INFO['bucket'])
Expand Down