diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/RegionGroupingProvider.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/RegionGroupingProvider.java index 0b7b8da..82c88ef 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/RegionGroupingProvider.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/RegionGroupingProvider.java @@ -121,8 +121,6 @@ public class RegionGroupingProvider implements WALProvider { /** delegate provider for WAL creation/roll/close */ public static final String DELEGATE_PROVIDER = "hbase.wal.regiongrouping.delegate.provider"; - public static final String DEFAULT_DELEGATE_PROVIDER = WALFactory.Providers.defaultProvider - .name(); private static final String META_WAL_GROUP_NAME = "meta"; @@ -155,7 +153,8 @@ public class RegionGroupingProvider implements WALProvider { } this.providerId = sb.toString(); this.strategy = getStrategy(conf, REGION_GROUPING_STRATEGY, DEFAULT_REGION_GROUPING_STRATEGY); - this.providerClass = factory.getProviderClass(DELEGATE_PROVIDER, DEFAULT_DELEGATE_PROVIDER); + this.providerClass = factory.getProviderClass(DELEGATE_PROVIDER, + WALFactory.Providers.defaultProvider.clazz); } private WALProvider createProvider(String group) throws IOException { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALFactory.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALFactory.java index 0e6e365..9b9967a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALFactory.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALFactory.java @@ -79,12 +79,12 @@ public class WALFactory { } public static final String WAL_PROVIDER = "hbase.wal.provider"; - static final String DEFAULT_WAL_PROVIDER = Providers.defaultProvider.name(); public static final String META_WAL_PROVIDER = "hbase.wal.meta_provider"; final String factoryId; private final WALProvider provider; + private final Class providerClz; // The meta updates are written to a different wal. If this // regionserver holds meta regions, then this ref will be non-null. // lazily intialized; most RegionServers don't deal with META @@ -116,6 +116,7 @@ public class WALFactory { // this instance can't create wals, just reader/writers. provider = null; + providerClz = null; factoryId = SINGLETON_ID; } @@ -125,9 +126,13 @@ public class WALFactory { } @VisibleForTesting - public Class getProviderClass(String key, String defaultValue) { + public Class getProviderClass(String key, + Class defaultVal) { + if (conf.get(key) == null) { + return conf.getClass(key, defaultVal, WALProvider.class); + } try { - Providers provider = Providers.valueOf(conf.get(key, defaultValue)); + Providers provider = Providers.valueOf(conf.get(key)); // AsyncFSWALProvider is not guaranteed to work on all Hadoop versions, when it's chosen as // the default and we can't use it, we want to fall back to FSHLog which we know works on @@ -149,7 +154,7 @@ public class WALFactory { // Fall back to them specifying a class name // Note that the passed default class shouldn't actually be used, since the above only fails // when there is a config value present. - return conf.getClass(key, Providers.defaultProvider.clazz, WALProvider.class); + return conf.getClass(key, defaultVal, WALProvider.class); } } @@ -196,7 +201,9 @@ public class WALFactory { this.factoryId = factoryId; // end required early initialization if (conf.getBoolean("hbase.regionserver.hlog.enabled", true)) { - WALProvider provider = createProvider(getProviderClass(WAL_PROVIDER, DEFAULT_WAL_PROVIDER)); + WALProvider provider = createProvider(getProviderClass(WAL_PROVIDER, + Providers.defaultProvider.clazz)); + providerClz = provider.getClass(); if (enableSyncReplicationWALProvider) { provider = new SyncReplicationWALProvider(provider); } @@ -207,6 +214,7 @@ public class WALFactory { // special handling of existing configuration behavior. LOG.warn("Running with WAL disabled."); provider = new DisabledWALProvider(); + providerClz = provider.getClass(); provider.init(this, conf, factoryId); } } @@ -261,7 +269,7 @@ public class WALFactory { return provider; } provider = createProvider(getProviderClass(META_WAL_PROVIDER, - conf.get(WAL_PROVIDER, DEFAULT_WAL_PROVIDER))); + this.providerClz)); provider.init(this, conf, AbstractFSWALProvider.META_WAL_PROVIDER_ID); provider.addWALActionsListener(new MetricsWAL()); if (metaProvider.compareAndSet(null, provider)) { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/IOTestProvider.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/IOTestProvider.java index 453b742..d062c77 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/IOTestProvider.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/IOTestProvider.java @@ -27,6 +27,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -87,6 +89,7 @@ public class IOTestProvider implements WALProvider { private volatile FSHLog log; private String providerId; + protected AtomicBoolean initialized = new AtomicBoolean(false); private List listeners = new ArrayList<>(); /** @@ -97,7 +100,7 @@ public class IOTestProvider implements WALProvider { */ @Override public void init(WALFactory factory, Configuration conf, String providerId) throws IOException { - if (factory != null) { + if (!initialized.compareAndSet(false, true)) { throw new IllegalStateException("WALProvider.init should only be called once."); } this.factory = factory; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java index a20a071..696db3b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java @@ -726,7 +726,7 @@ public class TestWALFactory { // AsyncFSWal is the default, we should be able to request any WAL. final WALFactory normalWalFactory = new WALFactory(conf, this.currentServername.toString()); Class fshLogProvider = normalWalFactory.getProviderClass( - WALFactory.WAL_PROVIDER, Providers.filesystem.name()); + WALFactory.WAL_PROVIDER, Providers.filesystem.clazz); assertEquals(Providers.filesystem.clazz, fshLogProvider); // Imagine a world where MultiWAL is the default @@ -739,7 +739,31 @@ public class TestWALFactory { }; // If we don't specify a WALProvider, we should get the default implementation. Class multiwalProviderClass = customizedWalFactory.getProviderClass( - WALFactory.WAL_PROVIDER, Providers.multiwal.name()); + WALFactory.WAL_PROVIDER, Providers.multiwal.clazz); assertEquals(Providers.multiwal.clazz, multiwalProviderClass); } + + @Test + public void testCustomProvider() throws IOException { + final Configuration config = new Configuration(); + config.set(WALFactory.WAL_PROVIDER, IOTestProvider.class.getName()); + final WALFactory walFactory = new WALFactory(config, this.currentServername.toString()); + Class walProvider = walFactory.getProviderClass( + WALFactory.WAL_PROVIDER, Providers.filesystem.clazz); + assertEquals(IOTestProvider.class, walProvider); + WALProvider metaWALProvider = walFactory.getMetaProvider(); + assertEquals(IOTestProvider.class, metaWALProvider.getClass()); + } + + @Test + public void testCustomMetaProvider() throws IOException { + final Configuration config = new Configuration(); + config.set(WALFactory.META_WAL_PROVIDER, IOTestProvider.class.getName()); + final WALFactory walFactory = new WALFactory(config, this.currentServername.toString()); + Class walProvider = walFactory.getProviderClass( + WALFactory.WAL_PROVIDER, Providers.filesystem.clazz); + assertEquals(Providers.filesystem.clazz, walProvider); + WALProvider metaWALProvider = walFactory.getMetaProvider(); + assertEquals(IOTestProvider.class, metaWALProvider.getClass()); + } }