|
@@ -27,7 +27,8 @@ from desktop.lib.exceptions_renderable import PopupException
|
|
|
from desktop.lib.python_util import current_ms_from_utc
|
|
from desktop.lib.python_util import current_ms_from_utc
|
|
|
from desktop.lib.rest.http_client import HttpClient
|
|
from desktop.lib.rest.http_client import HttpClient
|
|
|
from desktop.lib.rest.resource import Resource
|
|
from desktop.lib.rest.resource import Resource
|
|
|
-from notebook.models import _get_notebook_api, make_notebook
|
|
|
|
|
|
|
+from notebook.models import _get_notebook_api, make_notebook, MockRequest
|
|
|
|
|
+
|
|
|
|
|
|
|
|
from jobbrowser.apis.base_api import Api
|
|
from jobbrowser.apis.base_api import Api
|
|
|
from jobbrowser.conf import QUERY_STORE
|
|
from jobbrowser.conf import QUERY_STORE
|
|
@@ -121,7 +122,7 @@ class HiveQueryApi(Api):
|
|
|
action_details = {}
|
|
action_details = {}
|
|
|
|
|
|
|
|
try:
|
|
try:
|
|
|
- self.kill_query(query_id, action.get('request'))
|
|
|
|
|
|
|
+ self.kill_query(query_id)
|
|
|
action_details['status'] = 0
|
|
action_details['status'] = 0
|
|
|
action_details['message'] = _('kill action performed')
|
|
action_details['message'] = _('kill action performed')
|
|
|
except Exception as ex:
|
|
except Exception as ex:
|
|
@@ -134,7 +135,7 @@ class HiveQueryApi(Api):
|
|
|
|
|
|
|
|
return message
|
|
return message
|
|
|
|
|
|
|
|
- def kill_query(self, query_id, request):
|
|
|
|
|
|
|
+ def kill_query(self, query_id):
|
|
|
kill_sql = 'KILL QUERY "%s";' % query_id
|
|
kill_sql = 'KILL QUERY "%s";' % query_id
|
|
|
job = make_notebook(
|
|
job = make_notebook(
|
|
|
name=_('Kill query %s') % query_id,
|
|
name=_('Kill query %s') % query_id,
|
|
@@ -145,7 +146,7 @@ class HiveQueryApi(Api):
|
|
|
is_task=False,
|
|
is_task=False,
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
- job.execute_and_wait(request)
|
|
|
|
|
|
|
+ job.execute_and_wait(MockRequest(user=self.user))
|
|
|
|
|
|
|
|
def logs(self, appid, app_type, log_name=None, is_embeddable=False):
|
|
def logs(self, appid, app_type, log_name=None, is_embeddable=False):
|
|
|
return {'logs': ''}
|
|
return {'logs': ''}
|