Skip to content

Commit ec2750e

Browse files
committed
fix: Associate Queue storage error with requestId
1 parent ed23d4e commit ec2750e

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

packages/cubejs-query-orchestrator/orchestrator/QueryQueue.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,16 @@ class QueryQueue {
208208

209209
async processQuery(queryKey) {
210210
const redisClient = await this.queueDriver.createConnection();
211+
let insertedCount;
212+
// eslint-disable-next-line no-unused-vars
213+
let removedCount;
214+
let activeKeys;
215+
let queueSize;
216+
let query;
217+
let processingLockAcquired;
211218
try {
212219
const processingId = await redisClient.getNextProcessingId();
213-
// eslint-disable-next-line no-unused-vars
214-
const [insertedCount, removedCount, activeKeys, queueSize, query, processingLockAcquired] =
220+
[insertedCount, removedCount, activeKeys, queueSize, query, processingLockAcquired] =
215221
await redisClient.retrieveForProcessing(queryKey, processingId);
216222
if (query && insertedCount && activeKeys.indexOf(this.redisHash(queryKey)) !== -1 && processingLockAcquired) {
217223
let executionResult;
@@ -317,7 +323,8 @@ class QueryQueue {
317323
}
318324
} catch (e) {
319325
this.logger('Queue storage error', {
320-
queryKey,
326+
queryKey: query && query.queryKey || queryKey,
327+
requestId: query && query.requestId,
321328
error: (e.stack || e).toString(),
322329
queuePrefix: this.redisQueuePrefix
323330
});

0 commit comments

Comments
 (0)