You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by ab...@apache.org on 2012/08/13 22:20:12 UTC
svn commit: r1372579 - in /whirr/trunk: ./ services/cdh/ services/hbase/
services/hbase/src/main/resources/
services/hbase/src/test/java/org/apache/whirr/service/hbase/integration/
src/site/xdoc/
Author: abayer
Date: Mon Aug 13 20:20:12 2012
New Revision: 1372579
URL: http://svn.apache.org/viewvc?rev=1372579&view=rev
Log:
WHIRR-525. Switch to HBase 0.92.
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/pom.xml
whirr/trunk/services/cdh/pom.xml
whirr/trunk/services/hbase/pom.xml
whirr/trunk/services/hbase/src/main/resources/whirr-hbase-default.properties
whirr/trunk/services/hbase/src/test/java/org/apache/whirr/service/hbase/integration/HBaseServiceController.java
whirr/trunk/services/hbase/src/test/java/org/apache/whirr/service/hbase/integration/HBaseServiceTest.java
whirr/trunk/src/site/xdoc/known-limitations.xml
Modified: whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1372579&r1=1372578&r2=1372579&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Mon Aug 13 20:20:12 2012
@@ -15,6 +15,8 @@ Trunk (unreleased changes)
IMPROVEMENTS
+ WHIRR-525. Switch to HBase 0.92. (abayer)
+
WHIRR-189. Hadoop on EC2 should use all available storage. (abayer)
WHIRR-63. Support EC2 Cluster Compute groups for Hadoop etc. (abayer)
Modified: whirr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/pom.xml?rev=1372579&r1=1372578&r2=1372579&view=diff
==============================================================================
--- whirr/trunk/pom.xml (original)
+++ whirr/trunk/pom.xml Mon Aug 13 20:20:12 2012
@@ -49,6 +49,7 @@
<module>services/yarn</module>
<module>services/zookeeper</module>
<module>services/hbase</module>
+ <module>services/hbase-oldtests</module>
<module>services/elasticsearch</module>
<module>services/hama</module>
<module>services/puppet</module>
@@ -70,7 +71,7 @@
<hadoop.version>0.20.205.0</hadoop.version>
<hamcrest.version>1.1</hamcrest.version>
<hama.version>0.4.0-incubating</hama.version>
- <hbase.version>0.89.20100924-28</hbase.version>
+ <hbase.version>0.92.0</hbase.version>
<jackson.version>1.5.2</jackson.version>
<jclouds.version>1.5.0-beta.9</jclouds.version>
<jdom.version>1.1</jdom.version>
Modified: whirr/trunk/services/cdh/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/services/cdh/pom.xml?rev=1372579&r1=1372578&r2=1372579&view=diff
==============================================================================
--- whirr/trunk/services/cdh/pom.xml (original)
+++ whirr/trunk/services/cdh/pom.xml Mon Aug 13 20:20:12 2012
@@ -174,7 +174,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testExcludes>
- <exclude>**/CdhHBaseServiceTest.java</exclude><!-- TODO: remove when WHIRR-525 is done -->
<exclude>**/CdhYarnServiceTest.java</exclude>
</testExcludes>
</configuration>
@@ -217,7 +216,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testExcludes>
- <exclude>**/CdhHBaseServiceTest.java</exclude><!-- TODO: remove when WHIRR-525 is done -->
<exclude>**/CdhHadoopServiceTest.java</exclude>
</testExcludes>
</configuration>
Modified: whirr/trunk/services/hbase/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/services/hbase/pom.xml?rev=1372579&r1=1372578&r2=1372579&view=diff
==============================================================================
--- whirr/trunk/services/hbase/pom.xml (original)
+++ whirr/trunk/services/hbase/pom.xml Mon Aug 13 20:20:12 2012
@@ -109,13 +109,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.cloudera.hbase</groupId>
+ <groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
<version>${hbase.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.cloudera.hbase</groupId>
+ <groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
<version>${hbase.version}</version>
<classifier>tests</classifier>
Modified: whirr/trunk/services/hbase/src/main/resources/whirr-hbase-default.properties
URL: http://svn.apache.org/viewvc/whirr/trunk/services/hbase/src/main/resources/whirr-hbase-default.properties?rev=1372579&r1=1372578&r2=1372579&view=diff
==============================================================================
--- whirr/trunk/services/hbase/src/main/resources/whirr-hbase-default.properties (original)
+++ whirr/trunk/services/hbase/src/main/resources/whirr-hbase-default.properties Mon Aug 13 20:20:12 2012
@@ -32,6 +32,7 @@ hbase-site.hbase.client.retries.number=1
# (a lot) later than HBase. (for similar reasons as
# hbase.client.retries.number)
hbase-site.hbase.zookeeper.recoverable.waittime=600000
+hbase-site.zookeeper.recovery.retry=20
# hbase-env.sh (Values should not be quoted here, they will be quoted with double quotes in hbase-env.sh)
# enable assertions, use CMS in incremental mode, disable ipv6
Modified: whirr/trunk/services/hbase/src/test/java/org/apache/whirr/service/hbase/integration/HBaseServiceController.java
URL: http://svn.apache.org/viewvc/whirr/trunk/services/hbase/src/test/java/org/apache/whirr/service/hbase/integration/HBaseServiceController.java?rev=1372579&r1=1372578&r2=1372579&view=diff
==============================================================================
--- whirr/trunk/services/hbase/src/test/java/org/apache/whirr/service/hbase/integration/HBaseServiceController.java (original)
+++ whirr/trunk/services/hbase/src/test/java/org/apache/whirr/service/hbase/integration/HBaseServiceController.java Mon Aug 13 20:20:12 2012
@@ -20,6 +20,7 @@ package org.apache.whirr.service.hbase.i
import java.io.IOException;
import java.net.InetAddress;
+import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -143,8 +144,8 @@ public class HBaseServiceController {
LOG.info("Waiting for .META. table...");
TProtocol protocol = new TBinaryProtocol(transport, true, true);
Hbase.Client client = new Hbase.Client(protocol);
- int scannerId = client.scannerOpen(HConstants.META_TABLE_NAME,
- Bytes.toBytes(""), null);
+ int scannerId = client.scannerOpen(ByteBuffer.wrap(HConstants.META_TABLE_NAME),
+ ByteBuffer.wrap(Bytes.toBytes("")), null);
client.scannerClose(scannerId);
thriftClient = client;
}
Modified: whirr/trunk/services/hbase/src/test/java/org/apache/whirr/service/hbase/integration/HBaseServiceTest.java
URL: http://svn.apache.org/viewvc/whirr/trunk/services/hbase/src/test/java/org/apache/whirr/service/hbase/integration/HBaseServiceTest.java?rev=1372579&r1=1372578&r2=1372579&view=diff
==============================================================================
--- whirr/trunk/services/hbase/src/test/java/org/apache/whirr/service/hbase/integration/HBaseServiceTest.java (original)
+++ whirr/trunk/services/hbase/src/test/java/org/apache/whirr/service/hbase/integration/HBaseServiceTest.java Mon Aug 13 20:20:12 2012
@@ -28,6 +28,7 @@ import org.apache.whirr.TestConstants;
import org.junit.AfterClass;
import org.junit.Test;
+import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
@@ -37,13 +38,17 @@ import static org.junit.Assert.assertTru
public abstract class HBaseServiceTest {
- private static final byte[] FIRST = Bytes.toBytes("");
- private static final byte[] TABLE = Bytes.toBytes("testtable");
- private static final byte[] ROW = Bytes.toBytes("testRow");
- private static final byte[] FAMILY1 = Bytes.toBytes("testFamily1");
- private static final byte[] FAMILY2 = Bytes.toBytes("testFamily2");
- private static final byte[] COLUMN = Bytes.toBytes("testFamily1:testColumn");
- private static final byte[] VALUE = Bytes.toBytes("testValue");
+ private static final ByteBuffer FIRST = toBytes("");
+ private static final ByteBuffer TABLE = toBytes("testtable");
+ private static final ByteBuffer ROW = toBytes("testRow");
+ private static final ByteBuffer FAMILY1 = toBytes("testFamily1");
+ private static final ByteBuffer FAMILY2 = toBytes("testFamily2");
+ private static final ByteBuffer COLUMN = toBytes("testFamily1:testColumn");
+ private static final ByteBuffer VALUE = toBytes("testValue");
+
+ static ByteBuffer toBytes(String val) {
+ return ByteBuffer.wrap(Bytes.toBytes(val));
+ }
protected static HBaseServiceController controller;
Modified: whirr/trunk/src/site/xdoc/known-limitations.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/src/site/xdoc/known-limitations.xml?rev=1372579&r1=1372578&r2=1372579&view=diff
==============================================================================
--- whirr/trunk/src/site/xdoc/known-limitations.xml (original)
+++ whirr/trunk/src/site/xdoc/known-limitations.xml Mon Aug 13 20:20:12 2012
@@ -22,9 +22,10 @@ xsi:schemaLocation="http://maven.apache.
<section name="Whirr™ Know Limitations"></section>
<p>We are striving to make each release as good as possible but there are still a set of
- limitations that you should be aware of. The following issues are known to exist in the 0.6.0 release of Whirr.</p>
+ limitations that you should be aware of. The following issues are known to exist in the 0.8.0 release of Whirr.</p>
<ul>
+ <li>When launching an HBase 0.92.0 or 0.92.1 cluster, the regionserver may not launch properly if the master is not already up. Start the regionserver service again after the master is up. This is a bug in HBase, fixed in the upcoming 0.92.2.</li>
<li>The order of the roles is significant. (e.g. hadoop-jobtracker+hadoop-namenode will try to start the jobtracker before starting the namenode)</li>
<li>The "jclouds.aws-s3.endpoint" property is needed in order to use BlobCache with Amazon AWS in a region besides us-east-1. See <a href="https://issues.apache.org/jira/browse/WHIRR-349#comment-13084590">WHIRR-349</a> for more details</li>
</ul>