GIRAPH-945: Always use job Configuration to create Configuration (majakabiljo)
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/f6845a37 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/f6845a37 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/f6845a37 Branch: refs/heads/release-1.1 Commit: f6845a374e39b91cb8d9292125a52048d71530a3 Parents: 4485e56 Author: Maja Kabiljo <[email protected]> Authored: Wed Sep 3 11:49:15 2014 -0700 Committer: Maja Kabiljo <[email protected]> Committed: Wed Sep 3 11:49:15 2014 -0700 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../src/main/java/org/apache/giraph/job/GiraphJob.java | 7 +++++-- .../main/java/org/apache/giraph/utils/ConfigurationUtils.java | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/f6845a37/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index d5b284e..34db15c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-945: Always use job Configuration to create Configuration (majakabiljo) + GIRAPH-931: Provide a Strongly Connected Components algorithm (gianluca via majakabiljo) GIRAPH-933: Checkpointing improvements (edunov via majakabiljo) http://git-wip-us.apache.org/repos/asf/giraph/blob/f6845a37/giraph-core/src/main/java/org/apache/giraph/job/GiraphJob.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/job/GiraphJob.java b/giraph-core/src/main/java/org/apache/giraph/job/GiraphJob.java index 93aa679..491d3d2 100644 --- a/giraph-core/src/main/java/org/apache/giraph/job/GiraphJob.java +++ b/giraph-core/src/main/java/org/apache/giraph/job/GiraphJob.java @@ -64,9 +64,12 @@ public class GiraphJob { /** * Constructor * + * @param conf Configuration * @throws IOException */ - DelegatedJob() throws IOException { } + DelegatedJob(Configuration conf) throws IOException { + super(conf); + } @Override public Configuration getConfiguration() { @@ -111,7 +114,7 @@ public class GiraphJob { String jobName) throws IOException { this.jobName = jobName; this.giraphConfiguration = giraphConfiguration; - this.delegatedJob = new DelegatedJob(); + this.delegatedJob = new DelegatedJob(giraphConfiguration); } public String getJobName() { http://git-wip-us.apache.org/repos/asf/giraph/blob/f6845a37/giraph-core/src/main/java/org/apache/giraph/utils/ConfigurationUtils.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/utils/ConfigurationUtils.java b/giraph-core/src/main/java/org/apache/giraph/utils/ConfigurationUtils.java index 917f881..5e046cc 100644 --- a/giraph-core/src/main/java/org/apache/giraph/utils/ConfigurationUtils.java +++ b/giraph-core/src/main/java/org/apache/giraph/utils/ConfigurationUtils.java @@ -70,7 +70,8 @@ public final class ConfigurationUtils { /** Class logger */ private static final Logger LOG = Logger.getLogger(ConfigurationUtils.class); - /** The base path for output dirs as saved in GiraphConfiguration */ + /*if[PURE_YARN] + // The base path for output dirs as saved in GiraphConfiguration private static final Path BASE_OUTPUT_PATH; static { // whether local or remote, if there's no *-site.xml's to find, we're done @@ -80,6 +81,7 @@ public final class ConfigurationUtils { throw new IllegalStateException("Error locating default base path!", ioe); } } + end[PURE_YARN]*/ /** Maintains our accepted options in case the caller wants to add some */ private static Options OPTIONS;
