SAMZA-781: Upgrade minimum YARN version to 2.6.1
Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/f7c870f8 Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/f7c870f8 Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/f7c870f8 Branch: refs/heads/samza-sql Commit: f7c870f8241eb105a9c12469a78241e866f97bdf Parents: 4822050 Author: Aleksandar Pejakovic <[email protected]> Authored: Tue Nov 24 19:30:02 2015 -0800 Committer: Yi Pan (Data Infrastructure) <[email protected]> Committed: Tue Nov 24 19:30:02 2015 -0800 ---------------------------------------------------------------------- README.md | 2 +- bin/check-all.sh | 2 +- .../versioned/run-in-multi-node-yarn.md | 8 ++--- gradle/dependency-versions.gradle | 2 +- .../src/main/python/configs/downloads.json | 2 +- samza-test/src/main/python/configs/yarn.json | 32 ++++++++++---------- 6 files changed, 24 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/samza/blob/f7c870f8/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index ce111a2..b0cbfb0 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ After the bootstrap script has completed, the regular gradlew instructions below #### Scala and YARN -Samza builds with [Scala](http://www.scala-lang.org/) 2.10 and [YARN](http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/YARN.html) 2.6.0, by default. Use the -PscalaVersion switches to change Scala versions. Samza supports building Scala with 2.10. +Samza builds with [Scala](http://www.scala-lang.org/) 2.10 and [YARN](http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/YARN.html) 2.6.1, by default. Use the -PscalaVersion switches to change Scala versions. Samza supports building Scala with 2.10. ./gradlew -PscalaVersion=2.10 clean build http://git-wip-us.apache.org/repos/asf/samza/blob/f7c870f8/bin/check-all.sh ---------------------------------------------------------------------- diff --git a/bin/check-all.sh b/bin/check-all.sh index b1f65e7..cb72247 100755 --- a/bin/check-all.sh +++ b/bin/check-all.sh @@ -23,7 +23,7 @@ set -e SCALAs=( "2.10" ) JDKs=( "JAVA7_HOME" "JAVA8_HOME" ) -YARNs=( "2.6.0" "2.7.1" ) +YARNs=( "2.6.1" "2.7.1" ) # get base directory home_dir=`pwd` http://git-wip-us.apache.org/repos/asf/samza/blob/f7c870f8/docs/learn/tutorials/versioned/run-in-multi-node-yarn.md ---------------------------------------------------------------------- diff --git a/docs/learn/tutorials/versioned/run-in-multi-node-yarn.md b/docs/learn/tutorials/versioned/run-in-multi-node-yarn.md index b286226..50ac211 100644 --- a/docs/learn/tutorials/versioned/run-in-multi-node-yarn.md +++ b/docs/learn/tutorials/versioned/run-in-multi-node-yarn.md @@ -27,12 +27,12 @@ If you already have a multi-node YARN cluster (such as CDH5 cluster), you can sk ### Basic YARN Setting -1\. Download [YARN 2.6](http://mirror.symnds.com/software/Apache/hadoop/common/hadoop-2.6.0/hadoop-2.6.0.tar.gz) to /tmp and untar it. +1\. Download [YARN 2.6](http://mirror.symnds.com/software/Apache/hadoop/common/hadoop-2.6.1/hadoop-2.6.1.tar.gz) to /tmp and untar it. {% highlight bash %} cd /tmp -tar -xvf hadoop-2.6.0.tar.gz -cd hadoop-2.6.0 +tar -xvf hadoop-2.6.1.tar.gz +cd hadoop-2.6.1 {% endhighlight %} 2\. Set up environment variables. @@ -111,7 +111,7 @@ Add the following code: 7\. Basically, you copy the hadoop file in your host machine to slave machines. (172.21.100.35, in my case): {% highlight bash %} -scp -r . 172.21.100.35:/tmp/hadoop-2.6.0 +scp -r . 172.21.100.35:/tmp/hadoop-2.6.1 echo 172.21.100.35 > conf/slaves sbin/start-yarn.sh {% endhighlight %} http://git-wip-us.apache.org/repos/asf/samza/blob/f7c870f8/gradle/dependency-versions.gradle ---------------------------------------------------------------------- diff --git a/gradle/dependency-versions.gradle b/gradle/dependency-versions.gradle index ccdd27f..52e25aa 100644 --- a/gradle/dependency-versions.gradle +++ b/gradle/dependency-versions.gradle @@ -30,7 +30,7 @@ kafkaVersion = "0.8.2.1" commonsHttpClientVersion = "3.1" rocksdbVersion = "3.13.1" - yarnVersion = "2.6.0" + yarnVersion = "2.6.1" slf4jVersion = "1.6.2" log4jVersion = "1.2.17" guavaVersion = "17.0" http://git-wip-us.apache.org/repos/asf/samza/blob/f7c870f8/samza-test/src/main/python/configs/downloads.json ---------------------------------------------------------------------- diff --git a/samza-test/src/main/python/configs/downloads.json b/samza-test/src/main/python/configs/downloads.json index c890e70..22694c0 100644 --- a/samza-test/src/main/python/configs/downloads.json +++ b/samza-test/src/main/python/configs/downloads.json @@ -1,5 +1,5 @@ { "url_kafka": "http://www.us.apache.org/dist/kafka/0.8.2.0/kafka_2.9.2-0.8.2.0.tgz";, "url_zookeeper": "http://archive.apache.org/dist/zookeeper/zookeeper-3.4.3/zookeeper-3.4.3.tar.gz";, - "url_hadoop": "https://archive.apache.org/dist/hadoop/common/hadoop-2.6.0/hadoop-2.6.0.tar.gz"; + "url_hadoop": "https://archive.apache.org/dist/hadoop/common/hadoop-2.6.1/hadoop-2.6.1.tar.gz"; } http://git-wip-us.apache.org/repos/asf/samza/blob/f7c870f8/samza-test/src/main/python/configs/yarn.json ---------------------------------------------------------------------- diff --git a/samza-test/src/main/python/configs/yarn.json b/samza-test/src/main/python/configs/yarn.json index b1492bf..1198555 100644 --- a/samza-test/src/main/python/configs/yarn.json +++ b/samza-test/src/main/python/configs/yarn.json @@ -3,34 +3,34 @@ "yarn_rm_hosts": { "yarn_rm_instance_0": "localhost" }, - "yarn_rm_start_cmd": "hadoop-2.6.0/sbin/yarn-daemon.sh start resourcemanager", - "yarn_rm_stop_cmd": "hadoop-2.6.0/sbin/yarn-daemon.sh stop resourcemanager", + "yarn_rm_start_cmd": "hadoop-2.6.1/sbin/yarn-daemon.sh start resourcemanager", + "yarn_rm_stop_cmd": "hadoop-2.6.1/sbin/yarn-daemon.sh stop resourcemanager", "yarn_rm_install_path": "deploy/yarn_rm", "yarn_rm_post_install_cmds": [ - "sed -i.bak 's/<configuration>/<configuration><property><name>yarn.nodemanager.vmem-pmem-ratio<\\/name><value>10<\\/value><\\/property>/' hadoop-2.6.0/etc/hadoop/yarn-site.xml", - "mkdir -p hadoop-2.6.0/conf", - "chmod 755 hadoop-2.6.0/conf", - "cp hadoop-2.6.0/etc/hadoop/yarn-site.xml hadoop-2.6.0/conf/yarn-site.xml" + "sed -i.bak 's/<configuration>/<configuration><property><name>yarn.nodemanager.vmem-pmem-ratio<\\/name><value>10<\\/value><\\/property>/' hadoop-2.6.1/etc/hadoop/yarn-site.xml", + "mkdir -p hadoop-2.6.1/conf", + "chmod 755 hadoop-2.6.1/conf", + "cp hadoop-2.6.1/etc/hadoop/yarn-site.xml hadoop-2.6.1/conf/yarn-site.xml" ], - "yarn_rm_executable": "hadoop-2.6.0.tar.gz", + "yarn_rm_executable": "hadoop-2.6.1.tar.gz", "yarn_rm_logs": [ - "hadoop-2.6.0/logs" + "hadoop-2.6.1/logs" ], "yarn_nm_hosts": { "yarn_nm_instance_0": "localhost" }, - "yarn_nm_start_cmd": "hadoop-2.6.0/sbin/yarn-daemon.sh start nodemanager", - "yarn_nm_stop_cmd": "hadoop-2.6.0/sbin/yarn-daemon.sh stop nodemanager", + "yarn_nm_start_cmd": "hadoop-2.6.1/sbin/yarn-daemon.sh start nodemanager", + "yarn_nm_stop_cmd": "hadoop-2.6.1/sbin/yarn-daemon.sh stop nodemanager", "yarn_nm_install_path": "deploy/yarn_nm", "yarn_nm_post_install_cmds": [ - "sed -i.bak 's/<configuration>/<configuration><property><name>yarn.nodemanager.vmem-pmem-ratio<\\/name><value>10<\\/value><\\/property>/' hadoop-2.6.0/etc/hadoop/yarn-site.xml", - "mkdir -p hadoop-2.6.0/conf", - "chmod 755 hadoop-2.6.0/conf", - "cp hadoop-2.6.0/etc/hadoop/yarn-site.xml hadoop-2.6.0/conf/yarn-site.xml" + "sed -i.bak 's/<configuration>/<configuration><property><name>yarn.nodemanager.vmem-pmem-ratio<\\/name><value>10<\\/value><\\/property>/' hadoop-2.6.1/etc/hadoop/yarn-site.xml", + "mkdir -p hadoop-2.6.1/conf", + "chmod 755 hadoop-2.6.1/conf", + "cp hadoop-2.6.1/etc/hadoop/yarn-site.xml hadoop-2.6.1/conf/yarn-site.xml" ], - "yarn_nm_executable": "hadoop-2.6.0.tar.gz", + "yarn_nm_executable": "hadoop-2.6.1.tar.gz", "yarn_nm_logs": [ - "hadoop-2.6.0/logs" + "hadoop-2.6.1/logs" ], "yarn_driver_configs": { "yarn.resourcemanager.hostname": "localhost"
