fix(query-orchestartor): Queue - fix possible memory leak with timer (#…

…7466)
cube-js · Nov 28, 2023 · 535a676 · 535a676
1 parent 4a08de5
commit 535a676
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/packages/cubejs-query-orchestrator/src/orchestrator/QueryQueue.js b/packages/cubejs-query-orchestrator/src/orchestrator/QueryQueue.js
@@ -875,10 +875,11 @@ export class QueryQueue {
               await this.sendCancelMessageFn(queryWithCancelHandle, queueId);
             }
           }
+        } finally {
+          // catch block can throw an exception, it's why it's important to clearInterval here
+          clearInterval(heartBeatTimer);
         }
 
-        clearInterval(heartBeatTimer);
-
         if (!(await queueConnection.setResultAndRemoveQuery(queryKeyHashed, executionResult, processingId, queueId))) {
           this.logger('Orphaned execution result', {
             queueId,