Browse Source

[oozie] Always provide JT and FS addresses

Romain Rigaux 12 years ago
parent
commit
714f83e

+ 13 - 5
desktop/libs/liboozie/src/liboozie/submittion.py

@@ -176,11 +176,19 @@ class Submission(object):
     return parameters
 
   def _update_properties(self, jobtracker_addr, deployment_dir):
-    if self.fs and self.jt:
-      self.properties.update({
-        'jobTracker': self.jt.logical_name or jobtracker_addr,
-        'nameNode': self.fs.logical_name or self.fs.fs_defaultfs,
-      })
+    LOG.info('Using FS %s and JT %s' % (self.fs, self.jt))
+    if self.jt and self.jt.logical_name:
+      jobtracker_addr = self.jt.logical_name
+
+    if self.fs and self.fs.logical_name:
+      fs_defaultfs = self.fs.logical_name
+    else:
+      fs_defaultfs = self.fs.fs_defaultfs
+
+    self.properties.update({
+      'jobTracker': jobtracker_addr,
+      'nameNode': fs_defaultfs,
+    })
 
     if self.job:
       self.properties.update({

+ 66 - 0
desktop/libs/liboozie/src/liboozie/submittions_test.py

@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+# Licensed to Cloudera, Inc. under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  Cloudera, Inc. licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import logging
+
+from nose.tools import assert_equal, assert_true
+
+from liboozie.submittion import Submission
+from oozie.tests import OozieMockBase
+
+
+LOG = logging.getLogger(__name__)
+
+
+class MockFs():
+  def __init__(self, logical_name=None):
+
+    self.fs_defaultfs = 'hdfs://curacao:8020'
+    self.logical_name = logical_name if logical_name else ''
+
+
+class MockJt():
+  def __init__(self, logical_name=None):
+
+    self.logical_name = logical_name if logical_name else ''
+
+
+class TestSubmission(OozieMockBase):
+
+  def test_get_properties(self):
+    submission = Submission(self.user, fs=MockFs())
+
+    assert_equal({}, submission.properties)
+
+    submission._update_properties('curacao:8032', '/deployment_dir')
+
+    assert_equal({
+        'jobTracker': 'curacao:8032',
+        'nameNode': 'hdfs://curacao:8020'
+      }, submission.properties)
+
+  def test_get_logical_properties(self):
+    submission = Submission(self.user, fs=MockFs(logical_name='fsname'), jt=MockJt(logical_name='jtname'))
+
+    assert_equal({}, submission.properties)
+
+    submission._update_properties('curacao:8032', '/deployment_dir')
+
+    assert_equal({
+        'jobTracker': 'jtname',
+        'nameNode': 'fsname'
+      }, submission.properties)