hadoop git commit: MAPREDUCE-6266. Job#getTrackingURL should consistently return a proper URL (rchiang via rkanter)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 c846e84d5 - 0fdd5c23c
MAPREDUCE-6266. Job#getTrackingURL should consistently return a proper URL
(rchiang via rkanter)
(cherry picked from commit c4986b2d00d327f18d0c7e2f8805b69a4e07a19b)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0fdd5c23
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0fdd5c23
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0fdd5c23
Branch: refs/heads/branch-2
Commit: 0fdd5c23c34cfd3c212f880358652702b4dcd68e
Parents: c846e84
Author: Robert Kanter rkan...@apache.org
Authored: Thu Apr 9 13:48:14 2015 -0700
Committer: Robert Kanter rkan...@apache.org
Committed: Thu Apr 9 13:49:03 2015 -0700
--
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0fdd5c23/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt
b/hadoop-mapreduce-project/CHANGES.txt
index d75fda2..48a39a4 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -79,6 +79,9 @@ Release 2.8.0 - UNRELEASED
MAPREDUCE-4844. Counters / AbstractCounters have constant references not
declared final. (Brahma Reddy Battula via gera)
+MAPREDUCE-6266. Job#getTrackingURL should consistently return a proper URL
+(rchiang via rkanter)
+
Release 2.7.0 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0fdd5c23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java
index 6df8261..0f1f391 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java
@@ -157,10 +157,10 @@ public class CompletedJob implements
org.apache.hadoop.mapreduce.v2.app.job.Job
String historyUrl = N/A;
try {
historyUrl =
- MRWebAppUtil.getApplicationWebURLOnJHSWithoutScheme(conf,
+ MRWebAppUtil.getApplicationWebURLOnJHSWithScheme(conf,
jobId.getAppId());
} catch (UnknownHostException e) {
- //Ignore.
+LOG.error(Problem determining local host: + e.getMessage());
}
report.setTrackingUrl(historyUrl);
report.setAMInfos(getAMInfos());
hadoop git commit: MAPREDUCE-6266. Job#getTrackingURL should consistently return a proper URL (rchiang via rkanter)
Repository: hadoop
Updated Branches:
refs/heads/trunk 9c5911294 - c4986b2d0
MAPREDUCE-6266. Job#getTrackingURL should consistently return a proper URL
(rchiang via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c4986b2d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c4986b2d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c4986b2d
Branch: refs/heads/trunk
Commit: c4986b2d00d327f18d0c7e2f8805b69a4e07a19b
Parents: 9c59112
Author: Robert Kanter rkan...@apache.org
Authored: Thu Apr 9 13:48:14 2015 -0700
Committer: Robert Kanter rkan...@apache.org
Committed: Thu Apr 9 13:48:14 2015 -0700
--
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c4986b2d/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt
b/hadoop-mapreduce-project/CHANGES.txt
index c1eb6c3..b9a75e3 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -324,6 +324,9 @@ Release 2.8.0 - UNRELEASED
MAPREDUCE-4844. Counters / AbstractCounters have constant references not
declared final. (Brahma Reddy Battula via gera)
+MAPREDUCE-6266. Job#getTrackingURL should consistently return a proper URL
+(rchiang via rkanter)
+
Release 2.7.0 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c4986b2d/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java
index 6df8261..0f1f391 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java
@@ -157,10 +157,10 @@ public class CompletedJob implements
org.apache.hadoop.mapreduce.v2.app.job.Job
String historyUrl = N/A;
try {
historyUrl =
- MRWebAppUtil.getApplicationWebURLOnJHSWithoutScheme(conf,
+ MRWebAppUtil.getApplicationWebURLOnJHSWithScheme(conf,
jobId.getAppId());
} catch (UnknownHostException e) {
- //Ignore.
+LOG.error(Problem determining local host: + e.getMessage());
}
report.setTrackingUrl(historyUrl);
report.setAMInfos(getAMInfos());
