瀏覽代碼

[oozie] Generate Coordinator SLAs

Romain Rigaux 10 年之前
父節點
當前提交
4dcc95d
共有 2 個文件被更改,包括 3 次插入5 次删除
  1. 1 3
      apps/oozie/src/oozie/models2.py
  2. 2 2
      apps/oozie/src/oozie/templates/editor2/gen/coordinator.xml.mako

+ 1 - 3
apps/oozie/src/oozie/models2.py

@@ -1600,8 +1600,6 @@ class Coordinator(Job):
               'execution': None,
               'throttle': None,
               'job_xml': '',
-              'sla_enabled': False,
-              'sla_workflow_enabled': False,
               'credentials': [],
               'parameters': [
                   {'name': 'oozie.use.system.libpath', 'value': True},
@@ -1692,7 +1690,7 @@ class Coordinator(Job):
 
   @property
   def sla_enabled(self):
-    return self.data['properties']['sla_enabled']
+    return self.data['properties']['sla'][0].get('value')
 
   @property
   def sla(self):

+ 2 - 2
apps/oozie/src/oozie/templates/editor2/gen/coordinator.xml.mako

@@ -58,8 +58,8 @@
   frequency="${ coord.frequency }"
   % endif
   start="${ coord.start_utc }" end="${ coord.end_utc }" timezone="${ coord.data['properties']['timezone'] }"
-  xmlns="${ 'uri:oozie:coordinator:0.4' if coord.data['properties']['sla_enabled'] else coord.data['properties']['schema_version'] | n,unicode }"
-  ${ 'xmlns:sla="uri:oozie:sla:0.2"' if coord.data['properties']['sla_enabled'] else '' | n,unicode }>
+  xmlns="${ 'uri:oozie:coordinator:0.4' if coord.sla_enabled else coord.data['properties']['schema_version'] | n,unicode }"
+  ${ 'xmlns:sla="uri:oozie:sla:0.2"' if coord.sla_enabled else '' | n,unicode }>
   % if coord.data['properties']['timeout'] or coord.data['properties'].get('concurrency') or coord.data['properties']['execution'] or coord.data['properties'].get('throttle'):
   <controls>
     % if coord.data['properties']['timeout']: