Use get with timeout for export

circle/storage/models.py

@@ -469,11 +469,11 @@ class Disk(TimeStampedModel):
         disk.save()
         return disk
 
-    def export(self, format):
+    def export(self, format, timeout=600):
         queue_name = self.get_remote_queue_name('storage', priority='slow')
         storage_tasks.export.apply_async(
             args=[self.get_disk_desc(), format],
-            queue=queue_name)
+            queue=queue_name).get(timeout=timeout)
 
     def destroy(self, user=None, task_uuid=None):
         if self.destroyed: