Преглед изворни кода

[oozie] Adding NN url to each <prepare>

Sqoop, change command field to TextArea
Sqoop, update example
Romain Rigaux пре 13 година
родитељ
комит
0170371a73

+ 5 - 5
apps/oozie/src/oozie/fixtures/initial_example_data.json

@@ -1040,7 +1040,7 @@
       "node_type": "sqoop",
       "workflow": 12,
       "name": "Sqoop",
-      "description": "Export data from the table"
+      "description": "Export data from the table TT"
     }
   },
   {
@@ -1261,13 +1261,13 @@
     "pk": 56,
     "model": "oozie.sqoop",
     "fields": {
-      "files": "[\"TT.java\",\"db.hsqldb.properties\",\"db.hsqldb.script\"]",
+      "files": "[\"db.hsqldb.properties\",\"db.hsqldb.script\"]",
       "job_xml": "",
       "job_properties": "[{\"name\":\"oozie.use.system.libpath\",\"value\":\"true\"}]",
-      "params": "[{\"value\":\"import\",\"type\":\"arg\"},{\"value\":\"--connect\",\"type\":\"arg\"},{\"value\":\"jdbc:hsqldb:file:db.hsqldb\",\"type\":\"arg\"},{\"value\":\"--table\",\"type\":\"arg\"},{\"value\":\"TT\",\"type\":\"arg\"},{\"value\":\"--target-dir\",\"type\":\"arg\"},{\"value\":\"${output}\",\"type\":\"arg\"},{\"value\":\"-m\",\"type\":\"arg\"},{\"value\":\"1\",\"type\":\"arg\"}]",
+      "params": "[]",
       "archives": "[]",
-      "prepares": "[]",
-      "script_path": ""
+      "prepares": "[{\"value\":\"${output}\",\"type\":\"delete\"}]",
+      "script_path": "import --connect jdbc:hsqldb:file:db.hsqldb --table TT --target-dir ${output} -m 1"
     }
   },
   {

+ 1 - 1
apps/oozie/src/oozie/forms.py

@@ -153,7 +153,7 @@ class SqoopForm(forms.ModelForm):
       'job_properties': forms.widgets.HiddenInput(),
       'prepares': forms.widgets.HiddenInput(),
       'params': forms.widgets.HiddenInput(),
-      'script_path': forms.TextInput(attrs={'class': 'pathChooser span5'}),
+      'script_path': forms.Textarea(attrs={'class': 'span8'}),
       'files': forms.widgets.HiddenInput(),
       'archives': forms.widgets.HiddenInput(),
       'description': forms.TextInput(attrs={'class': 'span5'}),

+ 1 - 1
apps/oozie/src/oozie/templates/editor/gen/workflow-common.xml.mako

@@ -26,7 +26,7 @@ import posixpath
         % if prepares:
             <prepare>
                 % for p in prepares:
-                <${ p['type'] } path="${ p['value'] }"/>
+                <${ p['type'] } path="${'${'}nameNode}${ p['value'] }"/>
                 % endfor
             </prepare>
         % endif

+ 6 - 6
apps/oozie/src/oozie/tests.py

@@ -356,8 +356,8 @@ class TestEditor:
         '           <job-tracker>${jobTracker}</job-tracker>\n'
         '            <name-node>${nameNode}</name-node>\n'
         '            <prepare>\n'
-        '                <delete path="${output}"/>\n'
-        '                <mkdir path="test"/>\n'
+        '                <delete path="${nameNode}${output}"/>\n'
+        '                <mkdir path="${nameNode}test"/>\n'
         '            </prepare>\n'
         '            <configuration>\n'
         '                <property>\n'
@@ -374,8 +374,8 @@ class TestEditor:
         '            <job-tracker>${jobTracker}</job-tracker>\n'
         '            <name-node>${nameNode}</name-node>\n'
         '            <prepare>\n'
-        '                <delete path="${output}"/>\n'
-        '                <mkdir path="test"/>\n'
+        '                <delete path="${nameNode}${output}"/>\n'
+        '                <mkdir path="${nameNode}test"/>\n'
         '            </prepare>\n'
         '            <configuration>\n'
         '                <property>\n'
@@ -392,8 +392,8 @@ class TestEditor:
         '            <job-tracker>${jobTracker}</job-tracker>\n'
         '            <name-node>${nameNode}</name-node>\n'
         '            <prepare>\n'
-        '                <delete path="${output}"/>\n'
-        '                <mkdir path="test"/>\n'
+        '                <delete path="${nameNode}${output}"/>\n'
+        '                <mkdir path="${nameNode}test"/>\n'
         '            </prepare>\n'
         '            <configuration>\n'
         '                <property>\n'