Updated Branches: refs/heads/trunk 0f5d337d4 -> 185b9ffc8
Fixing GIRAPH-612 to pass 'mvn clean verify' without findbugs problem. Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/185b9ffc Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/185b9ffc Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/185b9ffc Branch: refs/heads/trunk Commit: 185b9ffc8621f4b47944d6c93b94fbdbb7c5af2e Parents: 0f5d337 Author: Avery Ching <[email protected]> Authored: Tue Apr 9 21:51:07 2013 -0700 Committer: Avery Ching <[email protected]> Committed: Tue Apr 9 21:51:07 2013 -0700 ---------------------------------------------------------------------- .../apache/giraph/utils/ConfigurationUtils.java | 16 +++++++++----- 1 files changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/185b9ffc/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 12aee6a..de7ea97 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 @@ -328,15 +328,18 @@ public final class ConfigurationUtils { giraphConfiguration.setYarnTaskHeapMb( Integer.parseInt(cmd.getOptionValue("yh"))); } + /*if[PURE_YARN] if (cmd.hasOption("of")) { if (cmd.hasOption("op")) { - Path outputDir = new Path(BASE_OUTPUT_PATH, cmd.getOptionValue("op")); - outputDir = // for YARN conf to get the out dir we need w/o a Job obj + // For YARN conf to get the out dir we need w/o a Job obj + Path outputDir = + new Path(BASE_OUTPUT_PATH, cmd.getOptionValue("op")); + outputDir = outputDir.getFileSystem(giraphConfiguration).makeQualified(outputDir); - /*if[PURE_YARN] - giraphConfiguration.set(org.apache.hadoop.mapreduce.lib.output. - FileOutputFormat.OUTDIR, outputDir.toString()); - end[PURE_YARN]*/ + giraphConfiguration.set( + org.apache.hadoop.mapreduce.lib.output.FileOutputFormat.OUTDIR, + outputDir.toString()); + } else { if (LOG.isInfoEnabled()) { LOG.info("No output path specified. Ensure your OutputFormat " + @@ -344,6 +347,7 @@ public final class ConfigurationUtils { } } } + end[PURE_YARN]*/ // END YARN-ONLY OPTIONS }
