fix: TypeError: Cannot read property 'queryKey' of null under load

cube-js · Feb 24, 2020 · 0c996d8 · 0c996d8
1 parent f538135
commit 0c996d8
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/packages/cubejs-query-orchestrator/orchestrator/QueryQueue.js b/packages/cubejs-query-orchestrator/orchestrator/QueryQueue.js
@@ -67,15 +67,17 @@ class QueryQueue {
       const queryDef = await redisClient.getQueryDef(queryKey);
       const [active, toProcess] = await redisClient.getQueryStageState(true);
 
-      this.logger('Waiting for query', {
-        queueSize,
-        queryKey: queryDef.queryKey,
-        queuePrefix: this.redisQueuePrefix,
-        requestId: options.requestId,
-        active: active.indexOf(redisClient.redisHash(queryKey)) !== -1,
-        queueIndex: toProcess.indexOf(redisClient.redisHash(queryKey)),
-        waitingForRequestId: queryDef.requestId
-      });
+      if (queryDef) {
+        this.logger('Waiting for query', {
+          queueSize,
+          queryKey: queryDef.queryKey,
+          queuePrefix: this.redisQueuePrefix,
+          requestId: options.requestId,
+          active: active.indexOf(redisClient.redisHash(queryKey)) !== -1,
+          queueIndex: toProcess.indexOf(redisClient.redisHash(queryKey)),
+          waitingForRequestId: queryDef.requestId
+        });
+      }
 
       result = await redisClient.getResultBlocking(queryKey);
       if (!result) {