AMBARI-4634. TaskTrackers start fails on environment with multiple mount

points (Eugene Chekanskiy via aonishuk)

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,

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

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,

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',

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',

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',

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',

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",