HBASE-14963. Remove Guava dependency from HBase client code

This commit is contained in:
Devaraj Das 2016-01-22 13:26:54 -08:00
parent f9e69b51e1
commit 4681827d63
1 changed files with 9 additions and 14 deletions

View File

@ -55,7 +55,6 @@ import org.apache.hadoop.hbase.util.Pair;
import org.apache.hadoop.ipc.RemoteException;
import org.apache.zookeeper.KeeperException;
import com.google.common.base.Stopwatch;
import com.google.protobuf.InvalidProtocolBufferException;
/**
@ -229,11 +228,11 @@ public class MetaTableLocator {
* @throws InterruptedException if interrupted while waiting
*/
public void waitMetaRegionLocation(ZooKeeperWatcher zkw) throws InterruptedException {
Stopwatch stopwatch = new Stopwatch().start();
long startTime = System.currentTimeMillis();
while (!stopped) {
try {
if (waitMetaRegionLocation(zkw, 100) != null) break;
long sleepTime = stopwatch.elapsedMillis();
long sleepTime = System.currentTimeMillis() - startTime;
// +1 in case sleepTime=0
if ((sleepTime + 1) % 10000 == 0) {
LOG.warn("Have been waiting for meta to be assigned for " + sleepTime + "ms");
@ -591,19 +590,15 @@ public class MetaTableLocator {
throws InterruptedException {
if (timeout < 0) throw new IllegalArgumentException();
if (zkw == null) throw new IllegalArgumentException();
Stopwatch sw = new Stopwatch().start();
long startTime = System.currentTimeMillis();
ServerName sn = null;
try {
while (true) {
sn = getMetaRegionLocation(zkw, replicaId);
if (sn != null || sw.elapsedMillis()
> timeout - HConstants.SOCKET_RETRY_WAIT_MS) {
break;
}
Thread.sleep(HConstants.SOCKET_RETRY_WAIT_MS);
while (true) {
sn = getMetaRegionLocation(zkw, replicaId);
if (sn != null || (System.currentTimeMillis() - startTime)
> timeout - HConstants.SOCKET_RETRY_WAIT_MS) {
break;
}
} finally {
sw.stop();
Thread.sleep(HConstants.SOCKET_RETRY_WAIT_MS);
}
return sn;
}