You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by af...@apache.org on 2016/03/25 17:20:37 UTC
reef git commit: [REEF-1280] The message returned from failed
evaluator doesn't contain the real exception message
Repository: reef
Updated Branches:
refs/heads/master 7f2cb1bdd -> 73bfc0a63
[REEF-1280] The message returned from failed evaluator doesn't contain the real exception message
Return message from Java EvaluatorException over the bridge
Adding a log line in TestFailedEvaluatorEventHandler and clean little bit for it
JIRA: [REEF-1280](https://issues.apache.org/jira/browse/REEF-1280)
This closes #901
Project: http://git-wip-us.apache.org/repos/asf/reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/73bfc0a6
Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/73bfc0a6
Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/73bfc0a6
Branch: refs/heads/master
Commit: 73bfc0a635a51d8376993421f7149757f323c9a0
Parents: 7f2cb1b
Author: Julia Wang <ju...@apache.org>
Authored: Wed Mar 23 17:34:25 2016 -0700
Committer: Andrew Chung <af...@gmail.com>
Committed: Fri Mar 25 09:19:41 2016 -0700
----------------------------------------------------------------------
.../Functional/Bridge/TestFailedEvaluatorEventHandler.cs | 9 +++------
.../org/apache/reef/javabridge/FailedEvaluatorBridge.java | 2 +-
2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/reef/blob/73bfc0a6/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedEvaluatorEventHandler.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedEvaluatorEventHandler.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedEvaluatorEventHandler.cs
index 4c94781..a10f596 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedEvaluatorEventHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedEvaluatorEventHandler.cs
@@ -16,6 +16,7 @@
// under the License.
using System;
+using System.Globalization;
using System.Text;
using System.Threading;
using Org.Apache.REEF.Common.Tasks;
@@ -54,7 +55,6 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge
public void TestFailedEvaluatorEventHandlerOnLocalRuntime()
{
string testFolder = DefaultRuntimeFolder + Guid.NewGuid().ToString("N").Substring(0, 4);
- CleanUp(testFolder);
TestRun(DriverConfigurations(), typeof(FailedEvaluatorDriver), 1, "failedEvaluatorTest", "local", testFolder);
ValidateSuccessForLocalRuntime(0, numberOfEvaluatorsToFail: 1, testFolder: testFolder);
ValidateMessageSuccessfullyLoggedForDriver(FailedEvaluatorMessage, testFolder);
@@ -64,17 +64,13 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge
public IConfiguration DriverConfigurations()
{
- var driverConfig = DriverConfiguration.ConfigurationModule
+ return DriverConfiguration.ConfigurationModule
.Set(DriverConfiguration.OnDriverStarted, GenericType<FailedEvaluatorDriver>.Class)
.Set(DriverConfiguration.OnEvaluatorAllocated, GenericType<FailedEvaluatorDriver>.Class)
.Set(DriverConfiguration.OnEvaluatorCompleted, GenericType<FailedEvaluatorDriver>.Class)
.Set(DriverConfiguration.OnEvaluatorFailed, GenericType<FailedEvaluatorDriver>.Class)
.Set(DriverConfiguration.OnTaskRunning, GenericType<FailedEvaluatorDriver>.Class)
.Build();
-
- return TangFactory.GetTang().NewConfigurationBuilder(driverConfig)
- .BindSetEntry<DriverBridgeConfigurationOptions.SetOfAssemblies, string>(typeof(FailEvaluatorTask).Assembly.GetName().Name)
- .Build();
}
private sealed class FailedEvaluatorDriver : IObserver<IDriverStarted>, IObserver<IAllocatedEvaluator>,
@@ -121,6 +117,7 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge
Assert.Equal(value.FailedTask.Value.Id, TaskId);
Assert.Equal(value.FailedContexts.Count, 1);
Assert.Equal(value.EvaluatorException.EvaluatorId, value.Id);
+ Logger.Log(Level.Error, string.Format(CultureInfo.CurrentCulture, "Failed task id:{0}, failed Evaluator id: {1}, Failed Exception msg: {2},", value.FailedTask.Value.Id, value.EvaluatorException.EvaluatorId, value.EvaluatorException.Message));
Logger.Log(Level.Error, RightFailedTaskMessage);
}
http://git-wip-us.apache.org/repos/asf/reef/blob/73bfc0a6/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedEvaluatorBridge.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedEvaluatorBridge.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedEvaluatorBridge.java
index ec84c88..0ddb201 100644
--- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedEvaluatorBridge.java
+++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedEvaluatorBridge.java
@@ -62,7 +62,7 @@ public final class FailedEvaluatorBridge extends NativeBridge implements Identif
public String getCause() {
if (jfailedEvaluator.getEvaluatorException() != null) {
- return jfailedEvaluator.getEvaluatorException().getCause().getLocalizedMessage();
+ return jfailedEvaluator.getEvaluatorException().getLocalizedMessage();
}
return null;