-
Notifications
You must be signed in to change notification settings - Fork 1k
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
[23.0] celery_extended doesn't update disk usage for work dir outputs. #14055
Closed
jmchilton
wants to merge
1
commit into
galaxyproject:release_23.0
from
jmchilton:broken_disk_usage_update
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
from galaxy_test.base.populators import ( | ||
DatasetPopulator, | ||
uses_test_history, | ||
) | ||
from galaxy_test.driver.integration_util import IntegrationTestCase | ||
|
||
|
||
class TestDiskUsageUpdateDefault(IntegrationTestCase): | ||
framework_tool_and_types = True | ||
|
||
def setUp(self): | ||
super().setUp() | ||
self.dataset_populator = DatasetPopulator(self.galaxy_interactor) | ||
|
||
@uses_test_history(require_new=False) | ||
def test_run_work_dir_glob(self, history_id): | ||
# Run a tool with a work dir glob and ensure content and disk usage is updated. | ||
self.dataset_populator.new_dataset(history_id, content="fwd1Test", wait=True) | ||
initial_disk_usage = self.dataset_populator.total_disk_usage() | ||
response = self.dataset_populator.run_tool("from_work_dir_glob", {}, history_id, assert_ok=True) | ||
self.dataset_populator.wait_for_job(job_id=response["jobs"][0]["id"]) | ||
final_disk_usage = self.dataset_populator.total_disk_usage() | ||
assert final_disk_usage == initial_disk_usage + 3 | ||
|
||
|
||
class TestDiskUsageCeleryExtended(TestDiskUsageUpdateDefault): | ||
@classmethod | ||
def handle_galaxy_config_kwds(cls, config): | ||
super().handle_galaxy_config_kwds(config) | ||
config["metadata_strategy"] = "celery_extended" | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was just trying this, as suggested by Marius, to see if this was somehow related to a possible issue when using Celery that I'm currently investigating (#15821).
What I found out about this is that when the
metadata_strategy
is set todirectory
ordirectory_celery
both test success, and they fail withextended
andextended_celery
so it seems that Celery is not the cause of this problem but something with theextended
metadata strategy itself.