You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2014/11/11 15:58:51 UTC
ambari git commit: AMBARI-7753 DataNode decommision error in secured
cluster (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 11e7c9f60 -> ba5bc737a
AMBARI-7753 DataNode decommision error in secured cluster (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ba5bc737
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ba5bc737
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ba5bc737
Branch: refs/heads/trunk
Commit: ba5bc737a13578ca27a2f0f15227248e022d4f38
Parents: 11e7c9f
Author: Dmytro Sen <ds...@apache.org>
Authored: Tue Nov 11 15:38:23 2014 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Tue Nov 11 16:58:16 2014 +0200
----------------------------------------------------------------------
.../BIGTOP/0.8/services/HDFS/package/scripts/hdfs_namenode.py | 4 ++--
.../stacks/BIGTOP/0.8/services/HDFS/package/scripts/params.py | 7 +++++++
.../HDP/2.0.6/services/HDFS/package/scripts/hdfs_namenode.py | 4 ++--
.../stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py | 7 +++++++
.../src/test/python/stacks/2.0.6/HDFS/test_namenode.py | 2 +-
5 files changed, 19 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba5bc737/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_namenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_namenode.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_namenode.py
index c4b48c6..3456441 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_namenode.py
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_namenode.py
@@ -133,7 +133,7 @@ def decommission():
hdfs_user = params.hdfs_user
conf_dir = params.hadoop_conf_dir
user_group = params.user_group
- dn_kinit_cmd = params.dn_kinit_cmd
+ nn_kinit_cmd = params.nn_kinit_cmd
File(params.exclude_file_path,
content=Template("exclude_hosts_list.j2"),
@@ -141,7 +141,7 @@ def decommission():
group=user_group
)
- Execute(dn_kinit_cmd,
+ Execute(nn_kinit_cmd,
user=hdfs_user
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba5bc737/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/params.py
index edc823b..83b2ed9 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/params.py
@@ -159,8 +159,15 @@ if security_enabled:
_dn_principal_name = _dn_principal_name.replace('_HOST',hostname.lower())
dn_kinit_cmd = format("{kinit_path_local} -kt {_dn_keytab} {_dn_principal_name};")
+
+ _nn_principal_name = config['configurations']['hdfs-site']['dfs.namenode.kerberos.principal']
+ _nn_keytab = config['configurations']['hdfs-site']['dfs.namenode.keytab.file']
+ _nn_principal_name = _nn_principal_name.replace('_HOST',hostname.lower())
+
+ nn_kinit_cmd = format("{kinit_path_local} -kt {_nn_keytab} {_nn_principal_name};")
else:
dn_kinit_cmd = ""
+ nn_kinit_cmd = ""
import functools
#create partial functions with common arguments for every HdfsDirectory call
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba5bc737/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs_namenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs_namenode.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs_namenode.py
index 9a48f7b..ed4d7bf 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs_namenode.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/hdfs_namenode.py
@@ -135,7 +135,7 @@ def decommission():
hdfs_user = params.hdfs_user
conf_dir = params.hadoop_conf_dir
user_group = params.user_group
- dn_kinit_cmd = params.dn_kinit_cmd
+ nn_kinit_cmd = params.nn_kinit_cmd
File(params.exclude_file_path,
content=Template("exclude_hosts_list.j2"),
@@ -143,7 +143,7 @@ def decommission():
group=user_group
)
- Execute(dn_kinit_cmd,
+ Execute(nn_kinit_cmd,
user=hdfs_user
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba5bc737/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
index 45f9d36..6d35468 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
@@ -210,8 +210,15 @@ if security_enabled:
_dn_principal_name = _dn_principal_name.replace('_HOST',hostname.lower())
dn_kinit_cmd = format("{kinit_path_local} -kt {_dn_keytab} {_dn_principal_name};")
+
+ _nn_principal_name = config['configurations']['hdfs-site']['dfs.namenode.kerberos.principal']
+ _nn_keytab = config['configurations']['hdfs-site']['dfs.namenode.keytab.file']
+ _nn_principal_name = _nn_principal_name.replace('_HOST',hostname.lower())
+
+ nn_kinit_cmd = format("{kinit_path_local} -kt {_nn_keytab} {_nn_principal_name};")
else:
dn_kinit_cmd = ""
+ nn_kinit_cmd = ""
import functools
#create partial functions with common arguments for every HdfsDirectory call
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba5bc737/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 aba2301..ec63d9b 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
@@ -424,7 +424,7 @@ class TestNamenode(RMFTestCase):
content = Template('exclude_hosts_list.j2'),
group = 'hadoop',
)
- self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/dn.service.keytab dn/c6401.ambari.apache.org@EXAMPLE.COM;',
+ self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/nn.service.keytab nn/c6401.ambari.apache.org@EXAMPLE.COM;',
user = 'hdfs',
)
self.assertResourceCalled('ExecuteHadoop', 'dfsadmin -refreshNodes',