Move move_files to a broadcast model.

This will require an update to the Settings in prod,
to default a RemotePuller instead of the DoubleRemotePuller

Author: ericholscher

readthedocs/core/utils/__init__.py

@@ -42,7 +42,7 @@ def run_on_app_servers(command):
     return ret
 
 
-def broadcast(type, task, args):  # pylint: disable=redefined-builtin
+def broadcast(type, task, args, kwargs=None):  # pylint: disable=redefined-builtin
     assert type in ['web', 'app', 'build']
     default_queue = getattr(settings, 'CELERY_DEFAULT_QUEUE', 'celery')
     if type in ['web', 'app']:
@@ -53,6 +53,7 @@ def broadcast(type, task, args):  # pylint: disable=redefined-builtin
         task.apply_async(
             queue=server,
             args=args,
+            kwargs=kwargs,
         )
 
 

readthedocs/projects/tasks.py

@@ -395,11 +395,10 @@ def build_docs_html(self):
 
         # Gracefully attempt to move files via task on web workers.
         try:
-            move_files.delay(
-                version_pk=self.version.pk,
-                html=True,
-                hostname=socket.gethostname(),
-            )
+            broadcast(type='app', task=move_files,
+                      args=[self.version.pk, socket.gethostname()],
+                      kwargs=dict(html=True)
+                      )
         except socket.error:
             # TODO do something here
             pass
@@ -559,15 +558,14 @@ def finish_build(version_pk, build_pk, hostname=None, html=False,
     if not epub:
         clear_epub_artifacts(version)
 
-    move_files(
-        version_pk=version_pk,
-        hostname=hostname,
-        html=html,
-        localmedia=localmedia,
-        search=search,
-        pdf=pdf,
-        epub=epub,
-    )
+    broadcast(type='app', task=move_files, args=[version_pk, hostname],
+              kwargs=dict(
+                  html=html,
+                  localmedia=localmedia,
+                  search=search,
+                  pdf=pdf,
+                  epub=epub,
+    ))
 
     # Symlink project on every web
     broadcast(type='app', task=symlink_project, args=[version.project.pk])