Updated Branches: refs/heads/trunk 6c05902ba -> ff970f2db
GIRAPH-653: Hadoop_non_secure broken (majakabiljo) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/ff970f2d Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/ff970f2d Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/ff970f2d Branch: refs/heads/trunk Commit: ff970f2db73018f6f48b5361ffd9e21c5154aba9 Parents: 6c05902 Author: Maja Kabiljo <[email protected]> Authored: Fri May 3 10:20:55 2013 -0700 Committer: Maja Kabiljo <[email protected]> Committed: Fri May 3 10:20:55 2013 -0700 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../io/internal/WrappedVertexOutputFormat.java | 15 ++++++++------- .../org/apache/giraph/yarn/GiraphYarnTask.java | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/ff970f2d/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 765c234..7c906d2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 1.0.1 - unreleased + GIRAPH-653: Hadoop_non_secure broken (majakabiljo) + GIRAPH-650: Exception in GiraphConfiguration initialization (majakabiljo) GIRAPH-648: Allow IO formats to add parameters to Configuration (majakabiljo) http://git-wip-us.apache.org/repos/asf/giraph/blob/ff970f2d/giraph-core/src/main/java/org/apache/giraph/io/internal/WrappedVertexOutputFormat.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/io/internal/WrappedVertexOutputFormat.java b/giraph-core/src/main/java/org/apache/giraph/io/internal/WrappedVertexOutputFormat.java index c1046ae..e5b9ef7 100644 --- a/giraph-core/src/main/java/org/apache/giraph/io/internal/WrappedVertexOutputFormat.java +++ b/giraph-core/src/main/java/org/apache/giraph/io/internal/WrappedVertexOutputFormat.java @@ -25,7 +25,9 @@ import org.apache.giraph.io.VertexWriter; import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableComparable; import org.apache.hadoop.mapreduce.JobContext; +/*if_not[HADOOP_NON_SECURE]*/ import org.apache.hadoop.mapreduce.JobStatus; +/*end[HADOOP_NON_SECURE]*/ import org.apache.hadoop.mapreduce.OutputCommitter; import org.apache.hadoop.mapreduce.TaskAttemptContext; @@ -141,17 +143,16 @@ public class WrappedVertexOutputFormat<I extends WritableComparable, } @Override - public void commitJob(JobContext context) throws IOException { + public void cleanupJob(JobContext context) throws IOException { getConf().updateConfiguration(context.getConfiguration()); - outputCommitter.commitJob(context); - + outputCommitter.cleanupJob(context); } + /*if_not[HADOOP_NON_SECURE]*/ @Override - public void cleanupJob(JobContext context) throws IOException { + public void commitJob(JobContext context) throws IOException { getConf().updateConfiguration(context.getConfiguration()); - outputCommitter.cleanupJob(context); - + outputCommitter.commitJob(context); } @Override @@ -159,8 +160,8 @@ public class WrappedVertexOutputFormat<I extends WritableComparable, JobStatus.State state) throws IOException { getConf().updateConfiguration(context.getConfiguration()); outputCommitter.abortJob(context, state); - } + /*end[HADOOP_NON_SECURE]*/ }; } } http://git-wip-us.apache.org/repos/asf/giraph/blob/ff970f2d/giraph-core/src/main/java/org/apache/giraph/yarn/GiraphYarnTask.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/yarn/GiraphYarnTask.java b/giraph-core/src/main/java/org/apache/giraph/yarn/GiraphYarnTask.java index d596413..6f869fe 100644 --- a/giraph-core/src/main/java/org/apache/giraph/yarn/GiraphYarnTask.java +++ b/giraph-core/src/main/java/org/apache/giraph/yarn/GiraphYarnTask.java @@ -121,7 +121,7 @@ public class GiraphYarnTask<I extends WritableComparable, V extends Writable, try { LOG.info("Master is ready to commit final job output data."); VertexOutputFormat vertexOutputFormat = - conf.createVertexOutputFormat(); + conf.createWrappedVertexOutputFormat(); OutputCommitter outputCommitter = vertexOutputFormat.getOutputCommitter(proxy); // now we will have our output in OUTDIR if all went well...
