You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nk...@apache.org on 2013/11/20 21:06:17 UTC
svn commit: r1543923 [2/2] - in /hbase/branches/0.96:
hbase-client/src/main/java/org/apache/hadoop/hbase/
hbase-client/src/main/java/org/apache/hadoop/hbase/client/
hbase-client/src/main/java/org/apache/hadoop/hbase/exceptions/
hbase-client/src/main/ja...
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java?rev=1543923&r1=1543922&r2=1543923&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java Wed Nov 20 20:06:16 2013
@@ -121,7 +121,7 @@ public class TestStochasticLoadBalancer
@Test
public void testKeepRegionLoad() throws Exception {
- ServerName sn = new ServerName("test:8080", 100);
+ ServerName sn = ServerName.valueOf("test:8080", 100);
int numClusterStatusToAdd = 20000;
for (int i = 0; i < numClusterStatusToAdd; i++) {
ServerLoad sl = mock(ServerLoad.class);
@@ -267,7 +267,7 @@ public class TestStochasticLoadBalancer
ServerName sn = serverMap.keySet().toArray(new ServerName[serverMap.size()])[0];
- ServerName deadSn = new ServerName(sn.getHostname(), sn.getPort(), sn.getStartcode() -100);
+ ServerName deadSn = ServerName.valueOf(sn.getHostname(), sn.getPort(), sn.getStartcode() - 100);
serverMap.put(deadSn, new ArrayList<HRegionInfo>(0));
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java?rev=1543923&r1=1543922&r2=1543923&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java Wed Nov 20 20:06:16 2013
@@ -215,7 +215,7 @@ public class TestHFileCleaner {
@Override
public ServerName getServerName() {
- return new ServerName("regionserver,60020,000000");
+ return ServerName.valueOf("regionserver,60020,000000");
}
@Override
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java?rev=1543923&r1=1543922&r2=1543923&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java Wed Nov 20 20:06:16 2013
@@ -151,7 +151,7 @@ public class TestHFileLinkCleaner {
@Override
public ServerName getServerName() {
- return new ServerName("regionserver,60020,000000");
+ return ServerName.valueOf("regionserver,60020,000000");
}
@Override
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java?rev=1543923&r1=1543922&r2=1543923&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java Wed Nov 20 20:06:16 2013
@@ -28,7 +28,6 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.*;
import org.apache.hadoop.hbase.catalog.CatalogTracker;
-import org.apache.hadoop.hbase.master.cleaner.LogCleaner;
import org.apache.hadoop.hbase.replication.ReplicationFactory;
import org.apache.hadoop.hbase.replication.ReplicationQueues;
import org.apache.hadoop.hbase.replication.regionserver.Replication;
@@ -153,7 +152,7 @@ public class TestLogsCleaner {
@Override
public ServerName getServerName() {
- return new ServerName("regionserver,60020,000000");
+ return ServerName.valueOf("regionserver,60020,000000");
}
@Override
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterAddressManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterAddressManager.java?rev=1543923&r1=1543922&r2=1543923&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterAddressManager.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterAddressManager.java Wed Nov 20 20:06:16 2013
@@ -75,7 +75,7 @@ public class TestMasterAddressManager {
// Create the master node with a dummy address
String host = "localhost";
int port = 1234;
- ServerName sn = new ServerName(host, port, System.currentTimeMillis());
+ ServerName sn = ServerName.valueOf(host, port, System.currentTimeMillis());
LOG.info("Creating master node");
MasterAddressTracker.setMasterAddress(zk, zk.getMasterAddressZNode(), sn);
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java?rev=1543923&r1=1543922&r2=1543923&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java Wed Nov 20 20:06:16 2013
@@ -56,12 +56,12 @@ public class TestRSStatusServlet {
static final int FAKE_WEB_PORT = 1586;
private final ServerName fakeServerName =
- new ServerName("localhost", FAKE_IPC_PORT, 11111);
+ ServerName.valueOf("localhost", FAKE_IPC_PORT, 11111);
private final GetServerInfoResponse fakeResponse =
ResponseConverter.buildGetServerInfoResponse(fakeServerName, FAKE_WEB_PORT);
private final ServerName fakeMasterAddress =
- new ServerName("localhost", 60010, 1212121212);
+ ServerName.valueOf("localhost", 60010, 1212121212);
@Before
public void setupBasicMocks() throws IOException, ServiceException {
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java?rev=1543923&r1=1543922&r2=1543923&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java Wed Nov 20 20:06:16 2013
@@ -48,7 +48,7 @@ import org.junit.experimental.categories
@Category(MediumTests.class)
public class TestSplitLogWorker {
private static final Log LOG = LogFactory.getLog(TestSplitLogWorker.class);
- private final ServerName MANAGER = new ServerName("manager,1,1");
+ private final ServerName MANAGER = ServerName.valueOf("manager,1,1");
static {
Logger.getLogger("org.apache.hadoop.hbase").setLevel(Level.DEBUG);
}
@@ -131,9 +131,9 @@ public class TestSplitLogWorker {
LOG.info("testAcquireTaskAtStartup");
SplitLogCounters.resetCounters();
final String TATAS = "tatas";
- final ServerName RS = new ServerName("rs,1,1");
+ final ServerName RS = ServerName.valueOf("rs,1,1");
zkw.getRecoverableZooKeeper().create(ZKSplitLog.getEncodedNodeName(zkw, TATAS),
- new SplitLogTask.Unassigned(new ServerName("mgr,1,1")).toByteArray(), Ids.OPEN_ACL_UNSAFE,
+ new SplitLogTask.Unassigned(ServerName.valueOf("mgr,1,1")).toByteArray(), Ids.OPEN_ACL_UNSAFE,
CreateMode.PERSISTENT);
SplitLogWorker slw = new SplitLogWorker(zkw, TEST_UTIL.getConfiguration(), RS, neverEndingTask);
@@ -164,8 +164,8 @@ public class TestSplitLogWorker {
LOG.info("testRaceForTask");
SplitLogCounters.resetCounters();
final String TRFT = "trft";
- final ServerName SVR1 = new ServerName("svr1,1,1");
- final ServerName SVR2 = new ServerName("svr2,1,1");
+ final ServerName SVR1 = ServerName.valueOf("svr1,1,1");
+ final ServerName SVR2 = ServerName.valueOf("svr2,1,1");
zkw.getRecoverableZooKeeper().create(ZKSplitLog.getEncodedNodeName(zkw, TRFT),
new SplitLogTask.Unassigned(MANAGER).toByteArray(), Ids.OPEN_ACL_UNSAFE,
CreateMode.PERSISTENT);
@@ -193,7 +193,7 @@ public class TestSplitLogWorker {
public void testPreemptTask() throws Exception {
LOG.info("testPreemptTask");
SplitLogCounters.resetCounters();
- final ServerName SRV = new ServerName("tpt_svr,1,1");
+ final ServerName SRV = ServerName.valueOf("tpt_svr,1,1");
final String PATH = ZKSplitLog.getEncodedNodeName(zkw, "tpt_task");
SplitLogWorker slw = new SplitLogWorker(zkw, TEST_UTIL.getConfiguration(), SRV, neverEndingTask);
slw.start();
@@ -224,7 +224,7 @@ public class TestSplitLogWorker {
public void testMultipleTasks() throws Exception {
LOG.info("testMultipleTasks");
SplitLogCounters.resetCounters();
- final ServerName SRV = new ServerName("tmt_svr,1,1");
+ final ServerName SRV = ServerName.valueOf("tmt_svr,1,1");
final String PATH1 = ZKSplitLog.getEncodedNodeName(zkw, "tmt_task");
SplitLogWorker slw = new SplitLogWorker(zkw, TEST_UTIL.getConfiguration(), SRV, neverEndingTask);
slw.start();
@@ -246,7 +246,7 @@ public class TestSplitLogWorker {
Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
// preempt the first task, have it owned by another worker
- final ServerName anotherWorker = new ServerName("another-worker,1,1");
+ final ServerName anotherWorker = ServerName.valueOf("another-worker,1,1");
SplitLogTask slt = new SplitLogTask.Owned(anotherWorker);
ZKUtil.setData(zkw, PATH1, slt.toByteArray());
waitForCounter(SplitLogCounters.tot_wkr_preempt_task, 0, 1, 1500);
@@ -265,7 +265,7 @@ public class TestSplitLogWorker {
public void testRescan() throws Exception {
LOG.info("testRescan");
SplitLogCounters.resetCounters();
- final ServerName SRV = new ServerName("svr,1,1");
+ final ServerName SRV = ServerName.valueOf("svr,1,1");
slw = new SplitLogWorker(zkw, TEST_UTIL.getConfiguration(), SRV, neverEndingTask);
slw.start();
Thread.yield(); // let the worker start
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java?rev=1543923&r1=1543922&r2=1543923&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java Wed Nov 20 20:06:16 2013
@@ -351,7 +351,7 @@ public class TestSplitTransactionOnClust
int regionCount = ProtobufUtil.getOnlineRegions(server).size();
// Insert into zk a blocking znode, a znode of same name as region
// so it gets in way of our splitting.
- ServerName fakedServer = new ServerName("any.old.server", 1234, -1);
+ ServerName fakedServer = ServerName.valueOf("any.old.server", 1234, -1);
ZKAssign.createNodeClosing(TESTING_UTIL.getZooKeeperWatcher(),
hri, fakedServer);
// Now try splitting.... should fail. And each should successfully
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java?rev=1543923&r1=1543922&r2=1543923&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java Wed Nov 20 20:06:16 2013
@@ -732,7 +732,7 @@ public class TestHLog {
@Test
public void testGetServerNameFromHLogDirectoryName() throws IOException {
- ServerName sn = new ServerName("hn", 450, 1398);
+ ServerName sn = ServerName.valueOf("hn", 450, 1398);
String hl = FSUtils.getRootDir(conf) + "/" + HLogUtil.getHLogDirectoryName(sn.toString());
// Must not throw exception
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateBasic.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateBasic.java?rev=1543923&r1=1543922&r2=1543923&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateBasic.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateBasic.java Wed Nov 20 20:06:16 2013
@@ -20,7 +20,6 @@ package org.apache.hadoop.hbase.replicat
import static org.junit.Assert.*;
-import java.io.IOException;
import java.util.List;
import java.util.SortedMap;
import java.util.SortedSet;
@@ -29,7 +28,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.zookeeper.ZKUtil;
-import org.apache.zookeeper.KeeperException;
import org.junit.Before;
import org.junit.Test;
@@ -43,9 +41,9 @@ public abstract class TestReplicationSta
protected ReplicationQueues rq2;
protected ReplicationQueues rq3;
protected ReplicationQueuesClient rqc;
- protected String server1 = new ServerName("hostname1.example.org", 1234, -1L).toString();
- protected String server2 = new ServerName("hostname2.example.org", 1234, -1L).toString();
- protected String server3 = new ServerName("hostname3.example.org", 1234, -1L).toString();
+ protected String server1 = ServerName.valueOf("hostname1.example.org", 1234, -1L).toString();
+ protected String server2 = ServerName.valueOf("hostname2.example.org", 1234, -1L).toString();
+ protected String server3 = ServerName.valueOf("hostname3.example.org", 1234, -1L).toString();
protected ReplicationPeers rp;
protected static final String ID_ONE = "1";
protected static final String ID_TWO = "2";
@@ -124,7 +122,7 @@ public abstract class TestReplicationSta
assertNull(rq1.getAllQueues());
assertEquals(0, rq1.getLogPosition("bogus", "bogus"));
assertNull(rq1.getLogsInQueue("bogus"));
- assertEquals(0, rq1.claimQueues(new ServerName("bogus", 1234, -1L).toString()).size());
+ assertEquals(0, rq1.claimQueues(ServerName.valueOf("bogus", 1234, -1L).toString()).size());
rq1.setLogPosition("bogus", "bogus", 5L);
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java?rev=1543923&r1=1543922&r2=1543923&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java Wed Nov 20 20:06:16 2013
@@ -148,7 +148,7 @@ public class TestReplicationStateZKImpl
@Override
public ServerName getServerName() {
- return new ServerName(this.serverName);
+ return ServerName.valueOf(this.serverName);
}
@Override
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java?rev=1543923&r1=1543922&r2=1543923&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java Wed Nov 20 20:06:16 2013
@@ -224,7 +224,7 @@ public class TestReplicationTrackerZKImp
@Override
public ServerName getServerName() {
- return new ServerName(this.serverName);
+ return ServerName.valueOf(this.serverName);
}
@Override
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java?rev=1543923&r1=1543922&r2=1543923&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java Wed Nov 20 20:06:16 2013
@@ -396,7 +396,7 @@ public class TestReplicationSourceManage
@Override
public ServerName getServerName() {
- return new ServerName(hostname, 1234, 1L);
+ return ServerName.valueOf(hostname, 1234, 1L);
}
@Override
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java?rev=1543923&r1=1543922&r2=1543923&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java Wed Nov 20 20:06:16 2013
@@ -158,7 +158,7 @@ public class TestTokenAuthentication {
@Override
public ServerName getServerName() {
- return new ServerName(isa.getHostName(), isa.getPort(), startcode);
+ return ServerName.valueOf(isa.getHostName(), isa.getPort(), startcode);
}
@Override
@@ -381,8 +381,8 @@ public class TestTokenAuthentication {
Configuration c = server.getConfiguration();
RpcClient rpcClient = new RpcClient(c, clusterId.toString());
ServerName sn =
- new ServerName(server.getAddress().getHostName(), server.getAddress().getPort(),
- System.currentTimeMillis());
+ ServerName.valueOf(server.getAddress().getHostName(), server.getAddress().getPort(),
+ System.currentTimeMillis());
try {
BlockingRpcChannel channel = rpcClient.createBlockingRpcChannel(sn,
User.getCurrent(), HConstants.DEFAULT_HBASE_RPC_TIMEOUT);
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java?rev=1543923&r1=1543922&r2=1543923&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MockServer.java Wed Nov 20 20:06:16 2013
@@ -34,7 +34,7 @@ import org.apache.hadoop.hbase.zookeeper
*/
public class MockServer implements Server {
static final Log LOG = LogFactory.getLog(MockServer.class);
- final static ServerName NAME = new ServerName("MockServer", 123, -1);
+ final static ServerName NAME = ServerName.valueOf("MockServer", 123, -1);
boolean stopped;
boolean aborted;
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java?rev=1543923&r1=1543922&r2=1543923&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java Wed Nov 20 20:06:16 2013
@@ -2030,7 +2030,7 @@ public class TestHBaseFsck {
HBaseFsck hbck = doFsck(conf, false);
assertNoErrors(hbck);
- ServerName mockName = new ServerName("localhost", 60000, 1);
+ ServerName mockName = ServerName.valueOf("localhost", 60000, 1);
// obtain one lock
final TableLockManager tableLockManager = TableLockManager.createTableLockManager(conf, TEST_UTIL.getZooKeeperWatcher(), mockName);
@@ -2112,7 +2112,7 @@ public class TestHBaseFsck {
HConnection connection = HConnectionManager.getConnection(conf);
HRegionLocation metaLocation = connection.locateRegion(TableName.META_TABLE_NAME,
HConstants.EMPTY_START_ROW);
- ServerName hsa = new ServerName(metaLocation.getHostnamePort(), 0L);
+ ServerName hsa = ServerName.valueOf(metaLocation.getHostnamePort(), 0L);
HRegionInfo hri = metaLocation.getRegionInfo();
if (unassign) {
LOG.info("Undeploying meta region " + hri + " from server " + hsa);
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperNodeTracker.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperNodeTracker.java?rev=1543923&r1=1543922&r2=1543923&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperNodeTracker.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperNodeTracker.java Wed Nov 20 20:06:16 2013
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertNul
import static org.junit.Assert.assertTrue;
import java.io.IOException;
-import java.lang.reflect.Method;
import java.util.Random;
import java.util.concurrent.Semaphore;
@@ -33,12 +32,10 @@ import junit.framework.Assert;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.*;
-import org.apache.hadoop.hbase.client.HConnectionManager;
import org.apache.hadoop.hbase.master.TestActiveMasterManager.NodeDeletionListener;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Threads;
import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.ZooDefs.Ids;
@@ -321,7 +318,7 @@ public class TestZooKeeperNodeTracker {
ZooKeeperWatcher zkw = new ZooKeeperWatcher(TEST_UTIL.getConfiguration(),
"testNodeTracker", new TestZooKeeperNodeTracker.StubAbortable());
- final ServerName sn = new ServerName("127.0.0.1:52",45L);
+ final ServerName sn = ServerName.valueOf("127.0.0.1:52", 45L);
ZKUtil.createAndFailSilent(zkw,
TEST_UTIL.getConfiguration().get(HConstants.ZOOKEEPER_ZNODE_PARENT,
@@ -336,7 +333,7 @@ public class TestZooKeeperNodeTracker {
// Check that we don't delete if we're not supposed to
ZKUtil.setData(zkw, nodeName, MasterAddressTracker.toByteArray(sn));
- MasterAddressTracker.deleteIfEquals(zkw, new ServerName("127.0.0.2:52",45L).toString());
+ MasterAddressTracker.deleteIfEquals(zkw, ServerName.valueOf("127.0.0.2:52", 45L).toString());
Assert.assertFalse(ZKUtil.getData(zkw, nodeName) == null);
// Check that we delete when we're supposed to