You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ni...@apache.org on 2013/02/26 19:55:28 UTC

git commit: GIRAPH-541: Log before observers (nitay)

Updated Branches:
  refs/heads/trunk c33ea10c4 -> 549789aaf


GIRAPH-541: Log before observers (nitay)


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

Branch: refs/heads/trunk
Commit: 549789aafbf39d47af371c00375cd5e5ecea232a
Parents: c33ea10
Author: Nitay Joffe <ni...@apache.org>
Authored: Tue Feb 26 13:44:10 2013 -0500
Committer: Nitay Joffe <ni...@apache.org>
Committed: Tue Feb 26 13:55:25 2013 -0500

----------------------------------------------------------------------
 CHANGELOG                                          |    2 ++
 .../org/apache/giraph/master/MasterThread.java     |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/549789aa/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index d1a3d1e..54f9207 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 Giraph Change Log
 
 Release 0.2.0 - unreleased
+  GIRAPH-541: Log before observers (nitay)
+
   GIRAPH-535: Range-partitioning and edge locality benchmark (apresta)
 
   GIRAPH-539: When having open requests log which workers are they sent to (majakabiljo)

http://git-wip-us.apache.org/repos/asf/giraph/blob/549789aa/giraph-core/src/main/java/org/apache/giraph/master/MasterThread.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/master/MasterThread.java b/giraph-core/src/main/java/org/apache/giraph/master/MasterThread.java
index ee749e1..40c6b74 100644
--- a/giraph-core/src/main/java/org/apache/giraph/master/MasterThread.java
+++ b/giraph-core/src/main/java/org/apache/giraph/master/MasterThread.java
@@ -176,9 +176,9 @@ public class MasterThread<I extends WritableComparable, V extends Writable,
       // CHECKSTYLE: stop IllegalCatchCheck
     } catch (Exception e) {
       // CHECKSTYLE: resume IllegalCatchCheck
-      bspServiceMaster.failureCleanup(e);
       LOG.error("masterThread: Master algorithm failed with " +
           e.getClass().getSimpleName(), e);
+      bspServiceMaster.failureCleanup(e);
       throw new IllegalStateException(e);
     }
   }