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/03/26 15:06:23 UTC

[1/3] git commit: AMBARI-5222. Assigning History Server to non-default host produces alert (aonishuk)

Repository: ambari
Updated Branches:
  refs/heads/branch-1.5.0 281adc06a -> 8be53b785
  refs/heads/trunk aa6769c06 -> b5a072f3a


AMBARI-5222. Assigning History Server to non-default host produces alert (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8be53b78
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8be53b78
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8be53b78

Branch: refs/heads/branch-1.5.0
Commit: 8be53b785cb47a71011d2e43e382a952ee40218f
Parents: 281adc0
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Wed Mar 26 06:48:40 2014 -0700
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Wed Mar 26 06:48:40 2014 -0700

----------------------------------------------------------------------
 .../stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py     | 1 +
 .../1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/8be53b78/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
index bb75102..717fefc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
@@ -159,5 +159,6 @@ hostgroup_defs = {
     'resourcemanager' : _rm_host,
     'nodemanagers' : _nm_hosts,
     'historyserver2' : _hs_host,
+    'jobhistory': _hs_host,
     'journalnodes' : _journalnode_hosts
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/8be53b78/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
index 2248f96..7124c26 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
@@ -318,7 +318,7 @@ define service {
 }
 
 define service {
-        hostgroup_name          jobtracker
+        hostgroup_name          jobhistory
         use                     hadoop-service
         service_description     JOBTRACKER::HistoryServer Web UI
         servicegroups           MAPREDUCE


[2/3] git commit: AMBARI-5222. Assigning History Server to non-default host produces alert (aonishuk)

Posted by ao...@apache.org.
AMBARI-5222. Assigning History Server to non-default host produces alert (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8e5c6be9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8e5c6be9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8e5c6be9

Branch: refs/heads/trunk
Commit: 8e5c6be95e9a3e308f97cff74184fbfbac1afeb5
Parents: aa6769c
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Wed Mar 26 06:49:09 2014 -0700
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Wed Mar 26 07:05:50 2014 -0700

----------------------------------------------------------------------
 .../stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py     | 1 +
 .../1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/8e5c6be9/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
index bb75102..717fefc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
@@ -159,5 +159,6 @@ hostgroup_defs = {
     'resourcemanager' : _rm_host,
     'nodemanagers' : _nm_hosts,
     'historyserver2' : _hs_host,
+    'jobhistory': _hs_host,
     'journalnodes' : _journalnode_hosts
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/8e5c6be9/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
index 2248f96..7124c26 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
@@ -318,7 +318,7 @@ define service {
 }
 
 define service {
-        hostgroup_name          jobtracker
+        hostgroup_name          jobhistory
         use                     hadoop-service
         service_description     JOBTRACKER::HistoryServer Web UI
         servicegroups           MAPREDUCE


[3/3] git commit: AMBARI-5219. Tez user being created (aonishuk)

Posted by ao...@apache.org.
AMBARI-5219. Tez user being created (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b5a072f3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b5a072f3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b5a072f3

Branch: refs/heads/trunk
Commit: b5a072f3a724317e0ae8f4afe45c3f1c6053f2a9
Parents: 8e5c6be
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Wed Mar 26 07:05:56 2014 -0700
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Wed Mar 26 07:05:56 2014 -0700

----------------------------------------------------------------------
 .../hooks/before-INSTALL/scripts/params.py      |  2 +-
 .../services/HIVE/configuration/global.xml      |  5 ++++
 .../services/HIVE/package/scripts/params.py     |  2 +-
 .../2.1/services/TEZ/configuration/global.xml   | 29 ++++++++++++++++++++
 .../2.1/services/TEZ/package/scripts/params.py  |  2 +-
 .../python/stacks/2.0.6/configs/default.json    |  1 +
 .../test/python/stacks/2.1/configs/default.json |  1 +
 .../test/python/stacks/2.1/configs/secured.json |  1 +
 8 files changed, 40 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b5a072f3/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 d938e74..7ca5512 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
@@ -38,7 +38,7 @@ zk_user = config['configurations']['global']['zk_user']
 gmetad_user = config['configurations']['global']["gmetad_user"]
 gmond_user = config['configurations']['global']["gmond_user"]
 storm_user = config['configurations']['global']['storm_user']
-tez_user = 'tez'
+tez_user = config['configurations']['global']['tez_user']
 falcon_user = config['configurations']['global']['falcon_user']
 
 user_group = config['configurations']['global']['user_group']

http://git-wip-us.apache.org/repos/asf/ambari/blob/b5a072f3/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/global.xml
index ae7f586..6841f59 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/global.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/global.xml
@@ -121,6 +121,11 @@
     <value>hive</value>
     <description>Hive User.</description>
   </property>
+  <property>
+    <name>tez_user</name>
+    <value>tez</value>
+    <description></description>
+  </property>
 
   <!--HCAT-->
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b5a072f3/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py
index 38aecd6..664b676 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py
@@ -168,7 +168,7 @@ kinit_path_local = functions.get_kinit_path([default("kinit_path_local",None), "
 tez_lib_uris = default("/configurations/tez-site/tez.lib.uris", None)
 tez_local_api_jars = '/usr/lib/tez/tez*.jar'
 tez_local_lib_jars = '/usr/lib/tez/lib/*.jar'
-tez_user = 'tez'
+tez_user = config['configurations']['global']['tez_user']
 
 hive_exec_jar_path = '/usr/lib/hive/lib/hive-exec.jar'
 hive_exec_hdfs_path = default('/configurations/hive-site/hive.jar.directory', '/apps/hive/install')

http://git-wip-us.apache.org/repos/asf/ambari/blob/b5a072f3/ambari-server/src/main/resources/stacks/HDP/2.1/services/TEZ/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/TEZ/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/TEZ/configuration/global.xml
new file mode 100644
index 0000000..84389bd
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/TEZ/configuration/global.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<configuration>
+  <property>
+    <name>tez_user</name>
+    <value>tez</value>
+    <description></description>
+  </property>
+</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b5a072f3/ambari-server/src/main/resources/stacks/HDP/2.1/services/TEZ/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/TEZ/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.1/services/TEZ/package/scripts/params.py
index d02bd50..8bc810a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/TEZ/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/TEZ/package/scripts/params.py
@@ -28,5 +28,5 @@ config_dir = "/etc/tez/conf"
 hadoop_home = '/usr'
 java64_home = config['hostLevelParams']['java_home']
 
-tez_user = 'tez'
+tez_user = config['configurations']['global']['tez_user']
 user_group = config['configurations']['global']['user_group']
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/b5a072f3/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index 1689cce..12020a6 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
@@ -291,6 +291,7 @@
             "falcon_user": "falcon",
             "falcon_port": "15000",
             "falcon_local_dir": "/hadoop/falcon",
+            "tez_user": "tez",
             "rca_enabled": "false"
         }, 
         "capacity-scheduler": {

http://git-wip-us.apache.org/repos/asf/ambari/blob/b5a072f3/ambari-server/src/test/python/stacks/2.1/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/default.json b/ambari-server/src/test/python/stacks/2.1/configs/default.json
index 1ee929a..d1514c9 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/default.json
@@ -331,6 +331,7 @@
             "falcon_user": "falcon",
             "falcon_port": "15000",
             "falcon_local_dir": "/hadoop/falcon",
+            "tez_user": "tez",
             "rca_enabled": "false"
         }, 
         "capacity-scheduler": {

http://git-wip-us.apache.org/repos/asf/ambari/blob/b5a072f3/ambari-server/src/test/python/stacks/2.1/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured.json b/ambari-server/src/test/python/stacks/2.1/configs/secured.json
index 7970411..5c816e9 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/secured.json
@@ -435,6 +435,7 @@
             "falcon_user": "falcon",
             "falcon_port": "15000",
             "falcon_local_dir": "/hadoop/falcon",
+            "tez_user": "tez",
             "rca_enabled": "false"
         }, 
         "capacity-scheduler": {