Browse Source

HUE-3797 [scheduler] Do not error if oozie is not present

Romain 6 years ago
parent
commit
6ed7a4ad90

+ 9 - 7
desktop/core/src/desktop/lib/scheduler/api.py

@@ -17,18 +17,20 @@
 
 
 import logging
 import logging
 
 
-from oozie.decorators import check_document_access_permission
-from oozie.forms import ParameterForm
-from oozie.views.editor2 import edit_coordinator, new_coordinator
-
 from desktop.auth.backend import is_admin
 from desktop.auth.backend import is_admin
 from desktop.conf import TASK_SERVER
 from desktop.conf import TASK_SERVER
 from desktop.lib.django_util import JsonResponse
 from desktop.lib.django_util import JsonResponse
 from desktop.lib.scheduler.lib.api import get_api
 from desktop.lib.scheduler.lib.api import get_api
 
 
-
 LOG = logging.getLogger(__name__)
 LOG = logging.getLogger(__name__)
 
 
+try:
+  from oozie.decorators import check_document_access_permission
+  from oozie.forms import ParameterForm
+  from oozie.views.editor2 import edit_coordinator, new_coordinator
+except Exception as e:
+  LOG.exception('Oozie application is not enabled: %s' % e)
+
 
 
 def new_schedule(request):
 def new_schedule(request):
   return new_coordinator(request)
   return new_coordinator(request)
@@ -37,8 +39,8 @@ def new_schedule(request):
 def get_schedule(request):
 def get_schedule(request):
   return edit_coordinator(request)
   return edit_coordinator(request)
 
 
-
-@check_document_access_permission()
+# To move to lib in case oozie is blacklisted
+#@check_document_access_permission()
 def submit_schedule(request, doc_id):
 def submit_schedule(request, doc_id):
   interface = request.GET.get('interface', request.POST.get('interface'), 'oozie')
   interface = request.GET.get('interface', request.POST.get('interface'), 'oozie')
   if doc_id.isdigit():
   if doc_id.isdigit():

+ 1 - 1
desktop/libs/notebook/src/notebook/connectors/oozie_batch.py

@@ -37,7 +37,7 @@ try:
   from oozie.views.api import get_log as get_workflow_logs
   from oozie.views.api import get_log as get_workflow_logs
   from oozie.views.dashboard import check_job_access_permission, check_job_edition_permission
   from oozie.views.dashboard import check_job_access_permission, check_job_edition_permission
   from oozie.views.editor2 import _submit_workflow
   from oozie.views.editor2 import _submit_workflow
-except Exception, e:
+except Exception as e:
   LOG.exception('Oozie application is not enabled: %s' % e)
   LOG.exception('Oozie application is not enabled: %s' % e)