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/01/14 20:32:41 UTC
[1/2] git commit: AMBARI-4288. Namenode start fails on 1.3.4
(aonishuk)
Updated Branches:
refs/heads/trunk 589e92d5c -> 625d0df9a
AMBARI-4288. Namenode start fails on 1.3.4 (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/625d0df9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/625d0df9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/625d0df9
Branch: refs/heads/trunk
Commit: 625d0df9a3cfb647946bed6b66da75b157d523c4
Parents: 7e5b5d1
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Tue Jan 14 11:31:22 2014 -0800
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Tue Jan 14 11:32:30 2014 -0800
----------------------------------------------------------------------
.../MAPREDUCE/configuration/mapred-site.xml | 23 ++++++++++++++++++++
.../MAPREDUCE/configuration/mapred-site.xml | 23 ++++++++++++++++++++
.../MAPREDUCE/configuration/mapred-site.xml | 23 ++++++++++++++++++++
.../MAPREDUCE/configuration/mapred-site.xml | 23 ++++++++++++++++++++
.../MAPREDUCE/configuration/mapred-site.xml | 22 +++++++++++++++++++
.../MAPREDUCE/configuration/mapred-site.xml | 23 ++++++++++++++++++++
.../MAPREDUCE/configuration/mapred-site.xml | 22 +++++++++++++++++++
7 files changed, 159 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/625d0df9/ambari-server/src/main/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/mapred-site.xml
index a15a744..6295d8e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/mapred-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/mapred-site.xml
@@ -534,4 +534,27 @@ user)</description>
<description> Comma separated list of queues configured for this jobtracker.</description>
</property>
+
+<property>
+ <name>mapreduce.jobhistory.intermediate-done-dir</name>
+ <value>/mr-history/tmp</value>
+ <description>
+ Directory where history files are written by MapReduce jobs.
+ </description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.done-dir</name>
+ <value>/mr-history/done</value>
+ <description>
+ Directory where history files are managed by the MR JobHistory Server.
+ </description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.webapp.address</name>
+ <value>localhost:19888</value>
+ <description>Enter your JobHistoryServer hostname.</description>
+</property>
+
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/625d0df9/ambari-server/src/main/resources/stacks/HDP/1.2.1/services/MAPREDUCE/configuration/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.2.1/services/MAPREDUCE/configuration/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/1.2.1/services/MAPREDUCE/configuration/mapred-site.xml
index f017c77..b86efdd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.2.1/services/MAPREDUCE/configuration/mapred-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.2.1/services/MAPREDUCE/configuration/mapred-site.xml
@@ -528,4 +528,27 @@ user)</description>
<description> Comma separated list of queues configured for this jobtracker.</description>
</property>
+
+<property>
+ <name>mapreduce.jobhistory.intermediate-done-dir</name>
+ <value>/mr-history/tmp</value>
+ <description>
+ Directory where history files are written by MapReduce jobs.
+ </description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.done-dir</name>
+ <value>/mr-history/done</value>
+ <description>
+ Directory where history files are managed by the MR JobHistory Server.
+ </description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.webapp.address</name>
+ <value>localhost:19888</value>
+ <description>Enter your JobHistoryServer hostname.</description>
+</property>
+
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/625d0df9/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml
index df6ca71..343a5f9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/MAPREDUCE/configuration/mapred-site.xml
@@ -534,4 +534,27 @@ user)</description>
<description> Comma separated list of queues configured for this jobtracker.</description>
</property>
+
+<property>
+ <name>mapreduce.jobhistory.intermediate-done-dir</name>
+ <value>/mr-history/tmp</value>
+ <description>
+ Directory where history files are written by MapReduce jobs.
+ </description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.done-dir</name>
+ <value>/mr-history/done</value>
+ <description>
+ Directory where history files are managed by the MR JobHistory Server.
+ </description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.webapp.address</name>
+ <value>localhost:19888</value>
+ <description>Enter your JobHistoryServer hostname.</description>
+</property>
+
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/625d0df9/ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/services/MAPREDUCE/configuration/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/services/MAPREDUCE/configuration/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/services/MAPREDUCE/configuration/mapred-site.xml
index 82f3137..0d75d35 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/services/MAPREDUCE/configuration/mapred-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/services/MAPREDUCE/configuration/mapred-site.xml
@@ -534,4 +534,27 @@ user)</description>
<description> Comma separated list of queues configured for this jobtracker.</description>
</property>
+
+<property>
+ <name>mapreduce.jobhistory.intermediate-done-dir</name>
+ <value>/mr-history/tmp</value>
+ <description>
+ Directory where history files are written by MapReduce jobs.
+ </description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.done-dir</name>
+ <value>/mr-history/done</value>
+ <description>
+ Directory where history files are managed by the MR JobHistory Server.
+ </description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.webapp.address</name>
+ <value>localhost:19888</value>
+ <description>Enter your JobHistoryServer hostname.</description>
+</property>
+
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/625d0df9/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/mapred-site.xml
index da3545c..305337c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/mapred-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/mapred-site.xml
@@ -575,5 +575,27 @@
<value>default</value>
<description> Comma separated list of queues configured for this jobtracker.</description>
</property>
+
+ <property>
+ <name>mapreduce.jobhistory.intermediate-done-dir</name>
+ <value>/mr-history/tmp</value>
+ <description>
+ Directory where history files are written by MapReduce jobs.
+ </description>
+ </property>
+
+ <property>
+ <name>mapreduce.jobhistory.done-dir</name>
+ <value>/mr-history/done</value>
+ <description>
+ Directory where history files are managed by the MR JobHistory Server.
+ </description>
+ </property>
+
+ <property>
+ <name>mapreduce.jobhistory.webapp.address</name>
+ <value>localhost:19888</value>
+ <description>Enter your JobHistoryServer hostname.</description>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/625d0df9/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/MAPREDUCE/configuration/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/MAPREDUCE/configuration/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/MAPREDUCE/configuration/mapred-site.xml
index 48708aa..a07b98e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/MAPREDUCE/configuration/mapred-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/MAPREDUCE/configuration/mapred-site.xml
@@ -577,4 +577,27 @@ user)</description>
<description> Comma separated list of queues configured for this jobtracker.</description>
</property>
+
+<property>
+ <name>mapreduce.jobhistory.intermediate-done-dir</name>
+ <value>/mr-history/tmp</value>
+ <description>
+ Directory where history files are written by MapReduce jobs.
+ </description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.done-dir</name>
+ <value>/mr-history/done</value>
+ <description>
+ Directory where history files are managed by the MR JobHistory Server.
+ </description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.webapp.address</name>
+ <value>localhost:19888</value>
+ <description>Enter your JobHistoryServer hostname.</description>
+</property>
+
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/625d0df9/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/MAPREDUCE/configuration/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/MAPREDUCE/configuration/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/MAPREDUCE/configuration/mapred-site.xml
index da3545c..305337c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/MAPREDUCE/configuration/mapred-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/MAPREDUCE/configuration/mapred-site.xml
@@ -575,5 +575,27 @@
<value>default</value>
<description> Comma separated list of queues configured for this jobtracker.</description>
</property>
+
+ <property>
+ <name>mapreduce.jobhistory.intermediate-done-dir</name>
+ <value>/mr-history/tmp</value>
+ <description>
+ Directory where history files are written by MapReduce jobs.
+ </description>
+ </property>
+
+ <property>
+ <name>mapreduce.jobhistory.done-dir</name>
+ <value>/mr-history/done</value>
+ <description>
+ Directory where history files are managed by the MR JobHistory Server.
+ </description>
+ </property>
+
+ <property>
+ <name>mapreduce.jobhistory.webapp.address</name>
+ <value>localhost:19888</value>
+ <description>Enter your JobHistoryServer hostname.</description>
+ </property>
</configuration>
[2/2] git commit: AMBARI-4286. Ambari install fails during install
cluster. MySQL server fails. (aonishuk)
Posted by ao...@apache.org.
AMBARI-4286. Ambari install fails during install cluster. MySQL server
fails. (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7e5b5d17
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7e5b5d17
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7e5b5d17
Branch: refs/heads/trunk
Commit: 7e5b5d176315f2e3f634de02448080f196f21f4e
Parents: 589e92d
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Tue Jan 14 11:29:45 2014 -0800
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Tue Jan 14 11:32:30 2014 -0800
----------------------------------------------------------------------
.../HIVE/package/scripts/mysql_server.py | 2 +-
.../HIVE/package/scripts/mysql_service.py | 20 +++++++-------------
.../HIVE/package/scripts/mysql_server.py | 2 +-
.../HIVE/package/scripts/mysql_service.py | 20 +++++++-------------
4 files changed, 16 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e5b5d17/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_server.py b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_server.py
index 5360f99..a45d310 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_server.py
@@ -47,7 +47,7 @@ class MysqlServer(Script):
# Autoescaping
cmd = ("bash", "-x", params.mysql_adduser_path, self.daemon_name,
- params.hive_metastore_user_name, params.hive_metastore_user_passwd, params.mysql_host[0])
+ params.hive_metastore_user_name, str(params.hive_metastore_user_passwd) , params.mysql_host[0])
Execute(cmd,
tries=3,
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e5b5d17/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_service.py b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_service.py
index 4716343..cfb3e08 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_service.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HIVE/package/scripts/mysql_service.py
@@ -22,23 +22,17 @@ from resource_management import *
def mysql_service(daemon_name=None, action='start'):
+ cmd = format('service {daemon_name} {action}')
- logoutput=True
- if action == 'start':
- cmd = format('service {daemon_name} start')
- elif action == 'stop':
- cmd = format('service {daemon_name} stop')
- elif action == 'status':
- cmd = format('service {daemon_name} status')
+ if action == 'status':
logoutput = False
else:
- cmd = None
+ logoutput = True
- if cmd is not None:
- Execute(cmd,
- path="/usr/local/bin/:/bin/:/sbin/",
- tries=1,
- logoutput=logoutput)
+ Execute(cmd,
+ path="/usr/local/bin/:/bin/:/sbin/",
+ tries=1,
+ logoutput=logoutput)
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e5b5d17/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_server.py b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_server.py
index 5360f99..a45d310 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_server.py
@@ -47,7 +47,7 @@ class MysqlServer(Script):
# Autoescaping
cmd = ("bash", "-x", params.mysql_adduser_path, self.daemon_name,
- params.hive_metastore_user_name, params.hive_metastore_user_passwd, params.mysql_host[0])
+ params.hive_metastore_user_name, str(params.hive_metastore_user_passwd) , params.mysql_host[0])
Execute(cmd,
tries=3,
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e5b5d17/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_service.py b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_service.py
index 4716343..cfb3e08 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_service.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HIVE/package/scripts/mysql_service.py
@@ -22,23 +22,17 @@ from resource_management import *
def mysql_service(daemon_name=None, action='start'):
+ cmd = format('service {daemon_name} {action}')
- logoutput=True
- if action == 'start':
- cmd = format('service {daemon_name} start')
- elif action == 'stop':
- cmd = format('service {daemon_name} stop')
- elif action == 'status':
- cmd = format('service {daemon_name} status')
+ if action == 'status':
logoutput = False
else:
- cmd = None
+ logoutput = True
- if cmd is not None:
- Execute(cmd,
- path="/usr/local/bin/:/bin/:/sbin/",
- tries=1,
- logoutput=logoutput)
+ Execute(cmd,
+ path="/usr/local/bin/:/bin/:/sbin/",
+ tries=1,
+ logoutput=logoutput)