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/05/26 18:49:59 UTC
git commit: AMBARI-5806. /etc/hadoop/conf/dfs.exclude should be
populated in SNN node too. (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 0c584e6e1 -> 7d5fc0242
AMBARI-5806. /etc/hadoop/conf/dfs.exclude should be populated in SNN node too. (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7d5fc024
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7d5fc024
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7d5fc024
Branch: refs/heads/trunk
Commit: 7d5fc02426d6b4eaa31d7aef173ea073dce2a3e9
Parents: 0c584e6
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon May 26 19:49:49 2014 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon May 26 19:49:49 2014 +0300
----------------------------------------------------------------------
.../HDFS/package/scripts/hdfs_snamenode.py | 4 ++++
.../HDFS/package/scripts/hdfs_snamenode.py | 4 ++++
.../python/stacks/1.3.2/HDFS/test_snamenode.py | 20 ++++++++++++++++++++
.../python/stacks/2.0.6/HDFS/test_snamenode.py | 20 ++++++++++++++++++++
4 files changed, 48 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7d5fc024/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs_snamenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs_snamenode.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs_snamenode.py
index dcd7ac4..49241b4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs_snamenode.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs_snamenode.py
@@ -31,6 +31,10 @@ def snamenode(action=None, format=False):
mode=0755,
owner=params.hdfs_user,
group=params.user_group)
+ File(params.exclude_file_path,
+ content=Template("exclude_hosts_list.j2"),
+ owner=params.hdfs_user,
+ group=params.user_group)
elif action == "start" or action == "stop":
service(
action=action,
http://git-wip-us.apache.org/repos/asf/ambari/blob/7d5fc024/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs_snamenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs_snamenode.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs_snamenode.py
index dcd7ac4..49241b4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs_snamenode.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs_snamenode.py
@@ -31,6 +31,10 @@ def snamenode(action=None, format=False):
mode=0755,
owner=params.hdfs_user,
group=params.user_group)
+ File(params.exclude_file_path,
+ content=Template("exclude_hosts_list.j2"),
+ owner=params.hdfs_user,
+ group=params.user_group)
elif action == "start" or action == "stop":
service(
action=action,
http://git-wip-us.apache.org/repos/asf/ambari/blob/7d5fc024/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py b/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py
index 7214ae7..942093c 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py
@@ -30,6 +30,11 @@ class TestSNamenode(RMFTestCase):
config_file="default.json"
)
self.assert_configure_default()
+ self.assertResourceCalled('File', '/etc/hadoop/conf/dfs.exclude',
+ owner = 'hdfs',
+ content = Template('exclude_hosts_list.j2'),
+ group = 'hadoop',
+ )
self.assertNoMoreResources()
def test_start_default(self):
@@ -39,6 +44,11 @@ class TestSNamenode(RMFTestCase):
config_file="default.json"
)
self.assert_configure_default()
+ self.assertResourceCalled('File', '/etc/hadoop/conf/dfs.exclude',
+ owner = 'hdfs',
+ content = Template('exclude_hosts_list.j2'),
+ group = 'hadoop',
+ )
self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs',
owner = 'hdfs',
recursive = True,
@@ -84,6 +94,11 @@ class TestSNamenode(RMFTestCase):
config_file="secured.json"
)
self.assert_configure_secured()
+ self.assertResourceCalled('File', '/etc/hadoop/conf/dfs.exclude',
+ owner = 'hdfs',
+ content = Template('exclude_hosts_list.j2'),
+ group = 'hadoop',
+ )
self.assertNoMoreResources()
def test_start_secured(self):
@@ -93,6 +108,11 @@ class TestSNamenode(RMFTestCase):
config_file="secured.json"
)
self.assert_configure_secured()
+ self.assertResourceCalled('File', '/etc/hadoop/conf/dfs.exclude',
+ owner = 'hdfs',
+ content = Template('exclude_hosts_list.j2'),
+ group = 'hadoop',
+ )
self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs',
owner = 'hdfs',
recursive = True,
http://git-wip-us.apache.org/repos/asf/ambari/blob/7d5fc024/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py
index 61aa7ad..6ca7ff7 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py
@@ -30,6 +30,11 @@ class TestSNamenode(RMFTestCase):
config_file="default.json"
)
self.assert_configure_default()
+ self.assertResourceCalled('File', '/etc/hadoop/conf/dfs.exclude',
+ owner = 'hdfs',
+ content = Template('exclude_hosts_list.j2'),
+ group = 'hadoop',
+ )
self.assertNoMoreResources()
def test_start_default(self):
@@ -39,6 +44,11 @@ class TestSNamenode(RMFTestCase):
config_file="default.json"
)
self.assert_configure_default()
+ self.assertResourceCalled('File', '/etc/hadoop/conf/dfs.exclude',
+ owner = 'hdfs',
+ content = Template('exclude_hosts_list.j2'),
+ group = 'hadoop',
+ )
self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs',
owner = 'hdfs',
recursive = True,
@@ -94,6 +104,11 @@ class TestSNamenode(RMFTestCase):
config_file="secured.json"
)
self.assert_configure_secured()
+ self.assertResourceCalled('File', '/etc/hadoop/conf/dfs.exclude',
+ owner = 'hdfs',
+ content = Template('exclude_hosts_list.j2'),
+ group = 'hadoop',
+ )
self.assertNoMoreResources()
def test_start_secured(self):
@@ -103,6 +118,11 @@ class TestSNamenode(RMFTestCase):
config_file="secured.json"
)
self.assert_configure_secured()
+ self.assertResourceCalled('File', '/etc/hadoop/conf/dfs.exclude',
+ owner = 'hdfs',
+ content = Template('exclude_hosts_list.j2'),
+ group = 'hadoop',
+ )
self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs',
owner = 'hdfs',
recursive = True,