浏览代码

HUE-2839 [spark] Batch submission cancel button is error-ing

Batch cancel action calls close and return status code 0 for closed or -1 for skipped
Jenny Kim 10 年之前
父节点
当前提交
46666dc
共有 1 个文件被更改,包括 12 次插入8 次删除
  1. 12 8
      apps/spark/src/spark/models.py

+ 12 - 8
apps/spark/src/spark/models.py

@@ -215,7 +215,7 @@ class HS2Api():
 
     handle = self._get_handle(snippet)
     db.cancel_operation(handle)
-    return {'status': 'canceled'}
+    return {'status': 0}
 
   @query_error_handler
   def get_log(self, snippet, startFrom=None, size=None):
@@ -263,9 +263,9 @@ class HS2Api():
 
       handle = self._get_handle(snippet)
       db.close_operation(handle)
-      return {'status': 'closed'}
+      return {'status': 0}
     else:
-      return {'status': 'skipped'}
+      return {'status': -1}  # skipped
 
   def _get_jobs(self, log):
     return _parse_out_hadoop_jobs(log)
@@ -402,7 +402,7 @@ class SparkApi():
     session = _get_snippet_session(notebook, snippet)
     response = api.cancel(session['id'])
 
-    return {'status': 'canceled'}
+    return {'status': 0}
 
   def get_log(self, snippet, startFrom=0, size=None):
     return 'Not available'
@@ -418,10 +418,10 @@ class SparkApi():
       api.close(session['id'])
       return {
         'session': session['id'],
-        'status': 'closed'
+        'status': 0
       }
     else:
-      return {'status': 'skipped'}
+      return {'status': -1}
 
   def _get_jobs(self, log):
     return []
@@ -481,10 +481,14 @@ class SparkBatchApi():
       api.close_batch(session_id)
       return {
         'session': session_id,
-        'status': 'closed'
+        'status': 0
       }
     else:
-      return {'status': 'skipped'}
+      return {'status': -1}  # skipped
+
+  def cancel(self, notebook, snippet):
+    # Batch jobs do not support interruption, so close session instead.
+    return self.close(snippet)
 
   def _progress(self, snippet, logs):
     return 50