MAPREDUCE-2783. svn merge -c r1179975 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179978 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
02bc9ecf9b
commit
b1282883cc
|
@ -1500,6 +1500,9 @@ Release 0.23.0 - Unreleased
|
||||||
MAPREDUCE-2794. [MR-279] Incorrect metrics value for AvailableGB per
|
MAPREDUCE-2794. [MR-279] Incorrect metrics value for AvailableGB per
|
||||||
queue per user. (John George via mahadev)
|
queue per user. (John George via mahadev)
|
||||||
|
|
||||||
|
MAPREDUCE-2783. Fixing RM web-UI to show no tracking-URL when AM
|
||||||
|
crashes. (Eric Payne via vinodkv)
|
||||||
|
|
||||||
Release 0.22.0 - Unreleased
|
Release 0.22.0 - Unreleased
|
||||||
|
|
||||||
INCOMPATIBLE CHANGES
|
INCOMPATIBLE CHANGES
|
||||||
|
|
|
@ -777,6 +777,15 @@ public class RMAppAttemptImpl implements RMAppAttempt {
|
||||||
" due to: " + containerStatus.getDiagnostics() + "." +
|
" due to: " + containerStatus.getDiagnostics() + "." +
|
||||||
"Failing this attempt.");
|
"Failing this attempt.");
|
||||||
|
|
||||||
|
/*
|
||||||
|
* In the case when the AM dies, the trackingUrl is left pointing to the AM's
|
||||||
|
* URL, which shows up in the scheduler UI as a broken link. Setting it here
|
||||||
|
* to empty string will prevent any link from being displayed.
|
||||||
|
* NOTE: don't set trackingUrl to 'null'. That will cause null-pointer exceptions
|
||||||
|
* in the generated proto code.
|
||||||
|
*/
|
||||||
|
appAttempt.trackingUrl = "";
|
||||||
|
|
||||||
new FinalTransition(RMAppAttemptState.FAILED).transition(
|
new FinalTransition(RMAppAttemptState.FAILED).transition(
|
||||||
appAttempt, containerFinishedEvent);
|
appAttempt, containerFinishedEvent);
|
||||||
return RMAppAttemptState.FAILED;
|
return RMAppAttemptState.FAILED;
|
||||||
|
|
Loading…
Reference in New Issue