ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject git commit: AMBARI-4634. TaskTrackers start fails on environment with multiple mount points (Eugene Chekanskiy via aonishuk)
Date Wed, 12 Feb 2014 17:52:55 GMT
Updated Branches:
  refs/heads/trunk 3e179d242 -> 4a3174702


AMBARI-4634. TaskTrackers start fails on environment with multiple mount
points (Eugene Chekanskiy via aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4a317470
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4a317470
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4a317470

Branch: refs/heads/trunk
Commit: 4a31747024370c8379875288ec8e1b906f634e66
Parents: 3e179d2
Author: Andrew Onischuk <aonishuk@hortonworks.com>
Authored: Wed Feb 12 09:50:31 2014 -0800
Committer: Andrew Onischuk <aonishuk@hortonworks.com>
Committed: Wed Feb 12 09:50:31 2014 -0800

----------------------------------------------------------------------
 .../HDP/1.3.2/services/HBASE/package/scripts/service_check.py | 5 +++--
 .../HDP/1.3.2/services/MAPREDUCE/package/scripts/mapreduce.py | 2 +-
 .../HDP/2.0.6/services/HBASE/package/scripts/service_check.py | 5 +++--
 .../python/stacks/1.3.2/MAPREDUCE/test_mapreduce_client.py    | 5 +++++
 .../stacks/1.3.2/MAPREDUCE/test_mapreduce_historyserver.py    | 5 +++++
 .../stacks/1.3.2/MAPREDUCE/test_mapreduce_jobtracker.py       | 5 +++++
 .../stacks/1.3.2/MAPREDUCE/test_mapreduce_tasktracker.py      | 7 ++++++-
 .../src/test/python/stacks/1.3.2/configs/default.json         | 2 +-
 8 files changed, 29 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4a317470/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/service_check.py
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/service_check.py
index 980c630..1e28c6b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/service_check.py
@@ -29,6 +29,7 @@ class HbaseServiceCheck(Script):
     
     output_file = "/apps/hbase/data/ambarismoketest"
     test_cmd = format("fs -test -e {output_file}")
+    smokeuser_kinit_cmd = format("{kinit_path_local} -kt {smoke_user_keytab} {smoke_test_user};")
if params.security_enabled else ""
     hbase_servicecheck_file = '/tmp/hbase-smoke.sh'
   
     File( '/tmp/hbaseSmokeVerify.sh',
@@ -56,8 +57,8 @@ class HbaseServiceCheck(Script):
         user = params.hbase_user,
       )
 
-    servicecheckcmd = format("{kinit_cmd} hbase --config {conf_dir} shell {hbase_servicecheck_file}")
-    smokeverifycmd = format("{kinit_cmd} /tmp/hbaseSmokeVerify.sh {conf_dir} {service_check_data}")
+    servicecheckcmd = format("{smokeuser_kinit_cmd} hbase --config {conf_dir} shell {hbase_servicecheck_file}")
+    smokeverifycmd = format("{smokeuser_kinit_cmd} /tmp/hbaseSmokeVerify.sh {conf_dir} {service_check_data}")
   
     Execute( servicecheckcmd,
       tries     = 3,

http://git-wip-us.apache.org/repos/asf/ambari/blob/4a317470/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/mapreduce.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/mapreduce.py
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/mapreduce.py
index 9e9233a..95ace16 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/mapreduce.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/mapreduce.py
@@ -61,7 +61,7 @@ def mapreduce(name=None):
             recursive=True
   )
 
-  Directory(params.mapred_local_dir,
+  Directory(params.mapred_local_dir.split(','),
             owner=params.mapred_user,
             mode=0755,
             recursive=True

http://git-wip-us.apache.org/repos/asf/ambari/blob/4a317470/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/service_check.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/service_check.py
index 980c630..1e28c6b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/service_check.py
@@ -29,6 +29,7 @@ class HbaseServiceCheck(Script):
     
     output_file = "/apps/hbase/data/ambarismoketest"
     test_cmd = format("fs -test -e {output_file}")
+    smokeuser_kinit_cmd = format("{kinit_path_local} -kt {smoke_user_keytab} {smoke_test_user};")
if params.security_enabled else ""
     hbase_servicecheck_file = '/tmp/hbase-smoke.sh'
   
     File( '/tmp/hbaseSmokeVerify.sh',
@@ -56,8 +57,8 @@ class HbaseServiceCheck(Script):
         user = params.hbase_user,
       )
 
-    servicecheckcmd = format("{kinit_cmd} hbase --config {conf_dir} shell {hbase_servicecheck_file}")
-    smokeverifycmd = format("{kinit_cmd} /tmp/hbaseSmokeVerify.sh {conf_dir} {service_check_data}")
+    servicecheckcmd = format("{smokeuser_kinit_cmd} hbase --config {conf_dir} shell {hbase_servicecheck_file}")
+    smokeverifycmd = format("{smokeuser_kinit_cmd} /tmp/hbaseSmokeVerify.sh {conf_dir} {service_check_data}")
   
     Execute( servicecheckcmd,
       tries     = 3,

http://git-wip-us.apache.org/repos/asf/ambari/blob/4a317470/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_client.py
b/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_client.py
index fdfbf6e..d811be8 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_client.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_client.py
@@ -43,6 +43,11 @@ class TestMapreduceClient(RMFTestCase):
       recursive = True,
       mode = 493,
     )
+    self.assertResourceCalled('Directory', '/hadoop/mapred1',
+      owner = 'mapred',
+      recursive = True,
+      mode = 493,
+    )
     self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.exclude',
       owner = 'mapred',
       group = 'hadoop',

http://git-wip-us.apache.org/repos/asf/ambari/blob/4a317470/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_historyserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_historyserver.py
b/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_historyserver.py
index daa3a2f..b3b85e5 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_historyserver.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_historyserver.py
@@ -179,6 +179,11 @@ class TestHistoryServer(RMFTestCase):
       recursive = True,
       mode = 493,
     )
+    self.assertResourceCalled('Directory', '/hadoop/mapred1',
+      owner = 'mapred',
+      recursive = True,
+      mode = 493,
+    )
     self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.exclude',
       owner = 'mapred',
       group = 'hadoop',

http://git-wip-us.apache.org/repos/asf/ambari/blob/4a317470/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_jobtracker.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_jobtracker.py
b/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_jobtracker.py
index be6fe88..8b1ee0c 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_jobtracker.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_jobtracker.py
@@ -233,6 +233,11 @@ class TestJobtracker(RMFTestCase):
       recursive = True,
       mode = 493,
     )
+    self.assertResourceCalled('Directory', '/hadoop/mapred1',
+      owner = 'mapred',
+      recursive = True,
+      mode = 493,
+    )
     self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.exclude',
       owner = 'mapred',
       group = 'hadoop',

http://git-wip-us.apache.org/repos/asf/ambari/blob/4a317470/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_tasktracker.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_tasktracker.py
b/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_tasktracker.py
index d12f09b..334388b 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_tasktracker.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/MAPREDUCE/test_mapreduce_tasktracker.py
@@ -81,7 +81,7 @@ class TestTasktracker(RMFTestCase):
                          config_file="secured.json"
     )
 
-    self.assert_configure_default()
+    self.assert_configure_secured()
     self.assertResourceCalled('Execute', 'export HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec
&& /usr/lib/hadoop/bin/hadoop-daemon.sh --config /etc/hadoop/conf start tasktracker',
                               user = 'mapred',
                               not_if = 'ls /var/run/hadoop/mapred/hadoop-mapred-tasktracker.pid
>/dev/null 2>&1 && ps `cat /var/run/hadoop/mapred/hadoop-mapred-tasktracker.pid`
>/dev/null 2>&1'
@@ -122,6 +122,11 @@ class TestTasktracker(RMFTestCase):
       recursive = True,
       mode = 493,
     )
+    self.assertResourceCalled('Directory', '/hadoop/mapred1',
+      owner = 'mapred',
+      recursive = True,
+      mode = 493,
+    )
     self.assertResourceCalled('File', '/etc/hadoop/conf/mapred.exclude',
       owner = 'mapred',
       group = 'hadoop',

http://git-wip-us.apache.org/repos/asf/ambari/blob/4a317470/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/default.json b/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
index 67cc4ac..653be3c 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
+++ b/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
@@ -80,7 +80,7 @@
             "mapreduce.history.server.http.address": "c6402.ambari.apache.org:51111", 
             "mapred.jobtracker.taskScheduler": "org.apache.hadoop.mapred.CapacityTaskScheduler",

             "mapred.max.tracker.blacklists": "16", 
-            "mapred.local.dir": "/hadoop/mapred", 
+            "mapred.local.dir": "/hadoop/mapred,/hadoop/mapred1",
             "mapred.healthChecker.interval": "135000", 
             "mapred.jobtracker.restart.recover": "false", 
             "mapred.jobtracker.blacklist.fault-bucket-width": "15", 


Mime
View raw message