fix: Associate Queue storage error with requestId

cube-js · Apr 14, 2020 · ec2750e · ec2750e
1 parent ed23d4e
commit ec2750e
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/packages/cubejs-query-orchestrator/orchestrator/QueryQueue.js b/packages/cubejs-query-orchestrator/orchestrator/QueryQueue.js
@@ -208,10 +208,16 @@ class QueryQueue {
 
   async processQuery(queryKey) {
     const redisClient = await this.queueDriver.createConnection();
+    let insertedCount;
+    // eslint-disable-next-line no-unused-vars
+    let removedCount;
+    let activeKeys;
+    let queueSize;
+    let query;
+    let processingLockAcquired;
     try {
       const processingId = await redisClient.getNextProcessingId();
-      // eslint-disable-next-line no-unused-vars
-      const [insertedCount, removedCount, activeKeys, queueSize, query, processingLockAcquired] =
+      [insertedCount, removedCount, activeKeys, queueSize, query, processingLockAcquired] =
         await redisClient.retrieveForProcessing(queryKey, processingId);
       if (query && insertedCount && activeKeys.indexOf(this.redisHash(queryKey)) !== -1 && processingLockAcquired) {
         let executionResult;
@@ -317,7 +323,8 @@ class QueryQueue {
       }
     } catch (e) {
       this.logger('Queue storage error', {
-        queryKey,
+        queryKey: query && query.queryKey || queryKey,
+        requestId: query && query.requestId,
         error: (e.stack || e).toString(),
         queuePrefix: this.redisQueuePrefix
       });