Permalink
Browse files

WHIRR-661. Upgrade to Hadoop 1.0.3. Contributed by Steve Loughran.

  • Loading branch information...
abayer committed Mar 11, 2013
1 parent 7e027bb commit d5689610e837b5fd5a272697a9c2ac59803b7b47
View
@@ -4,6 +4,8 @@ Release 0.8.2 (unreleased changes)
IMPROVEMENTS
+ WHIRR-661. Upgrade to Hadoop 1.0.3. (Steve Loughran via abayer)
+
WHIRR-634. Update private IP host file entry when required by
AUTO_HOSTNAME_SUFFIX. (Graham Gear via abayer)
View
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
- <version>0.20.2</version>
+ <version>${hadoop.version}</version>
</dependency>
</dependencies>
<build>
View
@@ -68,7 +68,7 @@
<common-ssl.version>0.3.11</common-ssl.version>
<dnsjava.version>2.1.1</dnsjava.version>
<guava.version>13.0</guava.version>
- <hadoop.version>0.20.205.0</hadoop.version>
+ <hadoop.version>1.0.3</hadoop.version>
<hamcrest.version>1.1</hamcrest.version>
<hama.version>0.4.0-incubating</hama.version>
<hbase.version>0.94.1</hbase.version>
@@ -93,5 +93,5 @@ whirr.instance-templates=1 hadoop-namenode+hadoop-jobtracker,5 hadoop-datanode+h
# Expert: specify the version of Hadoop to install.
#
-#whirr.hadoop.version=0.20.2
+#whirr.hadoop.version=1.0.3
#whirr.hadoop.tarball.url=http://archive.apache.org/dist/hadoop/core/hadoop-${whirr.hadoop.version}/hadoop-${whirr.hadoop.version}.tar.gz
@@ -69,10 +69,10 @@ hbase-site.dfs.replication=2
whirr.hbase.tarball.url=http://apache.cu.be/hbase/hbase-0.90.3/hbase-0.90.3.tar.gz
# The Hadoop version to use. See http://hbase.apache.org/book/hadoop.html
-# The default Hadoop version used by Whirr does not fulfill the HBase 0.90.x requirements.
-# Whirr will replace the hadoop-core jar in HBase with the one from the actually installed Hadoop.
-# This example uses Cloudera's CDH3.
-whirr.hadoop.tarball.url=http://archive.cloudera.com/cdh/3/hadoop-0.20.2-cdh3u1.tar.gz
+
+#whirr.hadoop.version=1.0.3
+#whirr.hadoop.tarball.url=http://archive.apache.org/dist/hadoop/core/hadoop-${whirr.hadoop.version}/hadoop-${whirr.hadoop.version}.tar.gz
+
# Options for the hbase master & regionserver processes
#hbase-env.HBASE_MASTER_OPTS=-Xms1000m -Xmx1000m -Xmn256m -XX:+UseConcMarkSweepGC -XX:+AggressiveOpts -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Xloggc:/data/hbase/logs/hbase-master-gc.log
View
@@ -28,9 +28,6 @@ whirr.instance-templates=1 hadoop-namenode+hadoop-jobtracker+pig-client,1 hadoop
whirr.pig.version=0.9.2
whirr.pig.tarball.url=http://apache.osuosl.org/pig/pig-${whirr.pig.version}/pig-${whirr.pig.version}.tar.gz
-whirr.hadoop.version=0.20.205.0
-whirr.hadoop.tarball.url=http://apache.osuosl.org/hadoop/common/hadoop-${whirr.hadoop.version}/hadoop-${whirr.hadoop.version}.tar.gz
-
# Setup your cloud credentials by copying conf/credentials.sample
# to ~/.whirr/credentials and editing as needed
@@ -16,7 +16,7 @@
# limitations under the License.
#
-whirr.hadoop.version=0.20.205.0
+whirr.hadoop.version=1.0.3
whirr.hadoop.tarball.url=http://apache.osuosl.org/hadoop/common/hadoop-${whirr.hadoop.version}/hadoop-${whirr.hadoop.version}.tar.gz
# Hadoop defaults. The first part of the key is removed by whirr.
View
@@ -29,7 +29,7 @@
<version>0.9.0-SNAPSHOT</version>
<name>Apache Whirr Hama</name>
<properties>
- <hadoop.version>0.20.2</hadoop.version>
+ <hadoop.version>1.0.3</hadoop.version>
<zookeeper.version>3.3.3</zookeeper.version>
<osgi.import>
!org.apache.whirr.service.hama*,
@@ -10,5 +10,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-whirr.hadoop.version=0.20.2
whirr.hama.tarball.url=http://archive.apache.org/dist/incubator/hama/0.4-incubating/hama-0.4.0-incubating.tar.gz
@@ -15,7 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-whirr.hadoop.version=0.20.2
whirr.cluster-name=hama-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=1 zookeeper,1 hadoop-namenode+hadoop-jobtracker+hama-master,1 hadoop-datanode+hadoop-tasktracker+hama-groomserver
@@ -25,4 +25,3 @@ whirr.credential=${sys:whirr.test.credential}
whirr.hardware-min-ram=4096
whirr.hbase.tarball.url=http://apache.osuosl.org/hbase/hbase-0.90.5/hbase-0.90.5.tar.gz
-whirr.hadoop.tarball.url=http://archive.cloudera.com/cdh/3/hadoop-0.20.2-cdh3u0.tar.gz
@@ -23,6 +23,5 @@ whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
whirr.hbase.tarball.url=http://apache.osuosl.org/hbase/hbase-0.90.5/hbase-0.90.5.tar.gz
-whirr.hadoop.tarball.url=http://archive.cloudera.com/cdh/3/hadoop-0.20.2-cdh3u0.tar.gz
@@ -11,7 +11,6 @@
# limitations under the License.
whirr.hbase.tarball.url=http://archive.apache.org/dist/hbase/hbase-0.90.3/hbase-0.90.3.tar.gz
-whirr.hadoop.tarball.url=http://archive.cloudera.com/cdh/3/hadoop-0.20.2-cdh3u0.tar.gz
hbase-site.hbase.cluster.distributed=true
hbase-site.hbase.regionserver.handler.count=100
@@ -26,5 +26,3 @@ whirr.credential=${sys:whirr.test.credential}
whirr.pig.version=0.9.2
whirr.pig.tarball.url=http://apache.osuosl.org/pig/pig-${whirr.pig.version}/pig-${whirr.pig.version}.tar.gz
-whirr.hadoop.version=0.20.205.0
-whirr.hadoop.tarball.url=http://apache.osuosl.org/hadoop/common/hadoop-${whirr.hadoop.version}/hadoop-${whirr.hadoop.version}.tar.gz
View
@@ -29,7 +29,7 @@
<version>0.9.0-SNAPSHOT</version>
<name>Apache Whirr YARN</name>
<properties>
- <hadoop.version>0.20.2</hadoop.version>
+ <hadoop.version>1.0.3</hadoop.version>
<osgi.import>
!org.apache.whirr.service.yarn*,
org.apache.commons.configuration*;version="[1.6,2)",

0 comments on commit d568961

Please sign in to comment.