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.

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

Correct archives location #973

Merged
merged 1 commit into from
Dec 16, 2024
Merged

Correct archives location #973

merged 1 commit into from
Dec 16, 2024

Conversation

arhall0
Copy link
Collaborator

@arhall0 arhall0 commented Dec 9, 2024

Follow-up related to issue #877.

I checked git grep archives on develop and noticed some mention of the archives folder that should be updated to use the location defined in the config:

beeflow/client/core.py:    archive_dirs = ['logs', 'container_archive', 'archives', 'workflows']
beeflow/wf_manager/resources/wf_actions.py:            archive_path = f"{bee_workdir}/archives/{wf_id}.tgz"
beeflow/wf_manager/resources/wf_list.py:        archive_path = os.path.join(bee_workdir, 'archives', wf_id + '.tgz')

@arhall0 arhall0 added the WIP Work in progress label Dec 9, 2024
@arhall0 arhall0 self-assigned this Dec 9, 2024
@arhall0 arhall0 force-pushed the correct-archives-location branch from 015976b to e4abe2e Compare December 13, 2024 22:32
Follow-up related to issue 877. The archives folder was mentioned
in a few additional locations that need to be updated
@arhall0 arhall0 force-pushed the correct-archives-location branch from e4abe2e to 43bc6bf Compare December 13, 2024 22:33
@arhall0
Copy link
Collaborator Author

arhall0 commented Dec 13, 2024

The mention in beeflow/client/core.py is concerning making an archive of some folders in .beeflow when using beeflow core reset --archive. After discussion with @rstyd we decided it didn't make sense to add the workflow archives folder to this .beeflow archive if it was configured to be elsewhere. A message was added about this when running beeflow core reset inline with changes to container_archive.

The mention in beeflow/wf_manager/resources/wf_actions.py concerns the command beeflow remove which is for removing a specific workflow. This was adjusted so the archive of that workflow will be deleted as appropriate regardless of its location.

The mention in beeflow/wf_manager/resources/wf_list.py concerns the command beeflow copy. Although I adjusted this as appropriate to use the archives location as specified in the config file; this command currently appears bugged and may be removed per discussion with @rstyd.

@arhall0 arhall0 requested a review from rstyd December 13, 2024 22:40
@arhall0 arhall0 added bug Something isn't working and removed WIP Work in progress labels Dec 13, 2024
Copy link
Collaborator

@rstyd rstyd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great! Approved.

@rstyd rstyd merged commit 4296dac into develop Dec 16, 2024
18 checks passed
@pagrubel pagrubel deleted the correct-archives-location branch December 16, 2024 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants