From 1d9d905497b5e04773c670afc95a489faa774f46 Mon Sep 17 00:00:00 2001
From: Beto Dealmeida <roberto@dealmeida.net>
Date: Thu, 29 Oct 2020 14:34:58 -0700
Subject: [PATCH] fix: prevent race condition when canceling query (#11449)

---
 superset-frontend/src/SqlLab/reducers/sqlLab.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/superset-frontend/src/SqlLab/reducers/sqlLab.js b/superset-frontend/src/SqlLab/reducers/sqlLab.js
index 97f3267840..8a94bcb3ec 100644
--- a/superset-frontend/src/SqlLab/reducers/sqlLab.js
+++ b/superset-frontend/src/SqlLab/reducers/sqlLab.js
@@ -324,6 +324,10 @@ export default function sqlLabReducer(state = {}, action) {
       });
     },
     [actions.QUERY_SUCCESS]() {
+      // prevent race condition were query succeeds shortly after being canceled
+      if (action.query.state === 'stopped') {
+        return state;
+      }
       const alts = {
         endDttm: now(),
         progress: 100,