Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-8983 HBaseConnection#deleteAllConnections does not always delete 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1504606 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
nkeywal 2013-07-18 19:05:04 +00:00
parent 20e0f2b625
commit 8a21171f31
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
View File

@ -318,19 +318,31 @@ public class HConnectionManager {
} }
/** /**
* Delete information for all connections. * Delete information for all connections. Close or not the connection, depending on the
* staleConnection boolean and the ref count. By default, you should use it with
* staleConnection to true.
*/ */
public static void deleteAllConnections() { public static void deleteAllConnections(boolean staleConnection) {
synchronized (CONNECTION_INSTANCES) { synchronized (CONNECTION_INSTANCES) {
Set<HConnectionKey> connectionKeys = new HashSet<HConnectionKey>(); Set<HConnectionKey> connectionKeys = new HashSet<HConnectionKey>();
connectionKeys.addAll(CONNECTION_INSTANCES.keySet()); connectionKeys.addAll(CONNECTION_INSTANCES.keySet());
for (HConnectionKey connectionKey : connectionKeys) { for (HConnectionKey connectionKey : connectionKeys) {
deleteConnection(connectionKey, false); deleteConnection(connectionKey, staleConnection);
} }
CONNECTION_INSTANCES.clear(); CONNECTION_INSTANCES.clear();
} }
} }
/**
* Delete information for all connections..
* @deprecated kept for backward compatibility, but the behavior is broken. HBASE-8983
*/
@Deprecated
public static void deleteAllConnections() {
deleteAllConnections(false);
}
private static void deleteConnection(HConnection connection, boolean staleConnection) { private static void deleteConnection(HConnection connection, boolean staleConnection) {
synchronized (CONNECTION_INSTANCES) { synchronized (CONNECTION_INSTANCES) {
for (Entry<HConnectionKey, HConnectionImplementation> e: CONNECTION_INSTANCES.entrySet()) { for (Entry<HConnectionKey, HConnectionImplementation> e: CONNECTION_INSTANCES.entrySet()) {

2
hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java
View File

@ -507,7 +507,7 @@ public class MiniHBaseCluster extends HBaseCluster {
if (this.hbaseCluster != null) { if (this.hbaseCluster != null) {
this.hbaseCluster.shutdown(); this.hbaseCluster.shutdown();
} }
HConnectionManager.deleteAllConnections(); HConnectionManager.deleteAllConnections(true);
} }
@Override @Override

4
hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationDisableInactivePeer.java
View File

@ -28,6 +28,8 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
import java.util.Map;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
@ -49,7 +51,7 @@ public class TestReplicationDisableInactivePeer extends TestReplicationBase {
// enabling and shutdown the peer // enabling and shutdown the peer
admin.enablePeer("2"); admin.enablePeer("2");
utility2.shutdownMiniHBaseCluster(); utility2.getHBaseCluster().getMaster().shutdown();
byte[] rowkey = Bytes.toBytes("disable inactive peer"); byte[] rowkey = Bytes.toBytes("disable inactive peer");
Put put = new Put(rowkey); Put put = new Put(rowkey);