You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/12/29 15:24:49 UTC
ambari git commit: AMBARI-8932. Creating hdfs directories on deploy
takes too long, Part 2, reduces deploy time by ~6min (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk df9e096f1 -> 1652163e8
AMBARI-8932. Creating hdfs directories on deploy takes too long, Part 2, reduces deploy time by ~6min (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1652163e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1652163e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1652163e
Branch: refs/heads/trunk
Commit: 1652163e873a3015e841665c22fcbb45e092708e
Parents: df9e096
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Dec 29 16:24:38 2014 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Dec 29 16:24:38 2014 +0200
----------------------------------------------------------------------
.../test/python/stacks/2.0.6/HDFS/test_namenode.py | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1652163e/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
index 99cd9eb..c83c0c9 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
@@ -134,6 +134,7 @@ class TestNamenode(RMFTestCase):
user = 'hdfs',
action = ['execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
+ only_if= None,
)
self.assertNoMoreResources()
@@ -257,8 +258,9 @@ class TestNamenode(RMFTestCase):
)
self.assertResourceCalled('HdfsResource', None,
security_enabled = True,
- hadoop_bin_dir = '/usr/bin',
+ only_if = None,
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
+ hadoop_bin_dir = '/usr/bin',
hadoop_fs = 'hdfs://c6401.ambari.apache.org:8020',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
@@ -358,8 +360,9 @@ class TestNamenode(RMFTestCase):
)
self.assertResourceCalled('HdfsResource', None,
security_enabled = False,
- hadoop_bin_dir = '/usr/bin',
+ only_if = "/usr/bin/sudo su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn1 | grep active'",
keytab = UnknownConfigurationMock(),
+ hadoop_bin_dir = '/usr/bin',
hadoop_fs = 'hdfs://ns1',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
@@ -442,8 +445,9 @@ class TestNamenode(RMFTestCase):
)
self.assertResourceCalled('HdfsResource', None,
security_enabled = True,
- hadoop_bin_dir = '/usr/bin',
+ only_if = "/usr/bin/sudo su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn1 | grep active'",
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
+ hadoop_bin_dir = '/usr/bin',
hadoop_fs = 'hdfs://ns1',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
@@ -545,6 +549,7 @@ class TestNamenode(RMFTestCase):
user = 'hdfs',
action = ['execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
+ only_if= "/usr/bin/sudo su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn1 | grep active'",
)
self.assertNoMoreResources()
@@ -628,8 +633,9 @@ class TestNamenode(RMFTestCase):
)
self.assertResourceCalled('HdfsResource', None,
security_enabled = False,
- hadoop_bin_dir = '/usr/bin',
+ only_if = "/usr/bin/sudo su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn2 | grep active'",
keytab = UnknownConfigurationMock(),
+ hadoop_bin_dir = '/usr/bin',
hadoop_fs = 'hdfs://ns1',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',