add stop status

This adds a stopped status to the potential statuses.
Replacing "failed" as the status that results from stopping
a job

Bug: T289349
Change-Id: Ic8f1ae655c8ef1c6cfc055c62cdd0b1fa145fdc0

quarry/web/health.py

@@ -44,7 +44,8 @@ def health_summary(minutes):
                                 'running': 0,
                                 'killed': 0,
                                 'complete': 0,
-                                'superseded': 0}
+                                'superseded': 0,
+                                'stopped': 0}
 
     for row in statuses:
         query_run_status = row[0]

quarry/web/models/queryrun.py

@@ -12,6 +12,7 @@ class QueryRun(Base):
     STATUS_KILLED = 3
     STATUS_COMPLETE = 4
     STATUS_SUPERSEDED = 5
+    STATUS_STOPPED = 6
 
     # TODO (phuedx, 2014/08/08): Make this translatable.
     STATUS_MESSAGES = [
@@ -20,7 +21,8 @@ class QueryRun(Base):
         'running',
         'killed',
         'complete',
-        'superseded'
+        'superseded',
+        'stopped'
     ]
 
     __tablename__ = 'query_run'

quarry/web/static/js/query/view.js

@@ -188,7 +188,6 @@ $( function () {
 				.done( function ( data ) {
 					var d = JSON.parse( data );
 					checkStatus( d.qrun_id, false );
-					alert( d.stopped );
 				} )
 				.fail( function ( resp ) {
 					alert( resp.responseText );

quarry/web/static/templates/compiled.js

@@ -133,6 +133,11 @@ output += "\nThis query is waiting to be executed\n";
 ;
 }
 else {
+if(runtime.contextOrFrameLookup(context, frame, "status") == "stopped") {
+output += "\nThis query was stopped\n";
+;
+}
+else {
 if(runtime.contextOrFrameLookup(context, frame, "status") == "running") {
 output += "\nThis query is currently executing...\n";
 if(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "extra")),"connection_id")) {
@@ -148,6 +153,8 @@ output += "\n";
 }
 ;
 }
+;
+}
 output += "\n";
 if(parentTemplate) {
 parentTemplate.rootRenderFunc(env, context, frame, runtime, cb);

quarry/web/static/templates/query-status.html

@@ -5,6 +5,8 @@
 This query took longer than 30 minutes to execute and was killed.
 {% elif status == 'queued' %}
 This query is waiting to be executed
+{% elif status == 'stopped' %}
+This query was stopped
 {% elif status == 'running' %}
 This query is currently executing...
 {% if extra.connection_id %}

quarry/web/worker.py

@@ -109,7 +109,13 @@ def run_query(query_run_id):
         else:  # Surfacing it to the user is always better than just silently failing
             write_error(qrun, e.args[1])
     except pymysql.DatabaseError as e:
-        write_error(qrun, e.args[1])
+        if e.args[0] == 2013:  # Query stopped gives a lost connection code
+            qrun.status = QueryRun.STATUS_STOPPED
+            conn.session.add(qrun)
+            conn.session.commit()
+            celery_log.info("Stopped run for qrun:%s", qrun.id)
+        else:
+            write_error(qrun, e.args[1])
     finally:
         conn.close_session()
         del repl.connection