Skip to content

WIP: removing empty FileInstance #1738

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

Open
switowski wants to merge 3 commits into
base: main
Choose a base branch
from
Open

WIP: removing empty FileInstance #1738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fed7790
fixtures: add access restrictions for SCADA cat
kpsherva Jul 5, 2018
2ae18c3
tasks: Clean FileInstances with ObjectVersions
switowski Jul 17, 2018
9061ee1
wip
switowski Jul 17, 2018
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
3 changes: 3 additions & 0 deletions cds/modules/fixtures/data/categories.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@
"restricted": [],
"responsible": ["service-winccoa@cern.ch"]
},
"_access": {
"read" : ["service-winccoa@cern.ch"]
},
"_record_type": ["PROJECT"]
}
]
13 changes: 13 additions & 0 deletions cds/modules/webhooks/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,7 @@ def run(self, preset_quality, sleep_time=5, *args, **kwargs):
with db.session.begin_nested():
# Create FileInstance
file_instance = FileInstance.create()
logging.debug('FileInstance created')

# Create ObjectVersion
obj_key = self._build_subformat_key(preset_quality=preset_quality)
Expand Down Expand Up @@ -769,3 +770,15 @@ def dispose_object_version(object_version):
# remove the object version
ObjectVersion.delete(
bucket=object_version.bucket, key=object_version.key)
clean_file_instances(object_version)


def clean_file_instances(object_version):
"""Clean up empty FileInstance objects attached to an ObjectVersion."""
if object_version:
file_instance = object_version.file
if (file_instance and file_instance.size == 0 and
not file_instance.uri and not file_instance.checksum):
# The FileInstance is empty, delete it, otherwise we will get
# notified about it in the "file integrity" report
file_instance.delete()