Repository: giraph Updated Branches: refs/heads/trunk dc2cd63d0 -> 6140c873a
GIRAPH-865: Job client shouldn't crash when JobProgressTracker gets exception (majakabiljo) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/6140c873 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/6140c873 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/6140c873 Branch: refs/heads/trunk Commit: 6140c873a6b4938550a99f58b12bde4de8a6678e Parents: dc2cd63 Author: Maja Kabiljo <[email protected]> Authored: Wed Feb 26 11:58:38 2014 -0800 Committer: Maja Kabiljo <[email protected]> Committed: Wed Feb 26 11:59:30 2014 -0800 ---------------------------------------------------------------------- CHANGELOG | 3 +++ .../src/main/java/org/apache/giraph/job/JobProgressTracker.java | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/6140c873/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 8707dd4..74ab305 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-865: Job client shouldn't crash when JobProgressTracker gets + exception (majakabiljo) + GIRAPH-856: Log amount of free memory on the command line (majakabiljo) GIRAPH-860: Giraph jobs can hang forever if HDFS filestamps aren't http://git-wip-us.apache.org/repos/asf/giraph/blob/6140c873/giraph-core/src/main/java/org/apache/giraph/job/JobProgressTracker.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/job/JobProgressTracker.java b/giraph-core/src/main/java/org/apache/giraph/job/JobProgressTracker.java index a364dc4..b8d3769 100644 --- a/giraph-core/src/main/java/org/apache/giraph/job/JobProgressTracker.java +++ b/giraph-core/src/main/java/org/apache/giraph/job/JobProgressTracker.java @@ -29,7 +29,6 @@ import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.util.Progressable; import org.apache.log4j.Logger; import org.apache.zookeeper.CreateMode; -import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; import org.apache.zookeeper.ZooDefs; @@ -111,7 +110,7 @@ public class JobProgressTracker implements Watcher { } Thread.sleep(UPDATE_MILLISECONDS); } - } catch (InterruptedException | KeeperException e) { + } catch (Exception e) { if (LOG.isInfoEnabled()) { LOG.info("run: Exception occurred", e); } @@ -126,7 +125,7 @@ public class JobProgressTracker implements Watcher { CreateMode.PERSISTENT, true); zk.close(); - } catch (InterruptedException | KeeperException e) { + } catch (Exception e) { if (LOG.isInfoEnabled()) { LOG.info("run: Exception occurred", e); }
