You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2014/12/23 21:51:31 UTC
ambari git commit: AMBARI-8869. Include AMS debian packages in Ambari
build. Updated build properties. (swagle)
Repository: ambari
Updated Branches:
refs/heads/trunk 895b1adc0 -> 0c1c14b76
AMBARI-8869. Include AMS debian packages in Ambari build. Updated build properties. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0c1c14b7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0c1c14b7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0c1c14b7
Branch: refs/heads/trunk
Commit: 0c1c14b765ab73a634a231e64ef511d2731c92ce
Parents: 895b1ad
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Tue Dec 23 12:50:18 2014 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Tue Dec 23 12:50:28 2014 -0800
----------------------------------------------------------------------
ambari-metrics/ambari-metrics-timelineservice/pom.xml | 9 +++++----
.../ApplicationHistoryManagerImpl.java | 1 +
.../applicationhistoryservice/ApplicationHistoryServer.java | 4 ++--
3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0c1c14b7/ambari-metrics/ambari-metrics-timelineservice/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
index c2c0323..196d7a1 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
@@ -34,8 +34,9 @@
<!-- Needed for generating FindBugs warnings using parent pom -->
<!--<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>-->
<protobuf.version>2.5.0</protobuf.version>
- <hadoop.version>2.4.0</hadoop.version>
- <phoenix.version>4.2.0.2.2.1.0-2114</phoenix.version>
+ <hadoop.version>(2.6.0.2.2.0.0, 2.6.0.2.2.1.0)</hadoop.version>
+ <phoenix.version>4.2.0.2.2.0.0-2041</phoenix.version>
+ <hbase.version>0.98.4.2.2.0.0-2041-hadoop2</hbase.version>
</properties>
<build>
@@ -477,14 +478,14 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-it</artifactId>
- <version>0.98.4-hadoop2</version>
+ <version>${hbase.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-testing-util</artifactId>
- <version>0.98.4-hadoop2</version>
+ <version>${hbase.version}</version>
<scope>test</scope>
<optional>true</optional>
<exclusions>
http://git-wip-us.apache.org/repos/asf/ambari/blob/0c1c14b7/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java
index 85a5e3a..84e9a39 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java
+++ b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java
@@ -171,6 +171,7 @@ public class ApplicationHistoryManagerImpl extends AbstractService implements
return ApplicationAttemptReport.newInstance(
appAttemptHistory.getApplicationAttemptId(), appAttemptHistory.getHost(),
appAttemptHistory.getRPCPort(), appAttemptHistory.getTrackingURL(),
+ null,
appAttemptHistory.getDiagnosticsInfo(),
appAttemptHistory.getYarnApplicationAttemptState(),
appAttemptHistory.getMasterContainerId());
http://git-wip-us.apache.org/repos/asf/ambari/blob/0c1c14b7/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
index 3dd4d8d..ed4d057 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
+++ b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
@@ -177,9 +177,9 @@ public class ApplicationHistoryServer extends CompositeService {
ahsClientService, "ws")
.with(getConfig())
.withHttpSpnegoPrincipalKey(
- YarnConfiguration.TIMELINE_SERVICE_WEBAPP_SPNEGO_USER_NAME_KEY)
+ YarnConfiguration.TIMELINE_SERVICE_PRINCIPAL)
.withHttpSpnegoKeytabKey(
- YarnConfiguration.TIMELINE_SERVICE_WEBAPP_SPNEGO_KEYTAB_FILE_KEY)
+ YarnConfiguration.TIMELINE_SERVICE_KEYTAB)
.at(bindAddress)
.start(new AHSWebApp(historyManager, timelineStore, timelineMetricStore));
} catch (Exception e) {