Author: stack
Date: Tue Aug 31 06:32:50 2010
New Revision: 991090
URL: http://svn.apache.org/viewvc?rev=991090&view=rev
Log:
Fixing a few more tests (I love unit tests -- I love how the unit test that
tests x finds a problem in y).
M src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
javadoc
M src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
Logging.
M src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java
Mockito works nicely with our new Server Interface... don't even
have to make one... just give Server to mockito.
M src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
Formatting.
M src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
No longer neeed getTable method now I'm using MetaEditor.
M src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
M
src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
M
src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRootHandler.java
M
src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java
Remove redundant argument.
M src/main/java/org/apache/hadoop/hbase/regionserver/wal/LogActionsListener.java
Javadoc
M src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Return true if balancer ran.
M src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
Bug. I broke the filter for server in getServerRegions.
M src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java
I was looking ROOT instead of at META adding daughters.
Modified:
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/HMaster.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/regionserver/LogRoller.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRootHandler.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
Modified:
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java?rev=991090&r1=991089&r2=991090&view=diff
==============================================================================
---
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java
(original)
+++
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java
Tue Aug 31 06:32:50 2010
@@ -92,7 +92,7 @@ public class MetaEditor {
public static void addDaughter(final CatalogTracker catalogTracker,
final HRegionInfo regionInfo, final HServerInfo serverInfo)
throws NotAllMetaRegionsOnlineException, IOException {
- HRegionInterface server =
catalogTracker.waitForRootServerConnectionDefault();
+ HRegionInterface server =
catalogTracker.waitForMetaServerConnectionDefault();
byte [] catalogRegionName = CatalogTracker.META_REGION;
Put put = new Put(regionInfo.getRegionName());
addRegionInfo(put, regionInfo);
Modified:
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java?rev=991090&r1=991089&r2=991090&view=diff
==============================================================================
---
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
(original)
+++
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
Tue Aug 31 06:32:50 2010
@@ -296,10 +296,9 @@ public class MetaReader {
Result result;
while((result = metaServer.next(scannerid)) != null) {
if (result != null && result.size() > 0) {
- HRegionInfo hri = Writables.getHRegionInfo(
- result.getValue(HConstants.CATALOG_FAMILY,
- HConstants.REGIONINFO_QUALIFIER));
- hris.put(hri, result);
+ Pair<HRegionInfo, HServerAddress> pair = metaRowToRegionPair(result);
+ if (!pair.getSecond().equals(hsi.getServerAddress())) continue;
+ hris.put(pair.getFirst(), result);
}
}
return hris;
Modified:
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=991090&r1=991089&r2=991090&view=diff
==============================================================================
---
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
(original)
+++
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Tue Aug 31 06:32:50 2010
@@ -538,16 +538,17 @@ implements HMasterInterface, HMasterRegi
/**
* Run the balancer.
+ * @return True if balancer ran, false otherwise.
*/
- public void balance() {
+ public boolean balance() {
// If balance not true, don't run balancer.
- if (!this.balance) return;
+ if (!this.balance) return false;
synchronized (this.balancer) {
// Only allow one balance run at at time.
if (this.assignmentManager.isRegionsInTransition()) {
LOG.debug("Not running balancer because regions in transition: " +
this.assignmentManager.getRegionsInTransition());
- return;
+ return false;
}
Map<HServerInfo, List<HRegionInfo>> assignments =
this.assignmentManager.getAssignments();
@@ -560,11 +561,13 @@ implements HMasterInterface, HMasterRegi
}
}
List<RegionPlan> plans = this.balancer.balanceCluster(assignments);
- if (plans == null || plans.isEmpty()) return;
- for (RegionPlan plan: plans) {
- this.assignmentManager.balance(plan);
+ if (plans != null && !plans.isEmpty()) {
+ for (RegionPlan plan: plans) {
+ this.assignmentManager.balance(plan);
+ }
}
}
+ return true;
}
@Override
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=991090&r1=991089&r2=991090&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
Tue Aug 31 06:32:50 2010
@@ -936,6 +936,7 @@ public class HRegionServer implements HR
List<WALObserver> listeners = new ArrayList<WALObserver>();
// Log roller.
this.hlogRoller = new LogRoller(this, this);
+ listeners.add(this.hlogRoller);
if (this.replicationHandler != null) {
listeners = new ArrayList<WALObserver>();
// Replication handler is an implementation of WALActionsListener.
@@ -1833,11 +1834,11 @@ public class HRegionServer implements HR
LOG.info("Received request to open region: " +
region.getRegionNameAsString());
if(region.isRootRegion()) {
- this.service.submit(new OpenRootHandler(this, this, catalogTracker,
region));
+ this.service.submit(new OpenRootHandler(this, this, region));
} else if(region.isMetaRegion()) {
- this.service.submit(new OpenMetaHandler(this, this, catalogTracker,
region));
+ this.service.submit(new OpenMetaHandler(this, this, region));
} else {
- this.service.submit(new OpenRegionHandler(this, this, catalogTracker,
region));
+ this.service.submit(new OpenRegionHandler(this, this, region));
}
}
Modified:
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/LogRoller.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/LogRoller.java?rev=991090&r1=991089&r2=991090&view=diff
==============================================================================
---
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/LogRoller.java
(original)
+++
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/LogRoller.java
Tue Aug 31 06:32:50 2010
@@ -164,4 +164,4 @@ class LogRoller extends Thread implement
WALEdit logEdit) {
// Not interested.
}
-}
\ No newline at end of file
+}
Modified:
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java?rev=991090&r1=991089&r2=991090&view=diff
==============================================================================
---
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
(original)
+++
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
Tue Aug 31 06:32:50 2010
@@ -30,11 +30,9 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.Server;
import org.apache.hadoop.hbase.catalog.MetaEditor;
-import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.io.Reference.Range;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
@@ -267,8 +265,10 @@ class SplitTransaction {
private final Server server;
private final HRegion r;
- DaughterOpener(final Server s, final RegionServerServices services, final
HRegion r) {
+ DaughterOpener(final Server s, final RegionServerServices services,
+ final HRegion r) {
super(s.getServerName() + "-daughterOpener=" +
r.getRegionInfo().getEncodedName());
+ setDaemon(true);
this.services = services;
this.server = s;
this.r = r;
@@ -434,28 +434,6 @@ class SplitTransaction {
return new Path(splitdir, hri.getEncodedName());
}
- /*
- * @param r Parent region we want to edit.
- * @return An HTable instance against the meta table that holds passed
- * <code>r</code>; it has autoFlush enabled so we immediately send puts (No
- * buffering enabled).
- * @throws IOException
- */
- private HTable getTable(final Configuration conf) throws IOException {
- // When a region is split, the META table needs to updated if we're
- // splitting a 'normal' region, and the ROOT table needs to be
- // updated if we are splitting a META region.
- HTable t = null;
- if (this.parent.getRegionInfo().isMetaTable()) {
- t = new HTable(conf, HConstants.ROOT_TABLE_NAME);
- } else {
- t = new HTable(conf, HConstants.META_TABLE_NAME);
- }
- // Flush puts as we send them -- no buffering.
- t.setAutoFlush(true);
- return t;
- }
-
/**
* @param or Object that can online/offline parent region. Can be passed
null
* by unit tests.
Modified:
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java?rev=991090&r1=991089&r2=991090&view=diff
==============================================================================
---
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java
(original)
+++
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java
Tue Aug 31 06:32:50 2010
@@ -21,7 +21,6 @@ package org.apache.hadoop.hbase.regionse
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.Server;
-import org.apache.hadoop.hbase.catalog.CatalogTracker;
import org.apache.hadoop.hbase.regionserver.RegionServerServices;
/**
@@ -31,8 +30,7 @@ import org.apache.hadoop.hbase.regionser
*/
public class OpenMetaHandler extends OpenRegionHandler {
public OpenMetaHandler(final Server server,
- final RegionServerServices rsServices,
- CatalogTracker catalogTracker, HRegionInfo regionInfo) {
- super(server,rsServices, catalogTracker, regionInfo,
EventType.M2RS_OPEN_META);
+ final RegionServerServices rsServices, HRegionInfo regionInfo) {
+ super(server,rsServices, regionInfo, EventType.M2RS_OPEN_META);
}
}
Modified:
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java?rev=991090&r1=991089&r2=991090&view=diff
==============================================================================
---
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
(original)
+++
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
Tue Aug 31 06:32:50 2010
@@ -26,7 +26,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.Server;
-import org.apache.hadoop.hbase.catalog.CatalogTracker;
import org.apache.hadoop.hbase.executor.EventHandler;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.RegionServerServices;
@@ -45,24 +44,18 @@ public class OpenRegionHandler extends E
private final RegionServerServices rsServices;
- private final CatalogTracker catalogTracker;
-
private final HRegionInfo regionInfo;
public OpenRegionHandler(final Server server,
- final RegionServerServices rsServices,
- CatalogTracker catalogTracker, HRegionInfo regionInfo) {
- this(server, rsServices, catalogTracker, regionInfo,
- EventType.M2RS_OPEN_REGION);
+ final RegionServerServices rsServices, HRegionInfo regionInfo) {
+ this(server, rsServices, regionInfo, EventType.M2RS_OPEN_REGION);
}
protected OpenRegionHandler(final Server server,
- final RegionServerServices rsServices,
- CatalogTracker catalogTracker, HRegionInfo regionInfo,
+ final RegionServerServices rsServices, final HRegionInfo regionInfo,
EventType eventType) {
super(server, eventType);
this.rsServices = rsServices;
- this.catalogTracker = catalogTracker;
this.regionInfo = regionInfo;
}
Modified:
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRootHandler.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRootHandler.java?rev=991090&r1=991089&r2=991090&view=diff
==============================================================================
---
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRootHandler.java
(original)
+++
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRootHandler.java
Tue Aug 31 06:32:50 2010
@@ -21,7 +21,6 @@ package org.apache.hadoop.hbase.regionse
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.Server;
-import org.apache.hadoop.hbase.catalog.CatalogTracker;
import org.apache.hadoop.hbase.regionserver.RegionServerServices;
/**
@@ -31,8 +30,7 @@ import org.apache.hadoop.hbase.regionser
*/
public class OpenRootHandler extends OpenRegionHandler {
public OpenRootHandler(final Server server,
- final RegionServerServices rsServices,
- CatalogTracker catalogTracker, HRegionInfo regionInfo) {
- super(server, rsServices, catalogTracker, regionInfo,
EventType.M2RS_OPEN_ROOT);
+ final RegionServerServices rsServices, HRegionInfo regionInfo) {
+ super(server, rsServices, regionInfo, EventType.M2RS_OPEN_ROOT);
}
}
Modified:
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java?rev=991090&r1=991089&r2=991090&view=diff
==============================================================================
---
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
(original)
+++
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
Tue Aug 31 06:32:50 2010
@@ -74,9 +74,9 @@ import org.apache.zookeeper.ZooKeeper;
import com.google.common.base.Preconditions;
/**
- * Facility for testing HBase. Added as tool to abet junit4 testing. Replaces
+ * Facility for testing HBase. Replacement for
* old HBaseTestCase and HBaseCluserTestCase functionality.
- * Create an instance and keep it around doing HBase testing. This class is
+ * Create an instance and keep it around testing HBase. This class is
* meant to be your one-stop shop for anything you might need testing. Manages
* one cluster at a time only. Depends on log4j being on classpath and
* hbase-site.xml for logging and test-run configuration. It does not set
Modified:
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java?rev=991090&r1=991089&r2=991090&view=diff
==============================================================================
---
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
(original)
+++
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
Tue Aug 31 06:32:50 2010
@@ -104,31 +104,32 @@ public class TestRegionRebalancing exten
LOG.debug("Adding 2nd region server.");
// add a region server - total of 2
- cluster.startRegionServer();
- while (cluster.getMaster().getServerManager().getOnlineServers().size() <
2) {
- Threads.sleep(100);
- }
+ LOG.info("Started=" +
+ cluster.startRegionServer().getRegionServer().getServerName());
cluster.getMaster().balance();
assertRegionsAreBalanced();
// add a region server - total of 3
LOG.debug("Adding 3rd region server.");
- cluster.startRegionServer();
+ LOG.info("Started=" +
+ cluster.startRegionServer().getRegionServer().getServerName());
cluster.getMaster().balance();
assertRegionsAreBalanced();
// kill a region server - total of 2
LOG.debug("Killing the 3rd region server.");
- cluster.stopRegionServer(2, false);
+ LOG.info("Stopped=" + cluster.stopRegionServer(2, false));
cluster.waitOnRegionServer(2);
cluster.getMaster().balance();
assertRegionsAreBalanced();
// start two more region servers - total of 4
LOG.debug("Adding 3rd region server");
- cluster.startRegionServer();
+ LOG.info("Started=" +
+ cluster.startRegionServer().getRegionServer().getServerName());
LOG.debug("Adding 4th region server");
- cluster.startRegionServer();
+ LOG.info("Started=" +
+ cluster.startRegionServer().getRegionServer().getServerName());
cluster.getMaster().balance();
assertRegionsAreBalanced();
@@ -178,7 +179,7 @@ public class TestRegionRebalancing exten
LOG.debug(server.getServerName() + " Avg: " + avg + " actual: " +
serverLoad);
if (!(avg > 2.0 && serverLoad <= avgLoadPlusSlop
&& serverLoad >= avgLoadMinusSlop)) {
- LOG.debug(server.hashCode() + " Isn't balanced!!! Avg: " + avg +
+ LOG.debug(server.getServerName() + " Isn't balanced!!! Avg: " + avg +
" actual: " + serverLoad + " slop: " + slop);
success = false;
}
Modified:
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java?rev=991090&r1=991089&r2=991090&view=diff
==============================================================================
---
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java
(original)
+++
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java
Tue Aug 31 06:32:50 2010
@@ -37,6 +37,7 @@ import org.apache.hadoop.hbase.HConstant
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.Server;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.regionserver.wal.HLog;
import org.apache.hadoop.hbase.util.Bytes;
@@ -44,6 +45,7 @@ import org.apache.hadoop.hbase.util.Pair
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.Mockito;
/**
* Test the {...@link SplitTransaction} class against an HRegion (as opposed to
@@ -69,6 +71,7 @@ public class TestSplitTransaction {
new Path(this.testdir, "archive"),
TEST_UTIL.getConfiguration());
this.parent = createRegion(this.testdir, this.wal);
+ TEST_UTIL.getConfiguration().setBoolean("hbase.testing.nocluster", true);
}
@After public void teardown() throws IOException {
@@ -128,7 +131,9 @@ public class TestSplitTransaction {
SplitTransaction st = prepareGOOD_SPLIT_ROW();
// Run the execute. Look at what it returns.
- PairOfSameType<HRegion> daughters = st.execute(null, null);
+ Server mockServer = Mockito.mock(Server.class);
+
when(mockServer.getConfiguration()).thenReturn(TEST_UTIL.getConfiguration());
+ PairOfSameType<HRegion> daughters = st.execute(mockServer, null);
// Do some assertions about execution.
assertTrue(this.fs.exists(st.getSplitDir()));
// Assert the parent region is closed.
@@ -178,8 +183,10 @@ public class TestSplitTransaction {
thenThrow(new MockedFailedDaughterCreation());
// Run the execute. Look at what it returns.
boolean expectedException = false;
+ Server mockServer = Mockito.mock(Server.class);
+
when(mockServer.getConfiguration()).thenReturn(TEST_UTIL.getConfiguration());
try {
- spiedUponSt.execute(null, null);
+ spiedUponSt.execute(mockServer, null);
} catch (MockedFailedDaughterCreation e) {
expectedException = true;
}
@@ -198,7 +205,7 @@ public class TestSplitTransaction {
// Now retry the split but do not throw an exception this time.
assertTrue(st.prepare());
- PairOfSameType<HRegion> daughters = st.execute(null, null);
+ PairOfSameType<HRegion> daughters = st.execute(mockServer, null);
// Count rows.
int daughtersRowCount = 0;
for (HRegion r: daughters) {
Modified:
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java?rev=991090&r1=991089&r2=991090&view=diff
==============================================================================
---
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
(original)
+++
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
Tue Aug 31 06:32:50 2010
@@ -261,6 +261,7 @@ public class TestLogRolling {
InvocationTargetException {
assertTrue("This test requires HLog file replication.",
fs.getDefaultReplication() > 1);
+ LOG.info("Replication=" + fs.getDefaultReplication());
// When the META table can be opened, the region servers are running
new HTable(TEST_UTIL.getConfiguration(), HConstants.META_TABLE_NAME);
@@ -302,8 +303,7 @@ public class TestLogRolling {
assertTrue("Log should have a timestamp older than now",
curTime > oldFilenum && oldFilenum != -1);
- assertTrue("The log shouldn't have rolled yet", oldFilenum == log
- .getFilenum());
+ assertTrue("The log shouldn't have rolled yet", oldFilenum ==
log.getFilenum());
DatanodeInfo[] pipeline = getPipeline(log);
assertTrue(pipeline.length == fs.getDefaultReplication());
