Execute Queries in RQ

.circleci/docker-compose.cypress.yml

@@ -31,7 +31,6 @@ services:
       REDASH_LOG_LEVEL: "INFO"
       REDASH_REDIS_URL: "redis://redis:6379/0"
       REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
-      QUEUES: "default periodic schemas"
   celery_worker:
     build: ../
     command: celery_worker

redash/app.py

@@ -23,7 +23,16 @@ def __init__(self, *args, **kwargs):
 
 
 def create_app():
-    from . import authentication, extensions, handlers, limiter, mail, migrate, security
+    from . import (
+        authentication,
+        extensions,
+        handlers,
+        limiter,
+        mail,
+        migrate,
+        security,
+        tasks,
+    )
     from .handlers.webpack import configure_webpack
     from .metrics import request as request_metrics
     from .models import db, users
@@ -47,5 +56,6 @@ def create_app():
     configure_webpack(app)
     extensions.init_app(app)
     users.init_app(app)
+    tasks.init_app(app)
 
     return app

redash/cli/rq.py

@@ -5,11 +5,12 @@
 
 from click import argument
 from flask.cli import AppGroup
-from rq import Connection, Worker
+from rq import Connection
 from sqlalchemy.orm import configure_mappers
 
 from redash import rq_redis_connection
-from redash.schedule import (
+from redash.tasks import Worker
+from redash.tasks.schedule import (
     rq_scheduler,
     schedule_periodic_jobs,
     periodic_job_definitions,
@@ -34,10 +35,10 @@ def worker(queues):
     configure_mappers()
 
     if not queues:
-        queues = ["periodic", "emails", "default", "schemas"]
+        queues = ["scheduled_queries", "queries", "periodic", "emails", "default", "schemas"]
 
     with Connection(rq_redis_connection):
-        w = Worker(queues, log_job_description=False)
+        w = Worker(queues, log_job_description=False, job_monitoring_interval=5)
         w.work()
 
 

redash/handlers/query_results.py

@@ -15,8 +15,9 @@
     require_permission,
     require_any_of_permission,
     view_only,
+    view_only,
 )
-from redash.tasks import QueryTask
+from redash.tasks import Job
 from redash.tasks.queries import enqueue_query
 from redash.utils import (
     collect_parameters_from_request,
@@ -35,6 +36,7 @@
     serialize_query_result,
     serialize_query_result_to_dsv,
     serialize_query_result_to_xlsx,
+    serialize_job,
 )
 
 
@@ -119,7 +121,7 @@ def run_query(query, parameters, data_source, query_id, max_age=0):
                 "Query ID": query_id,
             },
         )
-        return {"job": job.to_dict()}
+        return serialize_job(job)
 
 
 def get_download_filename(query_result, query, filetype):
@@ -441,12 +443,12 @@ def get(self, job_id, query_id=None):
         """
         Retrieve info about a running query job.
         """
-        job = QueryTask(job_id=job_id)
-        return {"job": job.to_dict()}
+        job = Job.fetch(job_id)
+        return serialize_job(job)
 
     def delete(self, job_id):
         """
         Cancel a query job in progress.
         """
-        job = QueryTask(job_id=job_id)
+        job = Job.fetch(job_id)
         job.cancel()

redash/monitor.py

@@ -45,7 +45,7 @@ def get_queues_status():
         },
         **{
             queue.name: {"size": len(queue)}
-            for queue in Queue.all(connection=rq_redis_connection)
+            for queue in Queue.all()
         },
     }
 
@@ -166,7 +166,7 @@ def rq_queues():
             "started": fetch_jobs(q, StartedJobRegistry(queue=q).get_job_ids()),
             "queued": len(q.job_ids),
         }
-        for q in Queue.all(connection=rq_redis_connection)
+        for q in Queue.all()
     }
 
 
@@ -189,7 +189,7 @@ def rq_workers():
             "failed_jobs": w.failed_job_count,
             "total_working_time": w.total_working_time,
         }
-        for w in Worker.all(connection=rq_redis_connection)
+        for w in Worker.all()
     ]
 
 

redash/serializers/__init__.py

@@ -6,6 +6,8 @@
 from funcy import project
 
 from flask_login import current_user
+from rq.job import JobStatus
+from rq.timeouts import JobTimeoutException
 
 from redash import models
 from redash.permissions import has_access, view_only
@@ -263,3 +265,39 @@ def serialize_dashboard(obj, with_widgets=False, user=None, with_favorite_state=
         d["is_favorite"] = models.Favorite.is_favorite(current_user.id, obj)
 
     return d
+
+
+def serialize_job(job):
+    # TODO: this is mapping to the old Job class statuses. Need to update the client side and remove this
+    STATUSES = {
+        JobStatus.QUEUED: 1,
+        JobStatus.STARTED: 2,
+        JobStatus.FINISHED: 3,
+        JobStatus.FAILED: 4,
+    }
+
+    job_status = job.get_status()
+    if job.is_started:
+        updated_at = job.started_at or 0
+    else:
+        updated_at = 0
+
+    status = STATUSES[job_status]
+
+    if isinstance(job.result, Exception):
+        error = str(job.result)
+        status = 4
+    elif job.is_cancelled:
+        error = "Query execution cancelled."
+    else:
+        error = ""
+
+    return {
+        "job": {
+            "id": job.id,
+            "updated_at": updated_at,
+            "status": status,
+            "error": error,
+            "query_result_id": job.result if job.is_finished and not error else None,
+        }
+    }

redash/tasks/__init__.py

@@ -6,7 +6,6 @@
     purge_failed_jobs,
 )
 from .queries import (
-    QueryTask,
     enqueue_query,
     execute_query,
     refresh_queries,
@@ -16,3 +15,14 @@
 )
 from .alerts import check_alerts_for_query
 from .failure_report import send_aggregated_errors
+from .worker import Worker, Queue, Job
+from .schedule import rq_scheduler, schedule_periodic_jobs, periodic_job_definitions
+
+from redash import rq_redis_connection
+from rq.connections import push_connection, pop_connection
+
+
+def init_app(app):
+    app.before_request(lambda: push_connection(rq_redis_connection))
+    app.teardown_request(lambda _: pop_connection())
+

redash/tasks/queries/__init__.py

@@ -4,4 +4,4 @@
     cleanup_query_results,
     empty_schedules,
 )
-from .execution import QueryTask, execute_query, enqueue_query
+from .execution import execute_query, enqueue_query