Skip to content

PILOT_2779: fixup the core zone cannot resume the upload #52

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
colorzzr merged 1 commit into from
May 8, 2023
Merged

PILOT_2779: fixup the core zone cannot resume the upload #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 1 deletion app/services/file_manager/file_upload/file_upload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def simple_upload( # noqa: C901
tags = upload_event.get('tags')
zone = upload_event.get('zone')
# process_pipeline = upload_event.get('process_pipeline', None)
# upload_message = upload_event.get('upload_message')
upload_message = upload_event.get('upload_message')
current_folder_node = upload_event.get('current_folder_node', '')
parent_folder_id = upload_event.get('parent_folder_id', '')
create_folder_flag = upload_event.get('create_folder_flag', False)
Expand Down Expand Up @@ -155,6 +155,7 @@ def simple_upload( # noqa: C901
regular_file=regular_file,
tags=tags,
source_id=source_id,
upload_message=upload_message,
)

# format the local path into object storage path for preupload
Expand Down
1 change: 1 addition & 0 deletions app/services/file_manager/file_upload/upload_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ def output_manifest(self, file_objects: List[FileObject], output_path: str) -> D
'parent_folder_id': self.parent_folder_id,
'current_folder_node': self.current_folder_node,
'tags': self.tags,
'upload_message': self.upload_message,
'file_objects': {file_object.item_id: file_object.to_dict() for file_object in file_objects},
}

Expand Down