SAMOA-58: cherry-picked from faf branch - changes needed to be able to read from HDFS on a YARN 2.7.1 cluster
Project: http://git-wip-us.apache.org/repos/asf/incubator-samoa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-samoa/commit/2c60852a Tree: http://git-wip-us.apache.org/repos/asf/incubator-samoa/tree/2c60852a Diff: http://git-wip-us.apache.org/repos/asf/incubator-samoa/diff/2c60852a Branch: refs/heads/master Commit: 2c60852a9a7559788c46c56d8680058e344fb763 Parents: 127eaab Author: Edi Bice <[email protected]> Authored: Mon Feb 22 14:25:43 2016 +0000 Committer: Gianmarco De Francisci Morales <[email protected]> Committed: Tue Apr 19 11:33:42 2016 +0300 ---------------------------------------------------------------------- bin/samoa | 9 ++++++--- pom.xml | 10 +++++----- 2 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/2c60852a/bin/samoa ---------------------------------------------------------------------- diff --git a/bin/samoa b/bin/samoa index 1a26caa..5f41ce6 100755 --- a/bin/samoa +++ b/bin/samoa @@ -47,7 +47,7 @@ JAR_PATH=$2 JAR_FILE=$(basename $JAR_PATH) JAR_DIR=$(dirname $JAR_PATH) OPTIONS=$3 - +#JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005" if [ $PLATFORM = 'S4' ]; then @@ -274,8 +274,11 @@ elif [ $PLATFORM = 'SAMZA' ]; then done DEPLOYABLE=$JAR_PATH - java -Dsamza.log.dir=$BASE_DIR/logs -Dsamza.container.name=client -cp $DEPLOYABLE org.apache.samoa.SamzaDoTask $COMPLETE_ARG --mode=$MODE_ARG \ - --yarn_home=$YARN_HOME/conf --zookeeper=$ZOOKEEPER_HOST:$ZOOKEEPER_PORT --kafka=$KAFKA_BROKER_LIST \ + #HADOOP_CLASSPATH=`hadoop classpath` + YARN_CLASSPATH=`yarn classpath` + java -Dsamza.log.dir=$BASE_DIR/logs -Dsamza.container.name=client \ + -cp $YARN_CLASSPATH:$DEPLOYABLE org.apache.samoa.SamzaDoTask $COMPLETE_ARG \ + --mode=$MODE_ARG --yarn_home=$YARN_HOME/conf --zookeeper=$ZOOKEEPER_HOST:$ZOOKEEPER_PORT --kafka=$KAFKA_BROKER_LIST \ --jar_package=$JAR_PATH --yarn_am_mem=$YARN_AM_MEMORY --yarn_container_mem=$YARN_CONTAINER_MEMORY \ --kafka_replication_factor=$KAFKA_REPLICATION_FACTOR --checkpoint_frequency=$CHECKPOINT_FREQUENCY \ --kryo_register=$BASE_DIR/$KRYO_REGISTER_FILE --pi_per_container=$PI_PER_CONTAINER \ http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/2c60852a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3304937..e02a1d6 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ <commons-lang3.version>3.1</commons-lang3.version> <guava.version>17.0</guava.version> - <hadoop.version>2.2.0</hadoop.version> + <hadoop.version>2.6.0</hadoop.version> <javacliparser.version>0.5.0</javacliparser.version> <jcip-annotations.version>1.0</jcip-annotations.version> <jmockit.version>1.13</jmockit.version> @@ -125,7 +125,7 @@ <kryo.version>2.21</kryo.version> <metrics-core.version>2.2.0</metrics-core.version> <miniball.version>1.0.3</miniball.version> - <samza.version>0.7.0</samza.version> + <samza.version>0.10</samza.version> <flink.version>0.10.1</flink.version> <slf4j-log4j12.version>1.7.2</slf4j-log4j12.version> <slf4j-simple.version>1.7.5</slf4j-simple.version> @@ -156,10 +156,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> + <version>3.5</version> <configuration> - <source>1.7</source> - <target>1.7</target> + <source>1.8</source> + <target>1.8</target> </configuration> </plugin> <plugin>
