You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by we...@apache.org on 2016/05/24 23:46:34 UTC
reef git commit: [REEF-1401] Fix Driver Restart to correctly use the
right folder
Repository: reef
Updated Branches:
refs/heads/master d02594533 -> e03fa36c2
[REEF-1401] Fix Driver Restart to correctly use the right folder
This addressed the issue by
* Using JobSubmissionDirectory instead of DriverJobSubmissionDirectory in DFSEvaluatorPreserver.
* Logging in HandleException.
JIRA:
[REEF-1401](https://issues.apache.org/jira/browse/REEF-1401)
Pull Request:
This closes #1012
Project: http://git-wip-us.apache.org/repos/asf/reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/e03fa36c
Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/e03fa36c
Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/e03fa36c
Branch: refs/heads/master
Commit: e03fa36c2fb3bb8522a0d07cc8a1520f4ba95cc6
Parents: d025945
Author: Andrew Chung <af...@gmail.com>
Authored: Mon May 23 15:47:22 2016 -0700
Committer: Markus Weimer <we...@apache.org>
Committed: Tue May 24 16:45:26 2016 -0700
----------------------------------------------------------------------
.../runtime/yarn/driver/restart/DFSEvaluatorPreserver.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/reef/blob/e03fa36c/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/restart/DFSEvaluatorPreserver.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/restart/DFSEvaluatorPreserver.java b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/restart/DFSEvaluatorPreserver.java
index 389031e..401b672 100644
--- a/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/restart/DFSEvaluatorPreserver.java
+++ b/lang/java/reef-runtime-yarn/src/main/java/org/apache/reef/runtime/yarn/driver/restart/DFSEvaluatorPreserver.java
@@ -25,11 +25,11 @@ import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.reef.annotations.Unstable;
import org.apache.reef.annotations.audience.DriverSide;
import org.apache.reef.annotations.audience.RuntimeAuthor;
-import org.apache.reef.driver.parameters.DriverJobSubmissionDirectory;
import org.apache.reef.driver.parameters.FailDriverOnEvaluatorLogErrors;
import org.apache.reef.exception.DriverFatalRuntimeException;
import org.apache.reef.runtime.common.driver.EvaluatorPreserver;
import org.apache.reef.runtime.common.driver.evaluator.EvaluatorManager;
+import org.apache.reef.runtime.yarn.driver.parameters.JobSubmissionDirectory;
import org.apache.reef.runtime.yarn.util.YarnUtilities;
import org.apache.reef.tang.annotations.Parameter;
@@ -74,7 +74,7 @@ public final class DFSEvaluatorPreserver implements EvaluatorPreserver, AutoClos
@Inject
private DFSEvaluatorPreserver(@Parameter(FailDriverOnEvaluatorLogErrors.class)
final boolean failDriverOnEvaluatorLogErrors,
- @Parameter(DriverJobSubmissionDirectory.class)
+ @Parameter(JobSubmissionDirectory.class)
final String jobSubmissionDirectory) {
this.failDriverOnEvaluatorLogErrors = failDriverOnEvaluatorLogErrors;
@@ -83,7 +83,7 @@ public final class DFSEvaluatorPreserver implements EvaluatorPreserver, AutoClos
final org.apache.hadoop.conf.Configuration config = new org.apache.hadoop.conf.Configuration();
this.fileSystem = FileSystem.get(config);
this.changeLogLocation =
- new Path(StringUtils.stripEnd(jobSubmissionDirectory, "/") + "/evaluatorsChangesLog");
+ new Path("/" + StringUtils.strip(jobSubmissionDirectory, "/") + "/evaluatorsChangesLog");
boolean appendSupported = config.getBoolean("dfs.support.append", false);
@@ -226,6 +226,8 @@ public final class DFSEvaluatorPreserver implements EvaluatorPreserver, AutoClos
} else {
throw new DriverFatalRuntimeException("Driver failed on Evaluator log error.", e);
}
+ } else {
+ LOG.log(Level.WARNING, errorMsg, e);
}
}