You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2010/08/18 21:32:08 UTC
svn commit: r986882 - in /hbase/branches/0.90_master_rewrite/src:
main/java/org/apache/hadoop/hbase/catalog/
main/java/org/apache/hadoop/hbase/master/
main/java/org/apache/hadoop/hbase/regionserver/
main/java/org/apache/hadoop/hbase/zookeeper/ main/res...
Author: stack
Date: Wed Aug 18 19:32:08 2010
New Revision: 986882
URL: http://svn.apache.org/viewvc?rev=986882&view=rev
Log:
Branch compiles now.
M src/test/java/org/apache/hadoop/hbase/TestSerialization.java
Updated class to use junit4. Fixed references to HMsgs removed.
M src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
OpenHRegion api changed.
M src/test/java/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java
M src/test/java/org/apache/hadoop/hbase/master/OOMEHMaster.java
Let out IE.
D src/test/java/org/apache/hadoop/hbase/master/TestRegionServerOperationQueue.java
Removed. RegionServerOperationQueue no longer exists.
D src/test/java/org/apache/hadoop/hbase/master/TestMasterWithDisabling.java
D src/test/java/org/apache/hadoop/hbase/master/TestROOTAssignment.java
Removed. RSOQ no longer exists. Its the mechanism used running these tests.
I looked at bringing these tests over and judge they just need to be rewritten
completely. Removing until then (I filed an issue).
D src/test/java/org/apache/hadoop/hbase/master/TestRegionManager.java
Doesn't exist any more.
M src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java
Server interface changed.
M src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java
Commented out the guts of this test. It depends on RSOQ since removed but
we should recast using new mechanisms so leaving it for now.
M src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
Fix wrong class name as key for LOG
M src/test/java/org/apache/hadoop/hbase/master/TestOldLogsCleaner.java
Fixup to make it work with new apis
M src/test/java/org/apache/hadoop/hbase/TestHMsg.java
Sample HMsg no longer exists. Use another.
M src/main/java/org/apache/hadoop/hbase/zookeeper/ClusterStatusTracker.java
Changed the parent start to default register us as zk listener so this
start override no longer needed.
M src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java
Register as a listener on start.
M src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
No need to register MasterAddressManager as a listener any more. Parent
class does it for us.
M src/main/java/org/apache/hadoop/hbase/master/OldLogsCleaner.java
Minor formatting.
M src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
Added accessor for meta location.
M src/main/resources/hbase-webapps/master/table.jsp
M src/main/resources/hbase-webapps/master/master.jsp
Fixup so compiles against new apis.
Removed:
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestMasterWithDisabling.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestROOTAssignment.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestRegionManager.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestRegionServerOperationQueue.java
Modified:
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/OldLogsCleaner.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/ClusterStatusTracker.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaNodeTracker.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java
hbase/branches/0.90_master_rewrite/src/main/resources/hbase-webapps/master/master.jsp
hbase/branches/0.90_master_rewrite/src/main/resources/hbase-webapps/master/table.jsp
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestHMsg.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestSerialization.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/OOMEHMaster.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestOldLogsCleaner.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java?rev=986882&r1=986881&r2=986882&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java Wed Aug 18 19:32:08 2010
@@ -110,7 +110,14 @@ public class CatalogTracker {
* @throws InterruptedException
*/
public HServerAddress getRootLocation() throws InterruptedException {
- return rootRegionTracker.getRootRegionLocation();
+ return this.rootRegionTracker.getRootRegionLocation();
+ }
+
+ /**
+ * @return Location of meta or null if not yet available.
+ */
+ public HServerAddress getMetaLocation() {
+ return this.metaLocation;
}
/**
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/OldLogsCleaner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/OldLogsCleaner.java?rev=986882&r1=986881&r2=986882&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/OldLogsCleaner.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/OldLogsCleaner.java Wed Aug 18 19:32:08 2010
@@ -58,9 +58,8 @@ public class OldLogsCleaner extends Chor
* @param fs handle to the FS
* @param oldLogDir the path to the archived logs
*/
- public OldLogsCleaner(final int p, final Stoppable s,
- Configuration conf, FileSystem fs,
- Path oldLogDir) {
+ public OldLogsCleaner(final int p, final Stoppable s, Configuration conf,
+ FileSystem fs, Path oldLogDir) {
super("OldLogsCleaner", p, s);
this.maxDeletedLogs =
conf.getInt("hbase.master.logcleaner.maxdeletedlogs", 20);
@@ -70,9 +69,9 @@ public class OldLogsCleaner extends Chor
this.logCleaner = getLogCleaner();
}
- @SuppressWarnings("unchecked")
private LogCleanerDelegate getLogCleaner() {
try {
+ @SuppressWarnings("rawtypes")
Class c = Class.forName(conf.get("hbase.master.logcleanerplugin.impl",
TimeToLiveLogCleaner.class.getCanonicalName()));
LogCleanerDelegate cleaner = (LogCleanerDelegate) c.newInstance();
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=986882&r1=986881&r2=986882&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Wed Aug 18 19:32:08 2010
@@ -342,7 +342,6 @@ public class HRegionServer implements HR
// create the master address manager, register with zk, and start it
masterAddressManager = new MasterAddressTracker(zooKeeper, this);
- zooKeeper.registerListener(masterAddressManager);
masterAddressManager.start();
// create the catalog tracker and start it
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/ClusterStatusTracker.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/ClusterStatusTracker.java?rev=986882&r1=986881&r2=986882&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/ClusterStatusTracker.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/ClusterStatusTracker.java Wed Aug 18 19:32:08 2010
@@ -48,12 +48,6 @@ public class ClusterStatusTracker extend
super(watcher, watcher.clusterStateZNode, abortable);
}
- @Override
- public synchronized void start() {
- super.start();
- this.watcher.registerListener(this);
- }
-
/**
* Checks if cluster is up.
* @return true if root region location is available, false if not
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaNodeTracker.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaNodeTracker.java?rev=986882&r1=986881&r2=986882&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaNodeTracker.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaNodeTracker.java Wed Aug 18 19:32:08 2010
@@ -70,4 +70,4 @@ public class MetaNodeTracker extends Zoo
}
}
}
-}
+}
\ No newline at end of file
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java?rev=986882&r1=986881&r2=986882&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java Wed Aug 18 19:32:08 2010
@@ -70,6 +70,7 @@ public abstract class ZooKeeperNodeTrack
* or {@link getData} to get the data of the node if it is available.
*/
public synchronized void start() {
+ this.watcher.registerListener(this);
try {
if(ZKUtil.watchAndCheckExists(watcher, node)) {
byte [] data = ZKUtil.getDataAndWatch(watcher, node);
Modified: hbase/branches/0.90_master_rewrite/src/main/resources/hbase-webapps/master/master.jsp
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/resources/hbase-webapps/master/master.jsp?rev=986882&r1=986881&r2=986882&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/resources/hbase-webapps/master/master.jsp (original)
+++ hbase/branches/0.90_master_rewrite/src/main/resources/hbase-webapps/master/master.jsp Wed Aug 18 19:32:08 2010
@@ -6,17 +6,16 @@
import="org.apache.hadoop.hbase.util.FSUtils"
import="org.apache.hadoop.hbase.master.HMaster"
import="org.apache.hadoop.hbase.HConstants"
- import="org.apache.hadoop.hbase.master.MetaRegion"
import="org.apache.hadoop.hbase.client.HBaseAdmin"
import="org.apache.hadoop.hbase.HServerInfo"
import="org.apache.hadoop.hbase.HServerAddress"
import="org.apache.hadoop.hbase.HTableDescriptor" %><%
HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER);
Configuration conf = master.getConfiguration();
- HServerAddress rootLocation = master.getRegionManager().getRootRegionLocation();
- Map<byte [], MetaRegion> onlineRegions = master.getRegionManager().getOnlineMetaRegions();
+ HServerAddress rootLocation = master.getCatalogTracker().getRootLocation();
+ boolean metaOnline = master.getCatalogTracker().getMetaLocation() != null;
Map<String, HServerInfo> serverToServerInfos =
- master.getServerManager().getServersToServerInfo();
+ master.getServerManager().getOnlineServers();
int interval = conf.getInt("hbase.regionserver.msginterval", 1000)/1000;
if (interval == 0) {
interval = 1;
@@ -24,7 +23,7 @@
boolean showFragmentation = conf.getBoolean("hbase.master.ui.fragmentation.enabled", false);
Map<String, Integer> frags = null;
if (showFragmentation) {
- frags = master.getTableFragmentation();
+ frags = FSUtils.getTableFragmentation(master);
}
%><?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -66,9 +65,8 @@
<tr><td>HBase Compiled</td><td><%= org.apache.hadoop.hbase.util.VersionInfo.getDate() %>, <%= org.apache.hadoop.hbase.util.VersionInfo.getUser() %></td><td>When HBase version was compiled and by whom</td></tr>
<tr><td>Hadoop Version</td><td><%= org.apache.hadoop.util.VersionInfo.getVersion() %>, r<%= org.apache.hadoop.util.VersionInfo.getRevision() %></td><td>Hadoop version and svn revision</td></tr>
<tr><td>Hadoop Compiled</td><td><%= org.apache.hadoop.util.VersionInfo.getDate() %>, <%= org.apache.hadoop.util.VersionInfo.getUser() %></td><td>When Hadoop version was compiled and by whom</td></tr>
-<tr><td>HBase Root Directory</td><td><%= master.getRootDir().toString() %></td><td>Location of HBase home directory</td></tr>
+<tr><td>HBase Root Directory</td><td><%= FSUtils.getRootDir(master.getConfiguration()).toString() %></td><td>Location of HBase home directory</td></tr>
<tr><td>Load average</td><td><%= master.getServerManager().getAverageLoad() %></td><td>Average number of regions per regionserver. Naive computation.</td></tr>
-<tr><td>Regions On FS</td><td><%= master.getRegionManager().countRegionsOnFS() %></td><td>Number of regions on FileSystem. Rough count.</td></tr>
<% if (showFragmentation) { %>
<tr><td>Fragmentation</td><td><%= frags.get("-TOTAL-") != null ? frags.get("-TOTAL-").intValue() + "%" : "n/a" %></td><td>Overall fragmentation of all tables, including .META. and -ROOT-.</td></tr>
<% } %>
@@ -94,7 +92,7 @@
<td>The -ROOT- table holds references to all .META. regions.</td>
</tr>
<%
- if (onlineRegions != null && onlineRegions.size() > 0) { %>
+ if (metaOnline) { %>
<tr>
<td><a href="table.jsp?name=<%= Bytes.toString(HConstants.META_TABLE_NAME) %>"><%= Bytes.toString(HConstants.META_TABLE_NAME) %></a></td>
<% if (showFragmentation) { %>
Modified: hbase/branches/0.90_master_rewrite/src/main/resources/hbase-webapps/master/table.jsp
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/resources/hbase-webapps/master/table.jsp?rev=986882&r1=986881&r2=986882&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/resources/hbase-webapps/master/table.jsp (original)
+++ hbase/branches/0.90_master_rewrite/src/main/resources/hbase-webapps/master/table.jsp Wed Aug 18 19:32:08 2010
@@ -9,8 +9,8 @@
import="org.apache.hadoop.hbase.HServerInfo"
import="org.apache.hadoop.hbase.io.ImmutableBytesWritable"
import="org.apache.hadoop.hbase.master.HMaster"
- import="org.apache.hadoop.hbase.master.MetaRegion"
import="org.apache.hadoop.hbase.util.Bytes"
+ import="org.apache.hadoop.hbase.util.FSUtils"
import="java.util.Map"
import="org.apache.hadoop.hbase.HConstants"%><%
HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER);
@@ -19,11 +19,11 @@
String tableName = request.getParameter("name");
HTable table = new HTable(conf, tableName);
String tableHeader = "<h2>Table Regions</h2><table><tr><th>Name</th><th>Region Server</th><th>Start Key</th><th>End Key</th></tr>";
- HServerAddress rootLocation = master.getRegionManager().getRootRegionLocation();
+ HServerAddress rl = master.getCatalogTracker().getRootLocation();
boolean showFragmentation = conf.getBoolean("hbase.master.ui.fragmentation.enabled", false);
Map<String, Integer> frags = null;
if (showFragmentation) {
- frags = master.getTableFragmentation();
+ frags = FSUtils.getTableFragmentation(master);
}
%>
@@ -46,15 +46,19 @@
<p><hr><p>
<%
if (action.equals("split")) {
+ /*
if (key != null && key.length() > 0) {
Writable[] arr = new Writable[1];
arr[0] = new ImmutableBytesWritable(Bytes.toBytes(key));
master.modifyTable(Bytes.toBytes(tableName), HConstants.Modify.TABLE_SPLIT, arr);
} else {
- master.modifyTable(Bytes.toBytes(tableName), HConstants.Modify.TABLE_SPLIT, null);
+ master.modifyTable(Bytes.toBytes(tableName), HConstants.Modify.TABLE_SPLIT);
}
- %> Split request accepted. <%
+ */
+
+ %> Split request accepted -- BUT CURRENTLY A NOOP -- FIX!. <%
} else if (action.equals("compact")) {
+ /*
if (key != null && key.length() > 0) {
Writable[] arr = new Writable[1];
arr[0] = new ImmutableBytesWritable(Bytes.toBytes(key));
@@ -62,7 +66,8 @@
} else {
master.modifyTable(Bytes.toBytes(tableName), HConstants.Modify.TABLE_COMPACT, null);
}
- %> Compact request accepted. <%
+ */
+ %> Compact request accepted -- BUT CURRENTLY A NOOP -- FIX! <%
}
%>
<p>Reload.
@@ -84,12 +89,12 @@
%>
<%= tableHeader %>
<%
- int infoPort = master.getServerManager().getHServerInfo(rootLocation).getInfoPort();
- String url = "http://" + rootLocation.getHostname() + ":" + infoPort + "/";
+ int infoPort = master.getServerManager().getHServerInfo(rl).getInfoPort();
+ String url = "http://" + rl.getHostname() + ":" + infoPort + "/";
%>
<tr>
<td><%= tableName %></td>
- <td><a href="<%= url %>"><%= rootLocation.getHostname() %>:<%= rootLocation.getPort() %></a></td>
+ <td><a href="<%= url %>"><%= rl.getHostname() %>:<%= rl.getPort() %></a></td>
<td>-</td>
<td></td>
<td>-</td>
@@ -100,14 +105,16 @@
%>
<%= tableHeader %>
<%
- Map<byte [], MetaRegion> onlineRegions = master.getRegionManager().getOnlineMetaRegions();
- for (MetaRegion meta: onlineRegions.values()) {
- int infoPort = master.getServerManager().getHServerInfo(meta.getServer()).getInfoPort();
- String url = "http://" + meta.getServer().getHostname() + ":" + infoPort + "/";
+ // NOTE: Presumes one meta region only.
+ HRegionInfo meta = HRegionInfo.FIRST_META_REGIONINFO;
+ HServerAddress metaLocation = master.getCatalogTracker().getMetaLocation();
+ for (int i = 0; i <= 1; i++) {
+ int infoPort = master.getServerManager().getHServerInfo(metaLocation).getInfoPort();
+ String url = "http://" + metaLocation.getHostname() + ":" + infoPort + "/";
%>
<tr>
- <td><%= Bytes.toString(meta.getRegionName()) %></td>
- <td><a href="<%= url %>"><%= meta.getServer().getHostname().toString() + ":" + infoPort %></a></td>
+ <td><%= meta.getRegionNameAsString() %></td>
+ <td><a href="<%= url %>"><%= metaLocation.getHostname().toString() + ":" + infoPort %></a></td>
<td>-</td><td><%= Bytes.toString(meta.getStartKey()) %></td><td><%= Bytes.toString(meta.getEndKey()) %></td>
</tr>
<% } %>
Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestHMsg.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestHMsg.java?rev=986882&r1=986881&r2=986882&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestHMsg.java (original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestHMsg.java Wed Aug 18 19:32:08 2010
@@ -64,7 +64,7 @@ public class TestHMsg extends TestCase {
new HRegionInfo(new HTableDescriptor(Bytes.toBytes("parent")),
parentbytes, parentbytes);
// Assert simple HMsg serializes
- HMsg hmsg = new HMsg(HMsg.Type.CLOSE_ALL_USER_REGIONS, parent);
+ HMsg hmsg = new HMsg(HMsg.Type.STOP_REGIONSERVER, parent);
byte [] bytes = Writables.getBytes(hmsg);
HMsg close = (HMsg)Writables.getWritable(bytes, new HMsg());
assertTrue(close.equals(hmsg));
Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestSerialization.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestSerialization.java?rev=986882&r1=986881&r2=986882&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestSerialization.java (original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestSerialization.java Wed Aug 18 19:32:08 2010
@@ -20,6 +20,8 @@
package org.apache.hadoop.hbase;
+import static org.junit.Assert.*;
+
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.util.ArrayList;
@@ -44,23 +46,14 @@ import org.apache.hadoop.hbase.io.TimeRa
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Writables;
import org.apache.hadoop.io.DataInputBuffer;
+import org.junit.Test;
/**
* Test HBase Writables serializations
*/
-public class TestSerialization extends HBaseTestCase {
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- }
+public class TestSerialization {
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- public void testCompareFilter() throws Exception {
+ @Test public void testCompareFilter() throws Exception {
Filter f = new RowFilter(CompareOp.EQUAL,
new BinaryComparator(Bytes.toBytes("testRowOne-2")));
byte [] bytes = Writables.getBytes(f);
@@ -68,10 +61,11 @@ public class TestSerialization extends H
assertNotNull(ff);
}
- public void testKeyValue() throws Exception {
- byte [] row = Bytes.toBytes(getName());
- byte [] family = Bytes.toBytes(getName());
- byte [] qualifier = Bytes.toBytes(getName());
+ @Test public void testKeyValue() throws Exception {
+ final String name = "testKeyValue";
+ byte [] row = Bytes.toBytes(name);
+ byte [] family = Bytes.toBytes(name);
+ byte [] qualifier = Bytes.toBytes(name);
KeyValue original = new KeyValue(row, family, qualifier);
byte [] bytes = Writables.getBytes(original);
KeyValue newone = (KeyValue)Writables.getWritable(bytes, new KeyValue());
@@ -79,7 +73,7 @@ public class TestSerialization extends H
}
@SuppressWarnings("unchecked")
- public void testHbaseMapWritable() throws Exception {
+ @Test public void testHbaseMapWritable() throws Exception {
HbaseMapWritable<byte [], byte []> hmw =
new HbaseMapWritable<byte[], byte[]>();
hmw.put("key".getBytes(), "value".getBytes());
@@ -90,13 +84,14 @@ public class TestSerialization extends H
assertTrue(Bytes.equals("value".getBytes(), hmw.get("key".getBytes())));
}
- public void testHMsg() throws Exception {
- HMsg m = new HMsg(HMsg.Type.CLOSE_ALL_USER_REGIONS);
+ @Test public void testHMsg() throws Exception {
+ final String name = "testHMsg";
+ HMsg m = new HMsg(HMsg.Type.STOP_REGIONSERVER);
byte [] mb = Writables.getBytes(m);
HMsg deserializedHMsg = (HMsg)Writables.getWritable(mb, new HMsg());
assertTrue(m.equals(deserializedHMsg));
- m = new HMsg(HMsg.Type.CLOSE_ALL_USER_REGIONS,
- new HRegionInfo(new HTableDescriptor(getName()),
+ m = new HMsg(HMsg.Type.STOP_REGIONSERVER,
+ new HRegionInfo(new HTableDescriptor(name),
HConstants.EMPTY_BYTE_ARRAY, HConstants.EMPTY_BYTE_ARRAY),
"Some message".getBytes());
mb = Writables.getBytes(m);
@@ -104,8 +99,9 @@ public class TestSerialization extends H
assertTrue(m.equals(deserializedHMsg));
}
- public void testTableDescriptor() throws Exception {
- HTableDescriptor htd = createTableDescriptor(getName());
+ @Test public void testTableDescriptor() throws Exception {
+ final String name = "testTableDescriptor";
+ HTableDescriptor htd = createTableDescriptor(name);
byte [] mb = Writables.getBytes(htd);
HTableDescriptor deserializedHtd =
(HTableDescriptor)Writables.getWritable(mb, new HTableDescriptor());
@@ -116,8 +112,9 @@ public class TestSerialization extends H
* Test RegionInfo serialization
* @throws Exception
*/
- public void testRegionInfo() throws Exception {
- HTableDescriptor htd = new HTableDescriptor(getName());
+ @Test public void testRegionInfo() throws Exception {
+ final String name = "testRegionInfo";
+ HTableDescriptor htd = new HTableDescriptor(name);
String [] families = new String [] {"info", "anchor"};
for (int i = 0; i < families.length; i++) {
htd.addFamily(new HColumnDescriptor(families[i]));
@@ -136,7 +133,7 @@ public class TestSerialization extends H
* Test ServerInfo serialization
* @throws Exception
*/
- public void testServerInfo() throws Exception {
+ @Test public void testServerInfo() throws Exception {
HServerInfo hsi = new HServerInfo(new HServerAddress("0.0.0.0:123"), -1,
1245, "default name");
byte [] b = Writables.getBytes(hsi);
@@ -145,7 +142,7 @@ public class TestSerialization extends H
assertTrue(hsi.equals(deserializedHsi));
}
- public void testPut() throws Exception{
+ @Test public void testPut() throws Exception{
byte[] row = "row".getBytes();
byte[] fam = "fam".getBytes();
byte[] qf1 = "qf1".getBytes();
@@ -193,7 +190,7 @@ public class TestSerialization extends H
}
- public void testPut2() throws Exception{
+ @Test public void testPut2() throws Exception{
byte[] row = "testAbort,,1243116656250".getBytes();
byte[] fam = "historian".getBytes();
byte[] qf1 = "creation".getBytes();
@@ -221,7 +218,7 @@ public class TestSerialization extends H
}
- public void testDelete() throws Exception{
+ @Test public void testDelete() throws Exception{
byte[] row = "row".getBytes();
byte[] fam = "fam".getBytes();
byte[] qf1 = "qf1".getBytes();
@@ -248,7 +245,7 @@ public class TestSerialization extends H
}
}
- public void testGet() throws Exception{
+ @Test public void testGet() throws Exception{
byte[] row = "row".getBytes();
byte[] fam = "fam".getBytes();
byte[] qf1 = "qf1".getBytes();
@@ -289,7 +286,8 @@ public class TestSerialization extends H
}
- public void testScan() throws Exception{
+ @Test public void testScan() throws Exception {
+
byte[] startRow = "startRow".getBytes();
byte[] stopRow = "stopRow".getBytes();
byte[] fam = "fam".getBytes();
@@ -323,7 +321,8 @@ public class TestSerialization extends H
// Test filters are serialized properly.
scan = new Scan(startRow);
- byte [] prefix = Bytes.toBytes(getName());
+ final String name = "testScan";
+ byte [] prefix = Bytes.toBytes(name);
scan.setFilter(new PrefixFilter(prefix));
sb = Writables.getBytes(scan);
desScan = (Scan)Writables.getWritable(sb, new Scan());
@@ -338,7 +337,7 @@ public class TestSerialization extends H
assertEquals(tr.getMin(), desTr.getMin());
}
- public void testResultEmpty() throws Exception {
+ @Test public void testResultEmpty() throws Exception {
List<KeyValue> keys = new ArrayList<KeyValue>();
Result r = new Result(keys);
assertTrue(r.isEmpty());
@@ -348,7 +347,7 @@ public class TestSerialization extends H
}
- public void testResult() throws Exception {
+ @Test public void testResult() throws Exception {
byte [] rowA = Bytes.toBytes("rowA");
byte [] famA = Bytes.toBytes("famA");
byte [] qfA = Bytes.toBytes("qfA");
@@ -380,7 +379,7 @@ public class TestSerialization extends H
assertEquals(r.size(), deserialized.size());
}
- public void testResultDynamicBuild() throws Exception {
+ @Test public void testResultDynamicBuild() throws Exception {
byte [] rowA = Bytes.toBytes("rowA");
byte [] famA = Bytes.toBytes("famA");
byte [] qfA = Bytes.toBytes("qfA");
@@ -421,7 +420,7 @@ public class TestSerialization extends H
}
- public void testResultArray() throws Exception {
+ @Test public void testResultArray() throws Exception {
byte [] rowA = Bytes.toBytes("rowA");
byte [] famA = Bytes.toBytes("famA");
byte [] qfA = Bytes.toBytes("qfA");
@@ -470,7 +469,7 @@ public class TestSerialization extends H
}
- public void testResultArrayEmpty() throws Exception {
+ @Test public void testResultArrayEmpty() throws Exception {
List<KeyValue> keys = new ArrayList<KeyValue>();
Result r = new Result(keys);
Result [] results = new Result [] {r};
@@ -512,7 +511,7 @@ public class TestSerialization extends H
}
- public void testTimeRange(String[] args) throws Exception{
+ @Test public void testTimeRange() throws Exception{
TimeRange tr = new TimeRange(0,5);
byte [] mb = Writables.getBytes(tr);
TimeRange deserializedTr =
@@ -523,8 +522,9 @@ public class TestSerialization extends H
}
- public void testKeyValue2() throws Exception {
- byte[] row = getName().getBytes();
+ @Test public void testKeyValue2() throws Exception {
+ final String name = "testKeyValue2";
+ byte[] row = name.getBytes();
byte[] fam = "fam".getBytes();
byte[] qf = "qf".getBytes();
long ts = System.currentTimeMillis();
@@ -539,4 +539,48 @@ public class TestSerialization extends H
assertEquals(kv.getOffset(), deserializedKv.getOffset());
assertEquals(kv.getLength(), deserializedKv.getLength());
}
+
+ protected static final int MAXVERSIONS = 3;
+ protected final static byte [] fam1 = Bytes.toBytes("colfamily1");
+ protected final static byte [] fam2 = Bytes.toBytes("colfamily2");
+ protected final static byte [] fam3 = Bytes.toBytes("colfamily3");
+ protected static final byte [][] COLUMNS = {fam1, fam2, fam3};
+
+ /**
+ * Create a table of name <code>name</code> with {@link COLUMNS} for
+ * families.
+ * @param name Name to give table.
+ * @return Column descriptor.
+ */
+ protected HTableDescriptor createTableDescriptor(final String name) {
+ return createTableDescriptor(name, MAXVERSIONS);
+ }
+
+ /**
+ * Create a table of name <code>name</code> with {@link COLUMNS} for
+ * families.
+ * @param name Name to give table.
+ * @param versions How many versions to allow per column.
+ * @return Column descriptor.
+ */
+ protected HTableDescriptor createTableDescriptor(final String name,
+ final int versions) {
+ HTableDescriptor htd = new HTableDescriptor(name);
+ htd.addFamily(new HColumnDescriptor(fam1, versions,
+ HColumnDescriptor.DEFAULT_COMPRESSION, false, false,
+ Integer.MAX_VALUE, HConstants.FOREVER,
+ HColumnDescriptor.DEFAULT_BLOOMFILTER,
+ HConstants.REPLICATION_SCOPE_LOCAL));
+ htd.addFamily(new HColumnDescriptor(fam2, versions,
+ HColumnDescriptor.DEFAULT_COMPRESSION, false, false,
+ Integer.MAX_VALUE, HConstants.FOREVER,
+ HColumnDescriptor.DEFAULT_BLOOMFILTER,
+ HConstants.REPLICATION_SCOPE_LOCAL));
+ htd.addFamily(new HColumnDescriptor(fam3, versions,
+ HColumnDescriptor.DEFAULT_COMPRESSION, false, false,
+ Integer.MAX_VALUE, HConstants.FOREVER,
+ HColumnDescriptor.DEFAULT_BLOOMFILTER,
+ HConstants.REPLICATION_SCOPE_LOCAL));
+ return htd;
+ }
}
\ No newline at end of file
Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/OOMEHMaster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/OOMEHMaster.java?rev=986882&r1=986881&r2=986882&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/OOMEHMaster.java (original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/OOMEHMaster.java Wed Aug 18 19:32:08 2010
@@ -39,7 +39,7 @@ public class OOMEHMaster extends HMaster
private List<byte []> retainer = new ArrayList<byte[]>();
public OOMEHMaster(HBaseConfiguration conf)
- throws IOException, KeeperException {
+ throws IOException, KeeperException, InterruptedException {
super(conf);
}
Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java?rev=986882&r1=986881&r2=986882&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java (original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java Wed Aug 18 19:32:08 2010
@@ -199,11 +199,6 @@ public class TestActiveMasterManager {
private volatile boolean stopped;
@Override
- public ServerConnection getServerConnection() {
- return null;
- }
-
- @Override
public void abort(final String msg, final Throwable t) {}
@Override
@@ -212,11 +207,6 @@ public class TestActiveMasterManager {
}
@Override
- public HServerAddress getHServerAddress() {
- return null;
- }
-
- @Override
public ZooKeeperWatcher getZooKeeper() {
return null;
}
Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java?rev=986882&r1=986881&r2=986882&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java (original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java Wed Aug 18 19:32:08 2010
@@ -50,7 +50,7 @@ import static org.junit.Assert.*;
public class TestMaster {
private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
- private static final Log LOG = LogFactory.getLog(TestMasterWithDisabling.class);
+ private static final Log LOG = LogFactory.getLog(TestMaster.class);
private static final byte[] TABLENAME = Bytes.toBytes("TestMaster");
private static final byte[] FAMILYNAME = Bytes.toBytes("fam");
Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java?rev=986882&r1=986881&r2=986882&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java (original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java Wed Aug 18 19:32:08 2010
@@ -19,43 +19,24 @@
*/
package org.apache.hadoop.hbase.master;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.BindException;
-import java.util.Collection;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.HMsg;
import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HServerAddress;
-import org.apache.hadoop.hbase.HServerInfo;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
-import org.apache.hadoop.hbase.MiniHBaseCluster.MiniHBaseClusterRegionServer;
-import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.regionserver.HRegion;
-import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.util.Threads;
import org.apache.hadoop.hbase.util.Writables;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Test;
/**
* Test transitions of state across the master. Sets up the cluster once and
@@ -104,6 +85,7 @@ public class TestMasterTransitions {
* the requeuing, send over a close of a region on 'otherServer' so it comes
* into a master that has its meta region marked as offline.
*/
+ /*
static class HBase2428Listener implements RegionServerOperationListener {
// Map of what we've delayed so we don't do do repeated delays.
private final Set<RegionServerOperation> postponed =
@@ -164,12 +146,13 @@ public class TestMasterTransitions {
if (isWantedCloseOperation(op) != null) return;
this.done = true;
}
-
+*/
/*
* @param op
* @return Null if not the wanted ProcessRegionClose, else <code>op</code>
* cast as a ProcessRegionClose.
*/
+ /*
private ProcessRegionClose isWantedCloseOperation(final RegionServerOperation op) {
// Count every time we get a close operation.
if (op instanceof ProcessRegionClose) {
@@ -198,12 +181,13 @@ public class TestMasterTransitions {
return true;
}
}
-
+*/
/**
* In 2428, the meta region has just been set offline and then a close comes
* in.
* @see <a href="https://issues.apache.org/jira/browse/HBASE-2428">HBASE-2428</a>
*/
+/*
@Test (timeout=300000) public void testRegionCloseWhenNoMetaHBase2428()
throws Exception {
LOG.info("Running testRegionCloseWhenNoMetaHBase2428");
@@ -250,13 +234,14 @@ public class TestMasterTransitions {
unregisterRegionServerOperationListener(listener);
}
}
-
+*/
/**
* Test adding in a new server before old one on same host+port is dead.
* Make the test more onerous by having the server under test carry the meta.
* If confusion between old and new, purportedly meta never comes back. Test
* that meta gets redeployed.
*/
+ /*
@Test (timeout=300000) public void testAddingServerBeforeOldIsDead2413()
throws IOException {
LOG.info("Running testAddingServerBeforeOldIsDead2413");
@@ -299,7 +284,7 @@ public class TestMasterTransitions {
c.set(HConstants.REGIONSERVER_PORT, oldPort);
}
}
-
+*/
/**
* HBase2482 is about outstanding region openings. If any are outstanding
@@ -309,6 +294,7 @@ public class TestMasterTransitions {
* then we kill it. It also looks out for a close message on the victim
* server because that signifies start of the fireworks.
*/
+ /*
static class HBase2482Listener implements RegionServerOperationListener {
private final HRegionServer victim;
private boolean abortSent = false;
@@ -367,7 +353,7 @@ public class TestMasterTransitions {
}
}
}
-
+*/
/**
* In 2482, a RS with an opening region on it dies. The said region is then
* stuck in the master's regions-in-transition and never leaves it. This
@@ -382,7 +368,7 @@ public class TestMasterTransitions {
* done.
* @see <a href="https://issues.apache.org/jira/browse/HBASE-2482">HBASE-2482</a>
*/
- /*@Test (timeout=300000) */public void testKillRSWithOpeningRegion2482()
+ /*@Test (timeout=300000) *//*public void testKillRSWithOpeningRegion2482()
throws Exception {
LOG.info("Running testKillRSWithOpeningRegion2482");
MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
@@ -428,10 +414,11 @@ public class TestMasterTransitions {
unregisterRegionServerOperationListener(listener);
}
}
-
+*/
/*
* @return Count of all non-catalog regions on the designated server
*/
+/*
private int closeAllNonCatalogRegions(final MiniHBaseCluster cluster,
final MiniHBaseCluster.MiniHBaseClusterRegionServer hrs)
throws IOException {
@@ -460,6 +447,7 @@ public class TestMasterTransitions {
* @return Count of regions in meta table.
* @throws IOException
*/
+ /*
private static int countOfMetaRegions()
throws IOException {
HTable meta = new HTable(TEST_UTIL.getConfiguration(),
@@ -477,7 +465,7 @@ public class TestMasterTransitions {
s.close();
return rows;
}
-
+*/
/*
* Add to each of the regions in .META. a value. Key is the startrow of the
* region (except its 'aaa' for first region). Actual value is the row name.
Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestOldLogsCleaner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestOldLogsCleaner.java?rev=986882&r1=986881&r2=986882&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestOldLogsCleaner.java (original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestOldLogsCleaner.java Wed Aug 18 19:32:08 2010
@@ -21,25 +21,22 @@ package org.apache.hadoop.hbase.master;
import static org.junit.Assert.assertEquals;
+import java.net.URLEncoder;
+
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.Stoppable;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.conf.Configuration;
-
-import java.net.URLEncoder;
-import java.util.concurrent.atomic.AtomicBoolean;
-
public class TestOldLogsCleaner {
-
private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
@@ -74,13 +71,25 @@ public class TestOldLogsCleaner {
@Test
public void testLogCleaning() throws Exception{
Configuration c = TEST_UTIL.getConfiguration();
- Path oldLogDir = new Path(TEST_UTIL.getTestDir(),
+ Path oldLogDir = new Path(HBaseTestingUtility.getTestDir(),
HConstants.HREGION_OLDLOGDIR_NAME);
String fakeMachineName = URLEncoder.encode("regionserver:60020", "UTF8");
FileSystem fs = FileSystem.get(c);
- AtomicBoolean stop = new AtomicBoolean(false);
- OldLogsCleaner cleaner = new OldLogsCleaner(1000, stop,c, fs, oldLogDir);
+ Stoppable stoppable = new Stoppable() {
+ private volatile boolean stopped = false;
+
+ @Override
+ public void stop(String why) {
+ this.stopped = true;
+ }
+
+ @Override
+ public boolean isStopped() {
+ return this.stopped;
+ }
+ };
+ OldLogsCleaner cleaner = new OldLogsCleaner(1000, stoppable,c, fs, oldLogDir);
// Create 2 invalid files, 1 "recent" file, 1 very new file and 30 old files
long now = System.currentTimeMillis();
Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java?rev=986882&r1=986881&r2=986882&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java (original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java Wed Aug 18 19:32:08 2010
@@ -36,7 +36,7 @@ import org.apache.hadoop.hbase.client.Pu
public class OOMERegionServer extends HRegionServer {
private List<Put> retainer = new ArrayList<Put>();
- public OOMERegionServer(HBaseConfiguration conf) throws IOException {
+ public OOMERegionServer(HBaseConfiguration conf) throws IOException, InterruptedException {
super(conf);
}
Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java?rev=986882&r1=986881&r2=986882&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java (original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java Wed Aug 18 19:32:08 2010
@@ -132,7 +132,7 @@ public class TestWALReplay {
Path basedir = new Path(this.hbaseRootDir, tableNameStr);
deleteDir(basedir);
HLog wal = createWAL(this.conf);
- HRegion region = HRegion.openHRegion(hri, basedir, wal, this.conf);
+ HRegion region = HRegion.openHRegion(hri, wal, this.conf);
Path f = new Path(basedir, "hfile");
HFile.Writer writer = new HFile.Writer(this.fs, f);
byte [] family = hri.getTableDesc().getFamilies().iterator().next().getName();