Browse Source

GH-1424 [api] Query kill is broken

sreenaths 4 năm trước cách đây
mục cha
commit
2027e03026

+ 4 - 1
apps/jobbrowser/src/jobbrowser/api2.py

@@ -117,9 +117,12 @@ def action(request, interface=None, action=None):
   if operation.get('action') == 'kill' and DISABLE_KILLING_JOBS.get():
     return serve_403_error(request)
 
+  action = operation.copy()
+  action['request'] = request
+
   response['operation'] = operation
   response.update(
-      get_api(request.user, interface, cluster=cluster).action(app_ids, operation)
+      get_api(request.user, interface, cluster=cluster).action(app_ids, action)
   )
 
   return JsonResponse(response)

+ 2 - 3
apps/jobbrowser/src/jobbrowser/apis/hive_query_api.py

@@ -27,7 +27,7 @@ from desktop.lib.exceptions_renderable import PopupException
 from desktop.lib.python_util import current_ms_from_utc
 from desktop.lib.rest.http_client import HttpClient
 from desktop.lib.rest.resource import Resource
-from notebook.models import _get_notebook_api, make_notebook, MockRequest
+from notebook.models import _get_notebook_api, make_notebook
 
 from jobbrowser.apis.base_api import Api
 from jobbrowser.conf import QUERY_STORE
@@ -121,8 +121,7 @@ class HiveQueryApi(Api):
         action_details = {}
 
         try:
-          request = MockRequest(user=self.user)
-          self.kill_query(query_id, request)
+          self.kill_query(query_id, action.get('request'))
           action_details['status'] = 0
           action_details['message'] = _('kill action performed')
         except Exception as ex: