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/07/23 14:51:44 UTC
git commit: AMBARI-6576. HDFS-only cluster deployment fails (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 86f65d6ce -> d8056bda2
AMBARI-6576. HDFS-only cluster deployment fails (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d8056bda
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d8056bda
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d8056bda
Branch: refs/heads/trunk
Commit: d8056bda292a58c3155e44b920059b98848230d1
Parents: 86f65d6
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Jul 23 15:51:40 2014 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Jul 23 15:51:40 2014 +0300
----------------------------------------------------------------------
.../hooks/before-INSTALL/scripts/params.py | 2 ++
.../scripts/shared_initialization.py | 25 +++++++++++---------
.../hooks/before-INSTALL/scripts/params.py | 2 ++
.../scripts/shared_initialization.py | 23 ++++++++++--------
4 files changed, 31 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d8056bda/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/params.py
index 70d2430..723cd3d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/params.py
@@ -104,6 +104,8 @@ zk_hosts = default("/clusterHostInfo/zookeeper_hosts", [])
ganglia_server_hosts = default("/clusterHostInfo/ganglia_server_host", [])
has_resourcemanager = not len(rm_host) == 0
+has_namenode = not len(namenode_host) == 0
+has_jt = not len(jtnode_host) == 0
has_slaves = not len(slave_hosts) == 0
has_nagios = not len(hagios_server_hosts) == 0
has_oozie_server = not len(oozie_servers) == 0
http://git-wip-us.apache.org/repos/asf/ambari/blob/d8056bda/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py
index fa351f9..2e8c8cd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py
@@ -104,17 +104,20 @@ def setup_users():
groups=[params.gmetad_user],
ignore_failures = params.ignore_groupsusers_create
)
-
- User(params.hdfs_user,
- gid=params.user_group,
- groups=[params.user_group],
- ignore_failures = params.ignore_groupsusers_create
- )
- User(params.mapred_user,
- gid=params.user_group,
- groups=[params.user_group],
- ignore_failures = params.ignore_groupsusers_create
- )
+
+ if params.has_namenode:
+ User(params.hdfs_user,
+ gid=params.user_group,
+ groups=[params.user_group],
+ ignore_failures = params.ignore_groupsusers_create
+ )
+ if params.has_jt:
+ User(params.mapred_user,
+ gid=params.user_group,
+ groups=[params.user_group],
+ ignore_failures = params.ignore_groupsusers_create
+ )
+
if params.has_zk_host:
User(params.zk_user,
gid=params.user_group,
http://git-wip-us.apache.org/repos/asf/ambari/blob/d8056bda/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py
index f68e0da..f769b3f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py
@@ -66,6 +66,8 @@ ganglia_server_hosts = default("/clusterHostInfo/ganglia_server_host", [])
storm_server_hosts = default("/clusterHostInfo/nimbus_hosts", [])
falcon_host = default('/clusterHostInfo/falcon_server_hosts', [])
+has_namenode = not len(namenode_host) == 0
+has_hs = not len(hs_host) == 0
has_resourcemanager = not len(rm_host) == 0
has_slaves = not len(slave_hosts) == 0
has_nagios = not len(hagios_server_hosts) == 0
http://git-wip-us.apache.org/repos/asf/ambari/blob/d8056bda/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
index 62fbfdb..8da05ed 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
@@ -110,16 +110,19 @@ def setup_users():
ignore_failures = params.ignore_groupsusers_create
)
- User(params.hdfs_user,
- gid=params.user_group,
- groups=[params.user_group],
- ignore_failures = params.ignore_groupsusers_create
- )
- User(params.mapred_user,
- gid=params.user_group,
- groups=[params.user_group],
- ignore_failures = params.ignore_groupsusers_create
- )
+ if params.has_namenode:
+ User(params.hdfs_user,
+ gid=params.user_group,
+ groups=[params.user_group],
+ ignore_failures = params.ignore_groupsusers_create
+ )
+
+ if params.has_hs:
+ User(params.mapred_user,
+ gid=params.user_group,
+ groups=[params.user_group],
+ ignore_failures = params.ignore_groupsusers_create
+ )
if params.has_zk_host:
User(params.zk_user,