Repository: giraph Updated Branches: refs/heads/trunk 39237cf7f -> acd716fd2
GIRAPH-963 Aggregators may not be initialized properly Summary: Aggregators may fail with IllegalArgumentException upon deserialization Test Plan: Run same job Reviewers: majakabiljo, pavanka, pavanka.26, maja.kabiljo Reviewed By: maja.kabiljo Differential Revision: https://reviews.facebook.net/D28227 Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/acd716fd Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/acd716fd Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/acd716fd Branch: refs/heads/trunk Commit: acd716fd2ff9e04c47a531fc194003fc2d5a9dc1 Parents: 39237cf Author: Sergey Edunov <[email protected]> Authored: Tue Nov 4 21:47:44 2014 -0800 Committer: Maja Kabiljo <[email protected]> Committed: Tue Nov 4 21:48:26 2014 -0800 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../apache/giraph/master/AggregatorToGlobalCommTranslation.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/acd716fd/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index cdfd666..af7c733 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-963: Aggregators may not be initialized properly (edunov via majakabiljo) + GIRAPH-955: Allow vertex/edge/message value to be configurable (ikabiljo via majakabiljo) GIRAPH-938: Allow fast working with primitives generically (ikabiljo via pavanka) http://git-wip-us.apache.org/repos/asf/giraph/blob/acd716fd/giraph-core/src/main/java/org/apache/giraph/master/AggregatorToGlobalCommTranslation.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/master/AggregatorToGlobalCommTranslation.java b/giraph-core/src/main/java/org/apache/giraph/master/AggregatorToGlobalCommTranslation.java index c13d7bd..eb25182 100644 --- a/giraph-core/src/main/java/org/apache/giraph/master/AggregatorToGlobalCommTranslation.java +++ b/giraph-core/src/main/java/org/apache/giraph/master/AggregatorToGlobalCommTranslation.java @@ -27,6 +27,7 @@ import org.apache.giraph.aggregators.Aggregator; import org.apache.giraph.comm.aggregators.AggregatorUtils; import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration; import org.apache.giraph.utils.MasterLoggingAggregator; +import org.apache.giraph.utils.WritableUtils; import org.apache.hadoop.io.Writable; import org.apache.log4j.Logger; @@ -284,7 +285,8 @@ public class AggregatorToGlobalCommTranslation @Override public void readFields(DataInput in) throws IOException { persistent = in.readBoolean(); - reduceOp = new AggregatorReduceOperation<>(); + reduceOp = WritableUtils.createWritable( + AggregatorReduceOperation.class, conf); reduceOp.readFields(in); currentValue = null; }
