You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by er...@apache.org on 2013/06/26 17:45:26 UTC
git commit: updated refs/heads/trunk to 94acaaa
Updated Branches:
refs/heads/trunk 8fbade6a7 -> 94acaaa54
GIRAPH-688: Make sure Giraph builds against all compatible YARN-enabled Hadoop versions, warns if none set, works w/new 1.1.0 line (ereisman)
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/94acaaa5
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/94acaaa5
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/94acaaa5
Branch: refs/heads/trunk
Commit: 94acaaa54d2f981a365e88e414d76449014bfe19
Parents: 8fbade6
Author: Eli Reisman <er...@apache.org>
Authored: Wed Jun 26 08:05:36 2013 -0700
Committer: Eli Reisman <er...@apache.org>
Committed: Wed Jun 26 08:05:36 2013 -0700
----------------------------------------------------------------------
CHANGELOG | 3 +++
.../main/java/org/apache/giraph/yarn/GiraphYarnTask.java | 11 +++++------
pom.xml | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/giraph/blob/94acaaa5/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 9166e2b..7d37d52 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
Giraph Change Log
Release 1.1.0 - unreleased
+ GIRAPH-688: Make sure Giraph builds against all compatible YARN-enabled Hadoop versions,
+ warns if none set, works w/new 1.1.0 line (ereisman)
+
GIRAPH-693: Giraph-Hive check user code as soon as possible (nitay)
GIRAPH-697: Clean up message stores (majakabiljo)
http://git-wip-us.apache.org/repos/asf/giraph/blob/94acaaa5/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 6f869fe..f4719cc 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
@@ -48,17 +48,16 @@ import java.io.IOException;
* @param <I> Vertex id
* @param <V> Vertex data
* @param <E> Edge data
- * @param <M> Message data
*/
public class GiraphYarnTask<I extends WritableComparable, V extends Writable,
- E extends Writable, M extends Writable> {
+ E extends Writable> {
static {
Configuration.addDefaultResource(GiraphConstants.GIRAPH_YARN_CONF_FILE);
}
/** Class logger */
private static final Logger LOG = Logger.getLogger(GiraphYarnTask.class);
/** Manage the framework-agnostic Giraph task for this job run */
- private GraphTaskManager<I, V, E, M> graphTaskManager;
+ private GraphTaskManager<I, V, E> graphTaskManager;
/** Giraph task ID number must start @ index 0. Used by ZK, BSP, etc. */
private final int bspTaskId;
/** A special "dummy" override of Mapper#Context, used to deliver MRv1 deps */
@@ -74,12 +73,12 @@ public class GiraphYarnTask<I extends WritableComparable, V extends Writable,
* supplied by GiraphApplicationMaster.
*/
public GiraphYarnTask(final TaskAttemptID taskAttemptId) {
- conf = new ImmutableClassesGiraphConfiguration<I, V, E, M>(
+ conf = new ImmutableClassesGiraphConfiguration<I, V, E>(
new GiraphConfiguration());
bspTaskId = taskAttemptId.getTaskID().getId();
conf.setInt("mapred.task.partition", bspTaskId);
proxy = buildProxyMapperContext(taskAttemptId);
- graphTaskManager = new GraphTaskManager<I, V, E, M>(proxy);
+ graphTaskManager = new GraphTaskManager<I, V, E>(proxy);
}
/**
@@ -192,7 +191,7 @@ public class GiraphYarnTask<I extends WritableComparable, V extends Writable,
"a TaskAttemptID for the Giraph job from args: " + printArgs(args));
}
try {
- GiraphYarnTask<?, ?, ?, ?> giraphYarnTask =
+ GiraphYarnTask<?, ?, ?> giraphYarnTask =
new GiraphYarnTask(getTaskAttemptID(args));
giraphYarnTask.run();
// CHECKSTYLE: stop IllegalCatch
http://git-wip-us.apache.org/repos/asf/giraph/blob/94acaaa5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 82e9bdf..7a9bdaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -798,7 +798,7 @@ under the License.
<profile>
<id>hadoop_yarn</id>
<properties>
- <hadoop.version>2.0.3-alpha</hadoop.version>
+ <hadoop.version>SET_HADOOP_VERSION_USING_MVN_DASH_D_OPTION</hadoop.version>
<munge.symbols>PURE_YARN</munge.symbols>
</properties>
<dependencies>