Move move_files to a broadcast model. #2946
Merged
Conversation
This file contains hidden or 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
ericholscher
added
the
PR: work in progress
ericholscher
force-pushed
the
broadcast-fixes
branch
from
05f20b4 to
804b4aa
Compare
ericholscher
added
PR: ready for review
and removed
PR: work in progress
|
Looks like tests are failing. I'll set this back to WIP until ready for review. |
agjohnson
added
PR: work in progress
This will require an update to the Settings in prod, to default a RemotePuller instead of the DoubleRemotePuller
ericholscher
force-pushed
the
broadcast-fixes
branch
from
804b4aa to
964e09b
Compare
ericholscher
added
PR: ready for review
and removed
PR: work in progress
|
Tested fixed. |
agjohnson
approved these changes
Jun 15, 2017
| @@ -163,7 +163,7 @@ def save(self, *args, **kwargs): # pylint: disable=arguments-differ | |||
| def delete(self, *args, **kwargs): # pylint: disable=arguments-differ | |||
| from readthedocs.projects import tasks | |||
| log.info('Removing files for version %s', self.slug) | |||
| tasks.clear_artifacts.delay(version_pk=self.pk) | |||
| broadcast(type='app', task=tasks.clear_artifacts, args=[self.pk]) | |||
| broadcast(type='app', task=tasks.symlink_project, args=[self.project.pk]) | |||
There was a problem hiding this comment.
If we were using a newer version of celery, this would be a good case for chaining the tasks:
http://docs.celeryproject.org/en/latest/userguide/canvas.html#chains
I'd like to use more celery features, if we can get around to upgrading celery at some point.
There was a problem hiding this comment.
Aye. Would be useful for a few things.
| @@ -909,7 +909,7 @@ def remove_dir(path): | |||
| shutil.rmtree(path, ignore_errors=True) | |||
|
|
|||
|
|
|||
| @task(queue='web') | |||
| @task() | |||
| def clear_artifacts(version_pk): | |||
| """Remove artifacts from the web servers""" | |||
There was a problem hiding this comment.
If not running on just the web queue, docs need updating here.
There was a problem hiding this comment.
It will still only work on the web servers, but instead run on the web0[1-4] queues instead of the generic web queue.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This will require an update to the Settings in prod, to default a
RemotePuller instead of the DoubleRemotePuller