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

HBASE-8426 Opening a region failed on Metrics source RegionServer,sub=Regions already exists 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1477247 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
eclark 2013-04-29 18:17:37 +00:00
parent 6b35308cf0
commit b33878f6fc
3 changed files with 65 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/CompatibilitySingletonFactory.java
View File

@ -31,8 +31,12 @@ import java.util.ServiceLoader;
* created. * created.
*/ */
public class CompatibilitySingletonFactory extends CompatibilityFactory { public class CompatibilitySingletonFactory extends CompatibilityFactory {
private static final Log LOG = LogFactory.getLog(CompatibilitySingletonFactory.class); public static enum SingletonStorage {
INSTANCE;
Object lock = new Object();
private static final Map<Class, Object> instances = new HashMap<Class, Object>(); private static final Map<Class, Object> instances = new HashMap<Class, Object>();
}
private static final Log LOG = LogFactory.getLog(CompatibilitySingletonFactory.class);
/** /**
* This is a static only class don't let anyone create an instance. * This is a static only class don't let anyone create an instance.
@ -45,8 +49,9 @@ public class CompatibilitySingletonFactory extends CompatibilityFactory {
* @return the singleton * @return the singleton
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static synchronized <T> T getInstance(Class<T> klass) { public static <T> T getInstance(Class<T> klass) {
T instance = (T) instances.get(klass); synchronized (SingletonStorage.INSTANCE.lock) {
T instance = (T) SingletonStorage.INSTANCE.instances.get(klass);
if (instance == null) { if (instance == null) {
try { try {
ServiceLoader<T> loader = ServiceLoader.load(klass); ServiceLoader<T> loader = ServiceLoader.load(klass);
@ -74,8 +79,10 @@ public class CompatibilitySingletonFactory extends CompatibilityFactory {
if (instance == null) { if (instance == null) {
throw new RuntimeException(createExceptionString(klass)); throw new RuntimeException(createExceptionString(klass));
} }
instances.put(klass, instance); SingletonStorage.INSTANCE.instances.put(klass, instance);
} }
return instance; return instance;
} }
}
} }

8
hbase-hadoop1-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.java
View File

@ -22,28 +22,34 @@ package org.apache.hadoop.hbase.regionserver;
* Factory to create MetricsRegionServerSource when given a MetricsRegionServerWrapper * Factory to create MetricsRegionServerSource when given a MetricsRegionServerWrapper
*/ */
public class MetricsRegionServerSourceFactoryImpl implements MetricsRegionServerSourceFactory { public class MetricsRegionServerSourceFactoryImpl implements MetricsRegionServerSourceFactory {
private static enum FactoryStorage { public static enum FactoryStorage {
INSTANCE; INSTANCE;
private Object aggLock = new Object();
private Object serverLock = new Object();
private MetricsRegionServerSource serverSource; private MetricsRegionServerSource serverSource;
private MetricsRegionAggregateSourceImpl aggImpl; private MetricsRegionAggregateSourceImpl aggImpl;
} }
private synchronized MetricsRegionAggregateSourceImpl getAggregate() { private synchronized MetricsRegionAggregateSourceImpl getAggregate() {
synchronized (FactoryStorage.INSTANCE.aggLock) {
if (FactoryStorage.INSTANCE.aggImpl == null) { if (FactoryStorage.INSTANCE.aggImpl == null) {
FactoryStorage.INSTANCE.aggImpl = new MetricsRegionAggregateSourceImpl(); FactoryStorage.INSTANCE.aggImpl = new MetricsRegionAggregateSourceImpl();
} }
return FactoryStorage.INSTANCE.aggImpl; return FactoryStorage.INSTANCE.aggImpl;
} }
}
@Override @Override
public synchronized MetricsRegionServerSource createServer(MetricsRegionServerWrapper regionServerWrapper) { public synchronized MetricsRegionServerSource createServer(MetricsRegionServerWrapper regionServerWrapper) {
synchronized (FactoryStorage.INSTANCE.serverLock) {
if (FactoryStorage.INSTANCE.serverSource == null) { if (FactoryStorage.INSTANCE.serverSource == null) {
FactoryStorage.INSTANCE.serverSource = new MetricsRegionServerSourceImpl( FactoryStorage.INSTANCE.serverSource = new MetricsRegionServerSourceImpl(
regionServerWrapper); regionServerWrapper);
} }
return FactoryStorage.INSTANCE.serverSource; return FactoryStorage.INSTANCE.serverSource;
} }
}
@Override @Override
public MetricsRegionSource createRegion(MetricsRegionWrapper wrapper) { public MetricsRegionSource createRegion(MetricsRegionWrapper wrapper) {

8
hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.java
View File

@ -22,28 +22,34 @@ package org.apache.hadoop.hbase.regionserver;
* Factory to create MetricsRegionServerSource when given a MetricsRegionServerWrapper * Factory to create MetricsRegionServerSource when given a MetricsRegionServerWrapper
*/ */
public class MetricsRegionServerSourceFactoryImpl implements MetricsRegionServerSourceFactory { public class MetricsRegionServerSourceFactoryImpl implements MetricsRegionServerSourceFactory {
private static enum FactoryStorage { public static enum FactoryStorage {
INSTANCE; INSTANCE;
private Object aggLock = new Object();
private Object serverLock = new Object();
private MetricsRegionServerSource serverSource; private MetricsRegionServerSource serverSource;
private MetricsRegionAggregateSourceImpl aggImpl; private MetricsRegionAggregateSourceImpl aggImpl;
} }
private synchronized MetricsRegionAggregateSourceImpl getAggregate() { private synchronized MetricsRegionAggregateSourceImpl getAggregate() {
synchronized (FactoryStorage.INSTANCE.aggLock) {
if (FactoryStorage.INSTANCE.aggImpl == null) { if (FactoryStorage.INSTANCE.aggImpl == null) {
FactoryStorage.INSTANCE.aggImpl = new MetricsRegionAggregateSourceImpl(); FactoryStorage.INSTANCE.aggImpl = new MetricsRegionAggregateSourceImpl();
} }
return FactoryStorage.INSTANCE.aggImpl; return FactoryStorage.INSTANCE.aggImpl;
} }
}
@Override @Override
public synchronized MetricsRegionServerSource createServer(MetricsRegionServerWrapper regionServerWrapper) { public synchronized MetricsRegionServerSource createServer(MetricsRegionServerWrapper regionServerWrapper) {
synchronized (FactoryStorage.INSTANCE.serverLock) {
if (FactoryStorage.INSTANCE.serverSource == null) { if (FactoryStorage.INSTANCE.serverSource == null) {
FactoryStorage.INSTANCE.serverSource = new MetricsRegionServerSourceImpl( FactoryStorage.INSTANCE.serverSource = new MetricsRegionServerSourceImpl(
regionServerWrapper); regionServerWrapper);
} }
return FactoryStorage.INSTANCE.serverSource; return FactoryStorage.INSTANCE.serverSource;
} }
}
@Override @Override
public MetricsRegionSource createRegion(MetricsRegionWrapper wrapper) { public MetricsRegionSource createRegion(MetricsRegionWrapper wrapper) {