Pārlūkot izejas kodu

HUE-3308 [oozie] Remove commented parts not used

Romain Rigaux 9 gadi atpakaļ
vecāks
revīzija
b28b5e2

+ 15 - 19
apps/oozie/src/oozie/models2.py

@@ -218,6 +218,7 @@ class Workflow(Job):
 
 
   def __init__(self, data=None, document=None, workflow=None, user=None):
   def __init__(self, data=None, document=None, workflow=None, user=None):
     self.document = document
     self.document = document
+    self.user = user
 
 
     if document is not None:
     if document is not None:
       self.data = document.data
       self.data = document.data
@@ -373,7 +374,7 @@ class Workflow(Job):
   @property
   @property
   def nodes(self):
   def nodes(self):
     _data = self.get_data()
     _data = self.get_data()
-    return [Node(node) for node in _data['workflow']['nodes']]
+    return [Node(node, self.user) for node in _data['workflow']['nodes']]
 
 
   def find_parameters(self):
   def find_parameters(self):
     params = set()
     params = set()
@@ -431,11 +432,10 @@ class Workflow(Job):
     data = self.get_data()
     data = self.get_data()
     nodes = [node for node in self.nodes if node.name != 'End'] + [node for node in self.nodes if
     nodes = [node for node in self.nodes if node.name != 'End'] + [node for node in self.nodes if
                                                                    node.name == 'End']  # End at the end
                                                                    node.name == 'End']  # End at the end
-    node_mapping = dict([(node.id, node) for node in nodes])
-
+    node_mapping = dict([(node.id, node) for node in nodes]) 
     sub_wfs_ids = [node.data['properties']['workflow'] for node in nodes if node.data['type'] == 'subworkflow']
     sub_wfs_ids = [node.data['properties']['workflow'] for node in nodes if node.data['type'] == 'subworkflow']
     workflow_mapping = dict(
     workflow_mapping = dict(
-      [(workflow.uuid, Workflow(document=workflow)) for workflow in Document2.objects.filter(uuid__in=sub_wfs_ids)])
+      [(workflow.uuid, Workflow(document=workflow, user=self.user)) for workflow in Document2.objects.filter(uuid__in=sub_wfs_ids)])
 
 
     xml = re.sub(re.compile('>\s*\n+', re.MULTILINE), '>\n', django_mako.render_to_string(tmpl, {
     xml = re.sub(re.compile('>\s*\n+', re.MULTILINE), '>\n', django_mako.render_to_string(tmpl, {
       'wf': self,
       'wf': self,
@@ -723,8 +723,9 @@ def _create_graph_adjaceny_list(nodes):
 
 
 
 
 class Node():
 class Node():
-  def __init__(self, data):
+  def __init__(self, data, user=None):
     self.data = data
     self.data = data
+    self.user = user
 
 
     self._augment_data()
     self._augment_data()
 
 
@@ -746,9 +747,8 @@ class Node():
                  % (len(links), len(self.data['children']), links, self.data['children']))
                  % (len(links), len(self.data['children']), links, self.data['children']))
         self.data['children'] = links
         self.data['children'] = links
 
 
-    if self.data['type'] == 'java-document':
-      #notebook = Notebook(document=Document2.objects.get_by_uuid(user=self.user, uuid=self.data['properties']['uuid']))
-      notebook = Notebook(document=Document2.objects.get(uuid=self.data['properties']['uuid']))
+    if self.data['type'] == JavaDocumentAction.TYPE:
+      notebook = Notebook(document=Document2.objects.get_by_uuid(user=self.user, uuid=self.data['properties']['uuid']))
       properties = notebook.get_data()['snippets'][0]['properties']
       properties = notebook.get_data()['snippets'][0]['properties']
 
 
       self.data['properties']['main_class'] = properties['class']
       self.data['properties']['main_class'] = properties['class']
@@ -810,7 +810,7 @@ class Node():
     node_type = self.data['type']
     node_type = self.data['type']
     if self.data['type'] == JavaDocumentAction.TYPE:
     if self.data['type'] == JavaDocumentAction.TYPE:
       node_type = JavaAction.TYPE
       node_type = JavaAction.TYPE
-        
+
     return 'editor2/gen/workflow-%s.xml.mako' % node_type
     return 'editor2/gen/workflow-%s.xml.mako' % node_type
 
 
   def find_parameters(self):
   def find_parameters(self):
@@ -836,6 +836,7 @@ def _upgrade_older_node(node):
   if node['type'] == 'spark-widget' and 'files' not in node['properties']:
   if node['type'] == 'spark-widget' and 'files' not in node['properties']:
     node['properties']['files'] = []
     node['properties']['files'] = []
 
 
+
 class Action(object):
 class Action(object):
 
 
   @classmethod
   @classmethod
@@ -2989,8 +2990,7 @@ class WorkflowBuilder():
          "name":"doc-1",
          "name":"doc-1",
          "type":"java-document-widget",
          "type":"java-document-widget",
          "properties":{
          "properties":{
-#               "files": files,
-              u'uuid': document.uuid,
+              u'uuid': document.uuid, # files, main_class, arguments comes from there
               "job_xml":[],
               "job_xml":[],
               "jar_path": "",
               "jar_path": "",
               "java_opts":[],
               "java_opts":[],
@@ -2998,8 +2998,6 @@ class WorkflowBuilder():
               "retry_interval":[],
               "retry_interval":[],
               "job_properties":[],
               "job_properties":[],
               "capture_output": False,
               "capture_output": False,
-#               "main_class": java_class,
-#               "arguments": arguments,
               "prepares":[],
               "prepares":[],
               "credentials": credentials,
               "credentials": credentials,
               "sla":[{"value":False, "key":"enabled"}, {"value":"${nominal_time}", "key":"nominal-time"}, {"value":"", "key":"should-start"}, {"value":"${30 * MINUTES}", "key":"should-end"}, {"value":"", "key":"max-duration"}, {"value":"", "key":"alert-events"}, {"value":"", "key":"alert-contact"}, {"value":"", "key":"notification-msg"}, {"value":"", "key":"upstream-apps"}],
               "sla":[{"value":False, "key":"enabled"}, {"value":"${nominal_time}", "key":"nominal-time"}, {"value":"", "key":"should-start"}, {"value":"${30 * MINUTES}", "key":"should-end"}, {"value":"", "key":"max-duration"}, {"value":"", "key":"alert-events"}, {"value":"", "key":"alert-contact"}, {"value":"", "key":"notification-msg"}, {"value":"", "key":"upstream-apps"}],
@@ -3011,14 +3009,12 @@ class WorkflowBuilder():
           "actionParameters":[],
           "actionParameters":[],
           "actionParametersFetched": False
           "actionParametersFetched": False
     }
     }
-    
-    
 
 
-  def get_workflow(self, node, name, doc_uuid, user, managed=False):    
-    parameters = [{u'name': u'oozie.use.system.libpath', u'value': True}]
-    parameters.append({u'name': u'oozie.libpath', u'value': '/tmp/smart_indexer_lib'})
 
 
 
 
+  def get_workflow(self, node, name, doc_uuid, user, managed=False):
+    parameters = []
+
     data = json.dumps({'workflow': {
     data = json.dumps({'workflow': {
       u'name': name,
       u'name': name,
       u'versions': [u'uri:oozie:workflow:0.4', u'uri:oozie:workflow:0.4.5'
       u'versions': [u'uri:oozie:workflow:0.4', u'uri:oozie:workflow:0.4.5'
@@ -3072,7 +3068,7 @@ class WorkflowBuilder():
           u'children': [],
           u'children': [],
           u'actionParameters': [],
           u'actionParameters': [],
           },
           },
-            node 
+            node
           ],
           ],
       u'properties': {
       u'properties': {
           u'job_xml': u'',
           u'job_xml': u'',

+ 1 - 1
apps/oozie/src/oozie/static/oozie/js/workflow-editor.ko.js

@@ -1273,7 +1273,7 @@ var WorkflowEditorViewModel = function (layout_json, workflow_json, credentials_
   self.draggableSparkAction = ko.observable(bareWidgetBuilder("Spark", "spark-widget"));
   self.draggableSparkAction = ko.observable(bareWidgetBuilder("Spark", "spark-widget"));
   self.draggableGenericAction = ko.observable(bareWidgetBuilder("Generic", "generic-widget"));
   self.draggableGenericAction = ko.observable(bareWidgetBuilder("Generic", "generic-widget"));
   self.draggableHiveDocumentAction = ko.observable(bareWidgetBuilder("Hive", "hive-document-widget"));
   self.draggableHiveDocumentAction = ko.observable(bareWidgetBuilder("Hive", "hive-document-widget"));
-  self.draggableJavaDocumentAction = ko.observable(bareWidgetBuilder("Java", "java-document-widget"));  
+  self.draggableJavaDocumentAction = ko.observable(bareWidgetBuilder("Java", "java-document-widget"));
   self.draggableKillNode = ko.observable(bareWidgetBuilder("Kill", "kill-widget"));
   self.draggableKillNode = ko.observable(bareWidgetBuilder("Kill", "kill-widget"));
 };
 };
 
 

+ 0 - 1
apps/oozie/src/oozie/views/dashboard.py

@@ -344,7 +344,6 @@ def list_oozie_workflow(request, job_id):
       credentials = Credentials()
       credentials = Credentials()
     except:
     except:
       LOG.exception("Error generating full page for running workflow %s" % job_id)
       LOG.exception("Error generating full page for running workflow %s" % job_id)
-    print workflow_data
   else:
   else:
     history = get_history().cross_reference_submission_history(request.user, job_id)
     history = get_history().cross_reference_submission_history(request.user, job_id)
 
 

+ 2 - 2
desktop/conf.dist/hue.ini

@@ -134,7 +134,7 @@
   # The copyright message for the specified Leaflet maps Tile Layer
   # The copyright message for the specified Leaflet maps Tile Layer
   ## leaflet_tile_layer_attribution='&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
   ## leaflet_tile_layer_attribution='&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
 
 
-  # X-Frame-Options HTTP header value. Use 'DENY' to deny framing completely 
+  # X-Frame-Options HTTP header value. Use 'DENY' to deny framing completely
   ## http_x_frame_options=SAMEORIGIN
   ## http_x_frame_options=SAMEORIGIN
 
 
   # Enable X-Forwarded-Host header if the load balancer requires it.
   # Enable X-Forwarded-Host header if the load balancer requires it.
@@ -688,7 +688,7 @@
 
 
     [[[java]]]
     [[[java]]]
       name=Java
       name=Java
-      interface=oozie 
+      interface=oozie
 
 
     # [[[mysql]]]
     # [[[mysql]]]
     #   name=MySql JDBC
     #   name=MySql JDBC

+ 2 - 2
desktop/conf/pseudo-distributed.ini.tmpl

@@ -138,7 +138,7 @@
   # The copyright message for the specified Leaflet maps Tile Layer
   # The copyright message for the specified Leaflet maps Tile Layer
   ## leaflet_tile_layer_attribution='&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
   ## leaflet_tile_layer_attribution='&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
 
 
-  # X-Frame-Options HTTP header value. Use 'DENY' to deny framing completely                   
+  # X-Frame-Options HTTP header value. Use 'DENY' to deny framing completely
   ## http_x_frame_options=SAMEORIGIN
   ## http_x_frame_options=SAMEORIGIN
 
 
   # Enable X-Forwarded-Host header if the load balancer requires it.
   # Enable X-Forwarded-Host header if the load balancer requires it.
@@ -696,7 +696,7 @@
 
 
     [[[java]]]
     [[[java]]]
       name=Java
       name=Java
-      interface=oozie 
+      interface=oozie
 
 
     # [[[mysql]]]
     # [[[mysql]]]
     #   name=MySql JDBC
     #   name=MySql JDBC

+ 1 - 1
desktop/libs/liboozie/src/liboozie/conf.py

@@ -54,7 +54,7 @@ USE_LIBPATH_FOR_JARS = Config(
   key="use_libpath_for_jars",
   key="use_libpath_for_jars",
   help=_t("Whether Hue append jar paths to the oozie.libpath instead of copying them into the workspace."
   help=_t("Whether Hue append jar paths to the oozie.libpath instead of copying them into the workspace."
           " This makes submissions faster and less prone to HDFS permission errors"),
           " This makes submissions faster and less prone to HDFS permission errors"),
-  default=True,
+  default=False,
   type=coerce_bool)
   type=coerce_bool)
 
 
 
 

+ 2 - 2
desktop/libs/liboozie/src/liboozie/submission2.py

@@ -203,8 +203,8 @@ class Submission(object):
           from notebook.models import Notebook
           from notebook.models import Notebook
           notebook = Notebook(document=Document2.objects.get_by_uuid(user=self.user, uuid=action.data['properties']['uuid']))
           notebook = Notebook(document=Document2.objects.get_by_uuid(user=self.user, uuid=action.data['properties']['uuid']))
           properties = notebook.get_data()['snippets'][0]['properties']
           properties = notebook.get_data()['snippets'][0]['properties']
-    
-          if properties.get('app_jar'):          
+
+          if properties.get('app_jar'):
             LOG.debug("Adding to oozie.libpath %s" % properties['app_jar'])
             LOG.debug("Adding to oozie.libpath %s" % properties['app_jar'])
             paths = [properties['app_jar']]
             paths = [properties['app_jar']]
             if self.properties.get('oozie.libpath'):
             if self.properties.get('oozie.libpath'):

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

@@ -64,7 +64,7 @@ class OozieApi(Api):
 
 
     # Create a managed workflow from the notebook doc
     # Create a managed workflow from the notebook doc
     workflow_doc = WorkflowBuilder().create_workflow(document=notebook_doc, user=self.user, managed=True, name=_("Batch job for %s") % notebook_doc.name or notebook_doc.type)
     workflow_doc = WorkflowBuilder().create_workflow(document=notebook_doc, user=self.user, managed=True, name=_("Batch job for %s") % notebook_doc.name or notebook_doc.type)
-    workflow = Workflow(document=workflow_doc)
+    workflow = Workflow(document=workflow_doc, user=self.user)
 
 
     # Submit workflow
     # Submit workflow
     job_id = _submit_workflow(user=self.user, fs=self.fs, jt=self.jt, workflow=workflow, mapping=None)
     job_id = _submit_workflow(user=self.user, fs=self.fs, jt=self.jt, workflow=workflow, mapping=None)