Merge pull request getredash#1841 from laughingman7743/fix_query_canc…

…ellation_condition Fix query cancellation condition for Athena query runner
karthikrk1 · Jun 25, 2017 · 090962d · 090962d
2 parents 9816403 + df945a1
commit 090962d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/redash/query_runner/athena.py b/redash/query_runner/athena.py
@@ -130,11 +130,13 @@ def run_query(self, query, user):
             json_data = json.dumps(data, cls=JSONEncoder)
             error = None
         except KeyboardInterrupt:
-            cursor.cancel()
+            if cursor.query_id:
+                cursor.cancel()
             error = "Query cancelled by user."
             json_data = None
         except Exception, ex:
-            cursor.cancel()
+            if cursor.query_id:
+                cursor.cancel()
             error = ex.message
             json_data = None