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/10 01:42:03 UTC
svn commit: r983842 - in /hbase/branches/0.90_master_rewrite/src:
main/java/org/apache/hadoop/hbase/ main/java/org/apache/hadoop/hbase/catalog/
main/java/org/apache/hadoop/hbase/master/
main/java/org/apache/hadoop/hbase/regionserver/wal/ main/java/org/...
Author: stack
Date: Mon Aug 9 23:42:02 2010
New Revision: 983842
URL: http://svn.apache.org/viewvc?rev=983842&view=rev
Log:
Didn't add much in this commit. Fixed a unit test and then realized shutdown server
stuff needs implementing for other tests to pass.
Removed historian from the schema we create on bootstrap.
Cleaned up reflection exception thrown if can't create HMaster
M src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java
Javadoc and fixed up dummy master (Dummy master actually works here; i.e.
we can pass an implementation of Server that does nothing really and
ActiveMasterManager is happy with it... round of applause! One objective
of rewrite achieved! I tried to pass in empty items for the assignment
manager but that one wasn't happy with what I was passing; it wants to
make connections to regionservers. Let me see if I can undo that)
Modified:
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/HConstants.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
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/AssignmentManager.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/master/OldLogsCleaner.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/RootRegionTracker.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/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.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/TestKillingServersFromMaster.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterAddressManager.java
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/HConstants.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/HConstants.java?rev=983842&r1=983841&r2=983842&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/HConstants.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/HConstants.java Mon Aug 9 23:42:02 2010
@@ -200,9 +200,6 @@ public final class HConstants {
/** The catalog family */
public static final byte [] CATALOG_FAMILY = Bytes.toBytes(CATALOG_FAMILY_STR);
- /** The catalog historian family */
- public static final byte [] CATALOG_HISTORIAN_FAMILY = Bytes.toBytes("historian");
-
/** The regioninfo column qualifier */
public static final byte [] REGIONINFO_QUALIFIER = Bytes.toBytes("regioninfo");
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java?rev=983842&r1=983841&r2=983842&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java Mon Aug 9 23:42:02 2010
@@ -678,10 +678,5 @@ public class HTableDescriptor implements
10, // Ten is arbitrary number. Keep versions to help debuggging.
Compression.Algorithm.NONE.getName(), true, true, 8 * 1024,
HConstants.FOREVER, StoreFile.BloomType.NONE.toString(),
- HConstants.REPLICATION_SCOPE_LOCAL),
- new HColumnDescriptor(HConstants.CATALOG_HISTORIAN_FAMILY,
- HConstants.ALL_VERSIONS, Compression.Algorithm.NONE.getName(),
- false, false, 8 * 1024,
- HConstants.WEEK_IN_SECONDS,StoreFile.BloomType.NONE.toString(),
HConstants.REPLICATION_SCOPE_LOCAL)});
}
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=983842&r1=983841&r2=983842&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 Mon Aug 9 23:42:02 2010
@@ -330,4 +330,4 @@ public class CatalogTracker {
return false;
}
}
-}
+}
\ No newline at end of file
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=983842&r1=983841&r2=983842&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Mon Aug 9 23:42:02 2010
@@ -56,7 +56,6 @@ import org.apache.hadoop.hbase.zookeeper
import org.apache.hadoop.hbase.zookeeper.ZKTableDisable;
import org.apache.hadoop.hbase.zookeeper.ZKUtil;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperListener;
-import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
import org.apache.hadoop.hbase.zookeeper.ZKUtil.NodeAndData;
import org.apache.hadoop.io.Writable;
import org.apache.zookeeper.KeeperException;
@@ -111,12 +110,13 @@ public class AssignmentManager extends Z
*
* <p>This manager must be started with {@link #start()}.
*
- * @param watcher zookeeper watcher
* @param status master status
+ * @param serverManager
+ * @param catalogTracker
*/
- public AssignmentManager(ZooKeeperWatcher watcher, Server master,
- ServerManager serverManager, CatalogTracker catalogTracker) {
- super(watcher);
+ public AssignmentManager(Server master, ServerManager serverManager,
+ CatalogTracker catalogTracker) {
+ super(master.getZooKeeper());
this.master = master;
this.serverManager = serverManager;
this.catalogTracker = catalogTracker;
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=983842&r1=983841&r2=983842&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 Mon Aug 9 23:42:02 2010
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
import java.net.UnknownHostException;
import java.util.concurrent.atomic.AtomicReference;
@@ -212,8 +213,7 @@ implements HMasterInterface, HMasterRegi
serverManager);
catalogTracker = new CatalogTracker(zooKeeper, connection, this,
conf.getInt("hbase.master.catalog.timeout", 30000));
- assignmentManager = new AssignmentManager(zooKeeper, this,
- serverManager, catalogTracker);
+ assignmentManager = new AssignmentManager(this, serverManager, catalogTracker);
clusterStatusTracker = new ClusterStatusTracker(getZooKeeper(), this);
/*
@@ -767,10 +767,15 @@ implements HMasterInterface, HMasterRegi
Constructor<? extends HMaster> c =
masterClass.getConstructor(Configuration.class);
return c.newInstance(conf);
+ } catch (InvocationTargetException ite) {
+ Throwable target = ite.getTargetException();
+ throw new RuntimeException("Failed construction of Master: " +
+ masterClass.toString() + ((target.getCause() != null)?
+ target.getCause().getMessage(): ""), target);
} catch (Exception e) {
- throw new RuntimeException("Failed construction of " +
- "Master: " + masterClass.toString() +
- ((e.getCause() != null)? e.getCause().getMessage(): ""), e);
+ throw new RuntimeException("Failed construction of Master: " +
+ masterClass.toString() + ((e.getCause() != null)?
+ e.getCause().getMessage(): ""), e);
}
}
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=983842&r1=983841&r2=983842&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 Mon Aug 9 23:42:02 2010
@@ -89,6 +89,7 @@ public class OldLogsCleaner extends Chor
protected void chore() {
try {
FileStatus[] files = this.fs.listStatus(this.oldLogDir);
+ if (files == null) return;
int nbDeletedLog = 0;
for (FileStatus file : files) {
Path filePath = file.getPath();
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java?rev=983842&r1=983841&r2=983842&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java Mon Aug 9 23:42:02 2010
@@ -142,7 +142,7 @@ public class ServerManager {
/**
* Constructor.
* @param master
- * @param masterMetrics
+ * @param masterMetrics If null, we won't pass metrics.
* @param masterFileSystem
*/
public ServerManager(Server master,
@@ -411,7 +411,7 @@ public class ServerManager {
// Refresh the info object and the load information
this.onlineServers.put(serverInfo.getServerName(), serverInfo);
HServerLoad load = serverInfo.getLoad();
- if(load != null) {
+ if(load != null && this.masterMetrics != null) {
masterMetrics.incrementRequests(load.getNumberOfRequests());
}
// No more piggyback messages on heartbeats for other stuff
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java?rev=983842&r1=983841&r2=983842&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java Mon Aug 9 23:42:02 2010
@@ -73,6 +73,7 @@ import org.apache.hadoop.hbase.util.Clas
import org.apache.hadoop.hbase.util.FSUtils;
import org.apache.hadoop.hbase.util.Threads;
import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.util.StringUtils;
import com.google.common.util.concurrent.NamingThreadFactory;
@@ -327,8 +328,9 @@ public class HLog implements Syncable {
}
this.maxLogs = conf.getInt("hbase.regionserver.maxlogs", 32);
this.enabled = conf.getBoolean("hbase.regionserver.hlog.enabled", true);
- LOG.info("HLog configuration: blocksize=" + this.blocksize +
- ", rollsize=" + this.logrollsize +
+ LOG.info("HLog configuration: blocksize=" +
+ StringUtils.byteDesc(this.blocksize) +
+ ", rollsize=" + StringUtils.byteDesc(this.logrollsize) +
", enabled=" + this.enabled +
", flushlogentries=" + this.flushlogentries +
", optionallogflushinternal=" + this.optionalFlushInterval + "ms");
@@ -888,7 +890,7 @@ public class HLog implements Syncable {
LOG.error("Error while syncing, requesting close of hlog ", e);
requestLogRoll();
} catch (InterruptedException e) {
- LOG.debug(getName() + "interrupted while waiting for sync requests");
+ LOG.debug(getName() + " interrupted while waiting for sync requests");
} finally {
syncerShuttingDown = true;
syncDone.signalAll();
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/RootRegionTracker.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/RootRegionTracker.java?rev=983842&r1=983841&r2=983842&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/RootRegionTracker.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/RootRegionTracker.java Mon Aug 9 23:42:02 2010
@@ -69,4 +69,4 @@ public class RootRegionTracker extends Z
byte [] data = super.blockUntilAvailable(timeout);
return data == null ? null : new HServerAddress(Bytes.toString(data));
}
-}
+}
\ 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=983842&r1=983841&r2=983842&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 Mon Aug 9 23:42:02 2010
@@ -19,7 +19,6 @@
*/
package org.apache.hadoop.hbase.zookeeper;
-import org.apache.commons.logging.Log;
import org.apache.hadoop.hbase.Abortable;
import org.apache.zookeeper.KeeperException;
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java?rev=983842&r1=983841&r2=983842&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java Mon Aug 9 23:42:02 2010
@@ -92,7 +92,6 @@ public class ZooKeeperWatcher implements
public ZooKeeperWatcher(Configuration conf, String name,
Abortable abortable)
throws IOException {
-// super(conf, name);
this.name = name;
this.quorum = ZKConfig.getZKQuorumServersString(conf);
this.zooKeeper = ZKUtil.connect(conf, quorum, this);
Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java?rev=983842&r1=983841&r2=983842&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java (original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java Mon Aug 9 23:42:02 2010
@@ -65,7 +65,7 @@ public class TestHBaseTestingUtility {
@Test public void testMiniCluster() throws Exception {
MiniHBaseCluster cluster = this.hbt.startMiniCluster();
try {
-
+ assertEquals(1, cluster.getLiveRegionServerThreads().size());
} finally {
cluster.shutdown();
}
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=983842&r1=983841&r2=983842&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 Mon Aug 9 23:42:02 2010
@@ -24,13 +24,13 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertTrue;
import java.util.concurrent.Semaphore;
-import java.util.concurrent.atomic.AtomicBoolean;
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.HServerAddress;
+import org.apache.hadoop.hbase.Server;
import org.apache.hadoop.hbase.client.ServerConnection;
import org.apache.hadoop.hbase.zookeeper.ZKUtil;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperListener;
@@ -40,9 +40,11 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+/**
+ * Test the {@link ActiveMasterManager}.
+ */
public class TestActiveMasterManager {
- private static final Log LOG = LogFactory.getLog(TestActiveMasterManager.class);
-
+ private final static Log LOG = LogFactory.getLog(TestActiveMasterManager.class);
private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
@BeforeClass
@@ -54,6 +56,7 @@ public class TestActiveMasterManager {
public static void tearDownAfterClass() throws Exception {
TEST_UTIL.shutdownMiniZKCluster();
}
+
/**
* Unit tests that uses ZooKeeper but does not use the master-side methods
* but rather acts directly on ZK.
@@ -74,7 +77,7 @@ public class TestActiveMasterManager {
HServerAddress secondMasterAddress = new HServerAddress("secondMaster", 1234);
// Should not have a master yet
- DummyMasterStatus ms1 = new DummyMasterStatus();
+ DummyMaster ms1 = new DummyMaster();
ActiveMasterManager activeMasterManager = new ActiveMasterManager(zk,
firstMasterAddress, ms1);
zk.registerListener(activeMasterManager);
@@ -104,7 +107,7 @@ public class TestActiveMasterManager {
assertFalse(t.isActiveMaster);
// Close the first server and delete it's master node
- ms1.setClosed();
+ ms1.stop("stopping first server");
// Use a listener to capture when the node is actually deleted
NodeDeletionListener listener = new NodeDeletionListener(zk, zk.masterAddressZNode);
@@ -152,7 +155,7 @@ public class TestActiveMasterManager {
public WaitToBeMasterThread(ZooKeeperWatcher zk,
HServerAddress address) {
this.manager = new ActiveMasterManager(zk, address,
- new DummyMasterStatus());
+ new DummyMaster());
isActiveMaster = false;
}
@@ -189,19 +192,11 @@ public class TestActiveMasterManager {
}
}
- public static class DummyMasterStatus implements MasterController {
-
- private AtomicBoolean closed = new AtomicBoolean(false);
-
- @Override
- public AtomicBoolean getClosed() {
- return closed;
- }
-
- @Override
- public MasterFileSystem getFileSystemManager() {
- return null;
- }
+ /**
+ * Dummy Master Implementation.
+ */
+ public static class DummyMaster implements Server {
+ private volatile boolean stopped;
@Override
public ServerConnection getServerConnection() {
@@ -209,40 +204,6 @@ public class TestActiveMasterManager {
}
@Override
- public ServerManager getServerManager() {
- return null;
- }
-
- @Override
- public AtomicBoolean getShutdownRequested() {
- return null;
- }
-
- @Override
- public boolean isClosed() {
- return closed.get();
- }
-
- @Override
- public boolean isClusterStartup() {
- return false;
- }
-
- @Override
- public void setClosed() {
- closed.set(true);
- }
-
- @Override
- public void setClusterStartup(boolean isClusterStartup) {}
-
- @Override
- public void shutdown() {}
-
- @Override
- public void startShutdown() {}
-
- @Override
public void abort(final String msg, final Throwable t) {}
@Override
@@ -266,14 +227,13 @@ public class TestActiveMasterManager {
}
@Override
- public boolean isRegionServer() {
- return false;
+ public boolean isStopped() {
+ return this.stopped;
}
@Override
- public long getTimeout() {
- return 0;
+ public void stop(String why) {
+ this.stopped = true;
}
-
}
}
Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestKillingServersFromMaster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestKillingServersFromMaster.java?rev=983842&r1=983841&r2=983842&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestKillingServersFromMaster.java (original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestKillingServersFromMaster.java Mon Aug 9 23:42:02 2010
@@ -20,7 +20,6 @@
package org.apache.hadoop.hbase.master;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import java.io.IOException;
@@ -28,9 +27,8 @@ import org.apache.hadoop.hbase.HBaseTest
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.YouAreDeadException;
-import org.apache.hadoop.hbase.regionserver.HRegionServer;
+import org.apache.hadoop.hbase.MiniHBaseCluster.MiniHBaseClusterRegionServer;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java?rev=983842&r1=983841&r2=983842&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java (original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java Mon Aug 9 23:42:02 2010
@@ -62,7 +62,7 @@ public class TestRestartCluster {
}
@AfterClass public static void afterAllTests() throws IOException {
-// utility.shutdownMiniCluster();
+ utility.shutdownMiniCluster();
}
@Before public void setup() throws IOException {
@@ -118,11 +118,11 @@ public class TestRestartCluster {
String unassignedZNode = zooKeeper.assignmentZNode;
ZKUtil.createAndFailSilent(zooKeeper, unassignedZNode);
- ZKAssign.createNodeOffline(zooKeeper,
- HRegionInfo.ROOT_REGIONINFO.getEncodedName(), HMaster.MASTER);
+ ZKAssign.createNodeOffline(zooKeeper, HRegionInfo.ROOT_REGIONINFO,
+ HMaster.MASTER);
- ZKAssign.createNodeOffline(zooKeeper,
- HRegionInfo.FIRST_META_REGIONINFO.getEncodedName(), HMaster.MASTER);
+ ZKAssign.createNodeOffline(zooKeeper, HRegionInfo.FIRST_META_REGIONINFO,
+ HMaster.MASTER);
LOG.debug("Created UNASSIGNED zNode for ROOT and META regions in state " +
EventType.M2ZK_REGION_OFFLINE);
Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterAddressManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterAddressManager.java?rev=983842&r1=983841&r2=983842&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterAddressManager.java (original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterAddressManager.java Mon Aug 9 23:42:02 2010
@@ -28,6 +28,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HServerAddress;
+import org.apache.hadoop.hbase.MasterAddressTracker;
import org.apache.hadoop.hbase.zookeeper.ZKUtil;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperListener;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
@@ -62,7 +63,7 @@ public class TestMasterAddressManager {
ZKUtil.createAndFailSilent(zk, zk.baseZNode);
// Should not have a master yet
- MasterAddressManager addressManager = new MasterAddressManager(zk, null);
+ MasterAddressTracker addressManager = new MasterAddressTracker(zk, null);
addressManager.start();
assertFalse(addressManager.hasMaster());
zk.registerListener(addressManager);