giraph-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject git commit: updated refs/heads/trunk to bad44d4
Date Mon, 01 Dec 2014 20:53:57 GMT
Repository: giraph
Updated Branches:
  refs/heads/trunk 0afeb6360 -> bad44d472


Fix findbugs from GIRAPH-966 commit


Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/bad44d47
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/bad44d47
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/bad44d47

Branch: refs/heads/trunk
Commit: bad44d4723e42dd74e0052378d32faa463842d2e
Parents: 0afeb63
Author: Maja Kabiljo <majakabiljo@fb.com>
Authored: Mon Dec 1 12:01:10 2014 -0800
Committer: Maja Kabiljo <majakabiljo@fb.com>
Committed: Mon Dec 1 12:53:30 2014 -0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/giraph/graph/GraphMapper.java     | 6 ++----
 .../main/java/org/apache/giraph/graph/GraphTaskManager.java    | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/bad44d47/giraph-core/src/main/java/org/apache/giraph/graph/GraphMapper.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/graph/GraphMapper.java b/giraph-core/src/main/java/org/apache/giraph/graph/GraphMapper.java
index 6f748c5..864ae9a 100644
--- a/giraph-core/src/main/java/org/apache/giraph/graph/GraphMapper.java
+++ b/giraph-core/src/main/java/org/apache/giraph/graph/GraphMapper.java
@@ -52,14 +52,12 @@ public class GraphMapper<I extends WritableComparable, V extends Writable,
     // Execute all Giraph-related role(s) assigned to this compute node.
     // Roles can include "master," "worker," "zookeeper," or . . . ?
     graphTaskManager = new GraphTaskManager<I, V, E>(context);
+    graphTaskManager.setup(
+      DistributedCache.getLocalCacheArchives(context.getConfiguration()));
 
     // Setting the default handler for uncaught exceptions.
     Thread.setDefaultUncaughtExceptionHandler(
         graphTaskManager.createUncaughtExceptionHandler());
-
-
-    graphTaskManager.setup(
-      DistributedCache.getLocalCacheArchives(context.getConfiguration()));
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/giraph/blob/bad44d47/giraph-core/src/main/java/org/apache/giraph/graph/GraphTaskManager.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/graph/GraphTaskManager.java b/giraph-core/src/main/java/org/apache/giraph/graph/GraphTaskManager.java
index c76dd9e..7d19014 100644
--- a/giraph-core/src/main/java/org/apache/giraph/graph/GraphTaskManager.java
+++ b/giraph-core/src/main/java/org/apache/giraph/graph/GraphTaskManager.java
@@ -100,7 +100,7 @@ public class GraphTaskManager<I extends WritableComparable, V extends
Writable,
   public static final ClassConfOption<CheckerIfWorkerShouldFailAfterException>
   CHECKER_IF_WORKER_SHOULD_FAIL_AFTER_EXCEPTION_CLASS = ClassConfOption.create(
       "giraph.checkerIfWorkerShouldFailAfterExceptionClass",
-      FailWithEveryException.class,
+      FailWithEveryExceptionOccurred.class,
       CheckerIfWorkerShouldFailAfterException.class,
       "Class which checks if an exception on some thread should cause worker " +
           "to fail, by default all exceptions cause failure");
@@ -1052,7 +1052,7 @@ public class GraphTaskManager<I extends WritableComparable, V extends
Writable,
   /**
    * Class to use by default, where each exception causes job failure
    */
-  public static class FailWithEveryException
+  public static class FailWithEveryExceptionOccurred
       implements CheckerIfWorkerShouldFailAfterException {
     @Override
     public boolean checkIfWorkerShouldFail(Thread thread, Throwable exception) {


Mime
View raw message