MAPREDUCE-6927. MR job should only set tracking url if history was successfully written. Contributed by Eric Badger
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/735fce5b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/735fce5b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/735fce5b Branch: refs/heads/HADOOP-13345 Commit: 735fce5bec17f4e1799daf922625c475cf588114 Parents: acf9bd8 Author: Jason Lowe <jl...@yahoo-inc.com> Authored: Tue Aug 8 14:46:47 2017 -0500 Committer: Jason Lowe <jl...@yahoo-inc.com> Committed: Tue Aug 8 14:46:47 2017 -0500 ---------------------------------------------------------------------- .../jobhistory/JobHistoryEventHandler.java | 27 +++-- .../hadoop/mapreduce/v2/app/AppContext.java | 4 + .../hadoop/mapreduce/v2/app/MRAppMaster.java | 11 ++ .../mapreduce/v2/app/rm/RMCommunicator.java | 4 +- .../jobhistory/TestJobHistoryEventHandler.java | 102 +++++++++++++++++++ .../hadoop/mapreduce/v2/app/MockAppContext.java | 10 ++ .../mapreduce/v2/app/TestRuntimeEstimators.java | 10 ++ .../hadoop/mapreduce/v2/hs/JobHistory.java | 10 ++ 8 files changed, 168 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/735fce5b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java index 285d36e..53fe055 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java @@ -63,6 +63,7 @@ import org.apache.hadoop.mapreduce.v2.jobhistory.FileNameIndexUtils; import org.apache.hadoop.mapreduce.v2.jobhistory.JHAdminConfig; import org.apache.hadoop.mapreduce.v2.jobhistory.JobHistoryUtils; import org.apache.hadoop.mapreduce.v2.jobhistory.JobIndexInfo; +import org.apache.hadoop.mapreduce.v2.util.MRWebAppUtil; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.service.AbstractService; import org.apache.hadoop.util.StringUtils; @@ -1404,7 +1405,12 @@ public class JobHistoryEventHandler extends AbstractService qualifiedDoneFile = doneDirFS.makeQualified(new Path(doneDirPrefixPath, doneJobHistoryFileName)); - moveToDoneNow(qualifiedLogFile, qualifiedDoneFile); + if(moveToDoneNow(qualifiedLogFile, qualifiedDoneFile)) { + String historyUrl = MRWebAppUtil.getApplicationWebURLOnJHSWithScheme( + getConfig(), context.getApplicationID()); + context.setHistoryUrl(historyUrl); + LOG.info("Set historyUrl to " + historyUrl); + } } // Move confFile to Done Folder @@ -1610,7 +1616,7 @@ public class JobHistoryEventHandler extends AbstractService } } - private void moveTmpToDone(Path tmpPath) throws IOException { + protected void moveTmpToDone(Path tmpPath) throws IOException { if (tmpPath != null) { String tmpFileName = tmpPath.getName(); String fileName = getFileNameFromTmpFN(tmpFileName); @@ -1622,7 +1628,9 @@ public class JobHistoryEventHandler extends AbstractService // TODO If the FS objects are the same, this should be a rename instead of a // copy. - private void moveToDoneNow(Path fromPath, Path toPath) throws IOException { + protected boolean moveToDoneNow(Path fromPath, Path toPath) + throws IOException { + boolean success = false; // check if path exists, in case of retries it may not exist if (stagingDirFS.exists(fromPath)) { LOG.info("Copying " + fromPath.toString() + " to " + toPath.toString()); @@ -1631,13 +1639,18 @@ public class JobHistoryEventHandler extends AbstractService boolean copied = FileUtil.copy(stagingDirFS, fromPath, doneDirFS, toPath, false, getConfig()); - if (copied) - LOG.info("Copied to done location: " + toPath); - else - LOG.info("copy failed"); doneDirFS.setPermission(toPath, new FsPermission( JobHistoryUtils.HISTORY_INTERMEDIATE_FILE_PERMISSIONS)); + if (copied) { + LOG.info("Copied from: " + fromPath.toString() + + " to done location: " + toPath.toString()); + success = true; + } else { + LOG.info("Copy failed from: " + fromPath.toString() + + " to done location: " + toPath.toString()); + } } + return success; } private String getTempFileName(String srcFile) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/735fce5b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/AppContext.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/AppContext.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/AppContext.java index ddf4fa7..4a21396 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/AppContext.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/AppContext.java @@ -69,4 +69,8 @@ public interface AppContext { String getNMHostname(); TaskAttemptFinishingMonitor getTaskAttemptFinishingMonitor(); + + String getHistoryUrl(); + + void setHistoryUrl(String historyUrl); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/735fce5b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java index 8c9f605..f511f19 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java @@ -1078,6 +1078,7 @@ public class MRAppMaster extends CompositeService { private final ClientToAMTokenSecretManager clientToAMTokenSecretManager; private TimelineClient timelineClient = null; private TimelineV2Client timelineV2Client = null; + private String historyUrl = null; private final TaskAttemptFinishingMonitor taskAttemptFinishingMonitor; @@ -1197,6 +1198,16 @@ public class MRAppMaster extends CompositeService { public TimelineV2Client getTimelineV2Client() { return timelineV2Client; } + + @Override + public String getHistoryUrl() { + return historyUrl; + } + + @Override + public void setHistoryUrl(String historyUrl) { + this.historyUrl = historyUrl; + } } @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/hadoop/blob/735fce5b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java index 6cec2f3..a7058e0 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java @@ -215,9 +215,7 @@ public abstract class RMCommunicator extends AbstractService } LOG.info("Setting job diagnostics to " + sb.toString()); - String historyUrl = - MRWebAppUtil.getApplicationWebURLOnJHSWithScheme(getConfig(), - context.getApplicationID()); + String historyUrl = context.getHistoryUrl(); LOG.info("History url is " + historyUrl); FinishApplicationMasterRequest request = FinishApplicationMasterRequest.newInstance(finishState, http://git-wip-us.apache.org/repos/asf/hadoop/blob/735fce5b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java index 6c5e604..caf8c67 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java @@ -21,6 +21,9 @@ package org.apache.hadoop.mapreduce.jobhistory; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -62,6 +65,7 @@ import org.apache.hadoop.mapreduce.v2.app.job.JobStateInternal; import org.apache.hadoop.mapreduce.v2.jobhistory.JHAdminConfig; import org.apache.hadoop.mapreduce.v2.jobhistory.JobHistoryUtils; import org.apache.hadoop.mapreduce.v2.util.MRBuilderUtils; +import org.apache.hadoop.mapreduce.v2.util.MRWebAppUtil; import org.apache.hadoop.security.authorize.AccessControlList; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.ApplicationId; @@ -920,6 +924,104 @@ public class TestJobHistoryEventHandler { jheh.lastEventHandled.getHistoryEvent() instanceof JobUnsuccessfulCompletionEvent); } + + @Test (timeout=50000) + public void testSetTrackingURLAfterHistoryIsWritten() throws Exception { + TestParams t = new TestParams(true); + Configuration conf = new Configuration(); + + JHEvenHandlerForTest realJheh = + new JHEvenHandlerForTest(t.mockAppContext, 0, false); + JHEvenHandlerForTest jheh = spy(realJheh); + jheh.init(conf); + + try { + jheh.start(); + handleEvent(jheh, new JobHistoryEvent(t.jobId, new AMStartedEvent( + t.appAttemptId, 200, t.containerId, "nmhost", 3000, 4000, -1))); + verify(jheh, times(0)).processDoneFiles(any(JobId.class)); + verify(t.mockAppContext, times(0)).setHistoryUrl(any(String.class)); + + // Job finishes and successfully writes history + handleEvent(jheh, new JobHistoryEvent(t.jobId, new JobFinishedEvent( + TypeConverter.fromYarn(t.jobId), 0, 0, 0, 0, 0, new Counters(), + new Counters(), new Counters()))); + + verify(jheh, times(1)).processDoneFiles(any(JobId.class)); + String historyUrl = MRWebAppUtil.getApplicationWebURLOnJHSWithScheme( + conf, t.mockAppContext.getApplicationID()); + verify(t.mockAppContext, times(1)).setHistoryUrl(historyUrl); + } finally { + jheh.stop(); + } + } + + @Test (timeout=50000) + public void testDontSetTrackingURLIfHistoryWriteFailed() throws Exception { + TestParams t = new TestParams(true); + Configuration conf = new Configuration(); + + JHEvenHandlerForTest realJheh = + new JHEvenHandlerForTest(t.mockAppContext, 0, false); + JHEvenHandlerForTest jheh = spy(realJheh); + jheh.init(conf); + + try { + jheh.start(); + doReturn(false).when(jheh).moveToDoneNow(any(Path.class), + any(Path.class)); + doNothing().when(jheh).moveTmpToDone(any(Path.class)); + handleEvent(jheh, new JobHistoryEvent(t.jobId, new AMStartedEvent( + t.appAttemptId, 200, t.containerId, "nmhost", 3000, 4000, -1))); + verify(jheh, times(0)).processDoneFiles(any(JobId.class)); + verify(t.mockAppContext, times(0)).setHistoryUrl(any(String.class)); + + // Job finishes, but doesn't successfully write history + handleEvent(jheh, new JobHistoryEvent(t.jobId, new JobFinishedEvent( + TypeConverter.fromYarn(t.jobId), 0, 0, 0, 0, 0, new Counters(), + new Counters(), new Counters()))); + verify(jheh, times(1)).processDoneFiles(any(JobId.class)); + verify(t.mockAppContext, times(0)).setHistoryUrl(any(String.class)); + + } finally { + jheh.stop(); + } + } + @Test (timeout=50000) + public void testDontSetTrackingURLIfHistoryWriteThrows() throws Exception { + TestParams t = new TestParams(true); + Configuration conf = new Configuration(); + + JHEvenHandlerForTest realJheh = + new JHEvenHandlerForTest(t.mockAppContext, 0, false); + JHEvenHandlerForTest jheh = spy(realJheh); + jheh.init(conf); + + try { + jheh.start(); + doThrow(new YarnRuntimeException(new IOException())) + .when(jheh).processDoneFiles(any(JobId.class)); + handleEvent(jheh, new JobHistoryEvent(t.jobId, new AMStartedEvent( + t.appAttemptId, 200, t.containerId, "nmhost", 3000, 4000, -1))); + verify(jheh, times(0)).processDoneFiles(any(JobId.class)); + verify(t.mockAppContext, times(0)).setHistoryUrl(any(String.class)); + + // Job finishes, but doesn't successfully write history + try { + handleEvent(jheh, new JobHistoryEvent(t.jobId, new JobFinishedEvent( + TypeConverter.fromYarn(t.jobId), 0, 0, 0, 0, 0, new Counters(), + new Counters(), new Counters()))); + throw new RuntimeException( + "processDoneFiles didn't throw, but should have"); + } catch (YarnRuntimeException yre) { + // Exception expected, do nothing + } + verify(jheh, times(1)).processDoneFiles(any(JobId.class)); + verify(t.mockAppContext, times(0)).setHistoryUrl(any(String.class)); + } finally { + jheh.stop(); + } + } } class JHEvenHandlerForTest extends JobHistoryEventHandler { http://git-wip-us.apache.org/repos/asf/hadoop/blob/735fce5b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MockAppContext.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MockAppContext.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MockAppContext.java index 4e31b63..0686633 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MockAppContext.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MockAppContext.java @@ -154,4 +154,14 @@ public class MockAppContext implements AppContext { return null; } + @Override + public String getHistoryUrl() { + return null; + } + + @Override + public void setHistoryUrl(String historyUrl) { + return; + } + } http://git-wip-us.apache.org/repos/asf/hadoop/blob/735fce5b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRuntimeEstimators.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRuntimeEstimators.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRuntimeEstimators.java index 8c7f0db..301d498 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRuntimeEstimators.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRuntimeEstimators.java @@ -896,5 +896,15 @@ public class TestRuntimeEstimators { public TaskAttemptFinishingMonitor getTaskAttemptFinishingMonitor() { return null; } + + @Override + public String getHistoryUrl() { + return null; + } + + @Override + public void setHistoryUrl(String historyUrl) { + return; + } } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/735fce5b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistory.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistory.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistory.java index c5a40b2..2671df4 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistory.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistory.java @@ -407,4 +407,14 @@ public class JobHistory extends AbstractService implements HistoryContext { public TaskAttemptFinishingMonitor getTaskAttemptFinishingMonitor() { return null; } + + @Override + public String getHistoryUrl() { + return null; + } + + @Override + public void setHistoryUrl(String historyUrl) { + return; + } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org