Repository: samza-hello-samza Updated Branches: refs/heads/master 6fd384ed1 -> 088a4625d
SAMZA-631: upgrade to Samza 0.9.0 version Project: http://git-wip-us.apache.org/repos/asf/samza-hello-samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza-hello-samza/commit/088a4625 Tree: http://git-wip-us.apache.org/repos/asf/samza-hello-samza/tree/088a4625 Diff: http://git-wip-us.apache.org/repos/asf/samza-hello-samza/diff/088a4625 Branch: refs/heads/master Commit: 088a4625ded3116fa8fa8ce562bc6c87d867692b Parents: 6fd384e Author: Yan Fang <[email protected]> Authored: Wed Apr 1 16:19:23 2015 -0700 Committer: Yan Fang <[email protected]> Committed: Wed Apr 1 16:19:23 2015 -0700 ---------------------------------------------------------------------- bin/grid | 4 ++-- pom.xml | 11 +++-------- src/main/assembly/src.xml | 1 - src/main/config/wikipedia-feed.properties | 5 +---- src/main/config/wikipedia-parser.properties | 6 +----- src/main/config/wikipedia-stats.properties | 8 ++++---- 6 files changed, 11 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/samza-hello-samza/blob/088a4625/bin/grid ---------------------------------------------------------------------- diff --git a/bin/grid b/bin/grid index 25b2ec4..3d0e66e 100755 --- a/bin/grid +++ b/bin/grid @@ -35,7 +35,7 @@ DOWNLOAD_CACHE_DIR=$HOME/.samza/download COMMAND=$1 SYSTEM=$2 -DOWNLOAD_KAFKA=http://www.us.apache.org/dist/kafka/0.8.1.1/kafka_2.10-0.8.1.1.tgz +DOWNLOAD_KAFKA=http://www.us.apache.org/dist/kafka/0.8.2.1/kafka_2.10-0.8.2.1.tgz DOWNLOAD_YARN=https://archive.apache.org/dist/hadoop/common/hadoop-2.4.0/hadoop-2.4.0.tar.gz DOWNLOAD_ZOOKEEPER=http://archive.apache.org/dist/zookeeper/zookeeper-3.4.3/zookeeper-3.4.3.tar.gz @@ -73,7 +73,7 @@ install_yarn() { install_kafka() { mkdir -p "$DEPLOY_ROOT_DIR" - install kafka $DOWNLOAD_KAFKA kafka_2.10-0.8.1.1 + install kafka $DOWNLOAD_KAFKA kafka_2.10-0.8.2.1 # have to use SIGTERM since nohup on appears to ignore SIGINT # and Kafka switched to SIGINT in KAFKA-1031. sed -i.bak 's/SIGINT/SIGTERM/g' $DEPLOY_ROOT_DIR/kafka/bin/kafka-server-stop.sh http://git-wip-us.apache.org/repos/asf/samza-hello-samza/blob/088a4625/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index af93442..b4ea561 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ under the License. <groupId>org.apache.samza</groupId> <artifactId>hello-samza</artifactId> - <version>0.8.0</version> + <version>0.9.0</version> <packaging>jar</packaging> <name>Samza Example</name> <description> @@ -53,11 +53,6 @@ under the License. </dependency> <dependency> <groupId>org.apache.samza</groupId> - <artifactId>samza-serializers_2.10</artifactId> - <version>${samza.version}</version> - </dependency> - <dependency> - <groupId>org.apache.samza</groupId> <artifactId>samza-shell</artifactId> <classifier>dist</classifier> <type>tgz</type> @@ -86,7 +81,7 @@ under the License. <dependency> <groupId>org.apache.kafka</groupId> <artifactId>kafka_2.10</artifactId> - <version>0.8.1</version> + <version>0.8.2.1</version> </dependency> <dependency> <groupId>org.schwering</groupId> @@ -118,7 +113,7 @@ under the License. <properties> <!-- maven specific properties --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <samza.version>0.8.0</samza.version> + <samza.version>0.9.0</samza.version> </properties> <developers> http://git-wip-us.apache.org/repos/asf/samza-hello-samza/blob/088a4625/src/main/assembly/src.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml index 8a8556d..f57fee2 100644 --- a/src/main/assembly/src.xml +++ b/src/main/assembly/src.xml @@ -66,7 +66,6 @@ <includes> <include>org.apache.samza:samza-core_2.10</include> <include>org.apache.samza:samza-kafka_2.10</include> - <include>org.apache.samza:samza-serializers_2.10</include> <include>org.apache.samza:samza-yarn_2.10</include> <include>org.apache.samza:samza-kv-rocksdb_2.10</include> <include>org.apache.samza:samza-log4j</include> http://git-wip-us.apache.org/repos/asf/samza-hello-samza/blob/088a4625/src/main/config/wikipedia-feed.properties ---------------------------------------------------------------------- diff --git a/src/main/config/wikipedia-feed.properties b/src/main/config/wikipedia-feed.properties index c498c16..ce97357 100644 --- a/src/main/config/wikipedia-feed.properties +++ b/src/main/config/wikipedia-feed.properties @@ -38,7 +38,4 @@ systems.wikipedia.port=6667 systems.kafka.samza.factory=org.apache.samza.system.kafka.KafkaSystemFactory systems.kafka.samza.msg.serde=json systems.kafka.consumer.zookeeper.connect=localhost:2181/ -systems.kafka.producer.metadata.broker.list=localhost:9092 -systems.kafka.producer.producer.type=sync -# Normally, we'd set this much higher, but we want things to look snappy in the demo. -systems.kafka.producer.batch.num.messages=1 +systems.kafka.producer.bootstrap.servers=localhost:9092 http://git-wip-us.apache.org/repos/asf/samza-hello-samza/blob/088a4625/src/main/config/wikipedia-parser.properties ---------------------------------------------------------------------- diff --git a/src/main/config/wikipedia-parser.properties b/src/main/config/wikipedia-parser.properties index 38575b6..e2742a5 100644 --- a/src/main/config/wikipedia-parser.properties +++ b/src/main/config/wikipedia-parser.properties @@ -45,8 +45,4 @@ systems.kafka.samza.factory=org.apache.samza.system.kafka.KafkaSystemFactory systems.kafka.samza.msg.serde=json systems.kafka.consumer.zookeeper.connect=localhost:2181/ systems.kafka.consumer.auto.offset.reset=largest -systems.kafka.producer.metadata.broker.list=localhost:9092 -systems.kafka.producer.producer.type=sync -# Normally, we'd set this much higher, but we want things to look snappy in the demo. -systems.kafka.producer.batch.num.messages=1 -systems.kafka.streams.metrics.samza.msg.serde=metrics +systems.kafka.producer.bootstrap.servers=localhost:9092 http://git-wip-us.apache.org/repos/asf/samza-hello-samza/blob/088a4625/src/main/config/wikipedia-stats.properties ---------------------------------------------------------------------- diff --git a/src/main/config/wikipedia-stats.properties b/src/main/config/wikipedia-stats.properties index 69eff90..1ff3552 100644 --- a/src/main/config/wikipedia-stats.properties +++ b/src/main/config/wikipedia-stats.properties @@ -41,10 +41,7 @@ systems.kafka.samza.factory=org.apache.samza.system.kafka.KafkaSystemFactory systems.kafka.samza.msg.serde=json systems.kafka.consumer.zookeeper.connect=localhost:2181/ systems.kafka.consumer.auto.offset.reset=largest -systems.kafka.producer.metadata.broker.list=localhost:9092 -systems.kafka.producer.producer.type=sync -# Normally, we'd set this much higher, but we want things to look snappy in the demo. -systems.kafka.producer.batch.num.messages=1 +systems.kafka.producer.bootstrap.servers=localhost:9092 # Key-value storage stores.wikipedia-stats.factory=org.apache.samza.storage.kv.RocksDbKeyValueStorageEngineFactory @@ -52,6 +49,9 @@ stores.wikipedia-stats.changelog=kafka.wikipedia-stats-changelog stores.wikipedia-stats.key.serde=string stores.wikipedia-stats.msg.serde=integer +# Normally, we'd leave this alone, but we have only one broker. +stores.wikipedia-stats.changelog.replication.factor=1 + # Normally, we'd set this much higher, but we want things to look snappy in the demo. stores.wikipedia-stats.write.batch.size=0 stores.wikipedia-stats.object.cache.size=0
