http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java index fc43ef1..11ded64 100644 --- a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java +++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java @@ -48,6 +48,7 @@ import org.apache.accumulo.core.client.sample.Sampler; import org.apache.accumulo.core.client.sample.SamplerConfiguration; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.ConfigurationCopy; +import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.ArrayByteSequence; import org.apache.accumulo.core.data.ByteSequence; @@ -209,7 +210,7 @@ public class RFileTest { public TestRFile(AccumuloConfiguration accumuloConfiguration) { this.accumuloConfiguration = accumuloConfiguration; if (this.accumuloConfiguration == null) - this.accumuloConfiguration = AccumuloConfiguration.getDefaultConfiguration(); + this.accumuloConfiguration = DefaultConfiguration.getInstance(); } public void openWriter(boolean startDLG) throws IOException { @@ -267,7 +268,7 @@ public class RFileTest { LruBlockCache indexCache = new LruBlockCache(100000000, 100000); LruBlockCache dataCache = new LruBlockCache(100000000, 100000); - CachableBlockFile.Reader _cbr = new CachableBlockFile.Reader(in, fileLength, conf, dataCache, indexCache, AccumuloConfiguration.getDefaultConfiguration()); + CachableBlockFile.Reader _cbr = new CachableBlockFile.Reader(in, fileLength, conf, dataCache, indexCache, DefaultConfiguration.getInstance()); reader = new RFile.Reader(_cbr); if (cfsi) iter = new ColumnFamilySkippingIterator(reader); @@ -1623,7 +1624,7 @@ public class RFileTest { byte data[] = baos.toByteArray(); SeekableByteArrayInputStream bais = new SeekableByteArrayInputStream(data); FSDataInputStream in2 = new FSDataInputStream(bais); - AccumuloConfiguration aconf = AccumuloConfiguration.getDefaultConfiguration(); + AccumuloConfiguration aconf = DefaultConfiguration.getInstance(); CachableBlockFile.Reader _cbr = new CachableBlockFile.Reader(in2, data.length, CachedConfiguration.getInstance(), aconf); Reader reader = new RFile.Reader(_cbr); checkIndex(reader); @@ -1668,7 +1669,7 @@ public class RFileTest { } private AccumuloConfiguration setAndGetAccumuloConfig(String cryptoConfSetting) { - ConfigurationCopy result = new ConfigurationCopy(AccumuloConfiguration.getDefaultConfiguration()); + ConfigurationCopy result = new ConfigurationCopy(DefaultConfiguration.getInstance()); Configuration conf = new Configuration(false); conf.addResource(cryptoConfSetting); for (Entry<String,String> e : conf) { @@ -1930,7 +1931,7 @@ public class RFileTest { Hasher dataHasher = Hashing.md5().newHasher(); List<Entry<Key,Value>> sampleData = new ArrayList<>(); - ConfigurationCopy sampleConf = new ConfigurationCopy(conf == null ? AccumuloConfiguration.getDefaultConfiguration() : conf); + ConfigurationCopy sampleConf = new ConfigurationCopy(conf == null ? DefaultConfiguration.getInstance() : conf); sampleConf.set(Property.TABLE_SAMPLER, RowSampler.class.getName()); sampleConf.set(Property.TABLE_SAMPLER_OPTS + "hasher", "murmur3_32"); sampleConf.set(Property.TABLE_SAMPLER_OPTS + "modulus", modulus + ""); @@ -2011,7 +2012,7 @@ public class RFileTest { List<Entry<Key,Value>> sampleDataLG1 = new ArrayList<>(); List<Entry<Key,Value>> sampleDataLG2 = new ArrayList<>(); - ConfigurationCopy sampleConf = new ConfigurationCopy(conf == null ? AccumuloConfiguration.getDefaultConfiguration() : conf); + ConfigurationCopy sampleConf = new ConfigurationCopy(conf == null ? DefaultConfiguration.getInstance() : conf); sampleConf.set(Property.TABLE_SAMPLER, RowSampler.class.getName()); sampleConf.set(Property.TABLE_SAMPLER_OPTS + "hasher", "murmur3_32"); sampleConf.set(Property.TABLE_SAMPLER_OPTS + "modulus", modulus + "");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java b/core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java index 3c68196..d8b6891 100644 --- a/core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java +++ b/core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java @@ -20,6 +20,7 @@ import java.io.IOException; import org.apache.accumulo.core.client.impl.BaseIteratorEnvironment; import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.system.MapFileIterator; @@ -36,7 +37,7 @@ public class DefaultIteratorEnvironment extends BaseIteratorEnvironment { } public DefaultIteratorEnvironment() { - this.conf = AccumuloConfiguration.getDefaultConfiguration(); + this.conf = DefaultConfiguration.getInstance(); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java index c753ee0..2ac1581 100644 --- a/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java +++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java @@ -27,7 +27,7 @@ import java.util.TreeMap; import junit.framework.TestCase; import org.apache.accumulo.core.client.IteratorSetting; -import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.data.ByteSequence; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Range; @@ -132,7 +132,7 @@ public class IndexedDocIteratorTest extends TestCase { return map; } - static TestRFile trf = new TestRFile(AccumuloConfiguration.getDefaultConfiguration()); + static TestRFile trf = new TestRFile(DefaultConfiguration.getInstance()); private SortedKeyValueIterator<Key,Value> createIteratorStack(float hitRatio, int numRows, int numDocsPerRow, Text[] columnFamilies, Text[] otherColumnFamilies, HashSet<Text> docs) throws IOException { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/core/src/test/java/org/apache/accumulo/core/security/crypto/CryptoTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/security/crypto/CryptoTest.java b/core/src/test/java/org/apache/accumulo/core/security/crypto/CryptoTest.java index d738412..a32a465 100644 --- a/core/src/test/java/org/apache/accumulo/core/security/crypto/CryptoTest.java +++ b/core/src/test/java/org/apache/accumulo/core/security/crypto/CryptoTest.java @@ -44,6 +44,7 @@ import javax.crypto.spec.SecretKeySpec; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.ConfigurationCopy; +import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.hadoop.conf.Configuration; import org.junit.Rule; @@ -331,7 +332,7 @@ public class CryptoTest { } private AccumuloConfiguration setAndGetAccumuloConfig(String cryptoConfSetting) { - ConfigurationCopy result = new ConfigurationCopy(AccumuloConfiguration.getDefaultConfiguration()); + ConfigurationCopy result = new ConfigurationCopy(DefaultConfiguration.getInstance()); Configuration conf = new Configuration(false); conf.addResource(cryptoConfSetting); for (Entry<String,String> e : conf) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java ---------------------------------------------------------------------- diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java index 1c670bc..da9a6bb 100644 --- a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java +++ b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java @@ -34,6 +34,7 @@ import org.apache.accumulo.core.client.ZooKeeperInstance; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.ConfigurationCopy; +import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.master.thrift.MasterGoalState; import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.accumulo.minicluster.ServerType; @@ -200,6 +201,6 @@ public class StandaloneAccumuloCluster implements AccumuloCluster { Configuration conf = new Configuration(false); Path accumuloSite = new Path(serverAccumuloConfDir, "accumulo-site.xml"); conf.addResource(accumuloSite); - return new ConfigurationCopy(Iterables.concat(AccumuloConfiguration.getDefaultConfiguration(), conf)); + return new ConfigurationCopy(Iterables.concat(DefaultConfiguration.getInstance(), conf)); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java ---------------------------------------------------------------------- diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java index f56e9ac..93800da 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java @@ -71,6 +71,7 @@ import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.ConfigurationCopy; +import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.master.thrift.MasterClientService; import org.apache.accumulo.core.master.thrift.MasterGoalState; @@ -835,6 +836,6 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster { @Override public AccumuloConfiguration getSiteConfiguration() { - return new ConfigurationCopy(Iterables.concat(AccumuloConfiguration.getDefaultConfiguration(), config.getSiteConfig().entrySet())); + return new ConfigurationCopy(Iterables.concat(DefaultConfiguration.getInstance(), config.getSiteConfig().entrySet())); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java ---------------------------------------------------------------------- diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java index de1a212..0f4634d 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java @@ -670,7 +670,7 @@ public class MiniAccumuloConfigImpl { } _setSiteConfig(siteConfigMap); - for (Entry<String,String> entry : DefaultConfiguration.getDefaultConfiguration()) + for (Entry<String,String> entry : DefaultConfiguration.getInstance()) accumuloConf.setIfUnset(entry.getKey(), entry.getValue()); return this; http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java index 87fbdae..ee6067d 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java @@ -27,7 +27,7 @@ import org.apache.accumulo.core.client.ClientConfiguration; import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty; import org.apache.accumulo.core.client.impl.ClientContext; import org.apache.accumulo.core.client.security.tokens.KerberosToken; -import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.ConfigurationTypeHelper; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.rpc.SslConnectionParams; import org.apache.accumulo.minicluster.MiniAccumuloCluster; @@ -192,7 +192,7 @@ public class Proxy implements KeywordExecutable { public static ServerAddress createProxyServer(HostAndPort address, TProtocolFactory protocolFactory, Properties properties, ClientConfiguration clientConf) throws Exception { final int numThreads = Integer.parseInt(properties.getProperty(THRIFT_THREAD_POOL_SIZE_KEY, THRIFT_THREAD_POOL_SIZE_DEFAULT)); - final long maxFrameSize = AccumuloConfiguration.getFixedMemoryAsBytes(properties.getProperty(THRIFT_MAX_FRAME_SIZE_KEY, THRIFT_MAX_FRAME_SIZE_DEFAULT)); + final long maxFrameSize = ConfigurationTypeHelper.getFixedMemoryAsBytes(properties.getProperty(THRIFT_MAX_FRAME_SIZE_KEY, THRIFT_MAX_FRAME_SIZE_DEFAULT)); final int simpleTimerThreadpoolSize = Integer.parseInt(Property.GENERAL_SIMPLETIMER_THREADPOOL_SIZE.getDefaultValue()); // How frequently to try to resize the thread pool final long threadpoolResizeInterval = 1000l * 5; http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java index e849ae3..c5fbc66 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java +++ b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java @@ -103,7 +103,7 @@ public class Accumulo { } public static void init(VolumeManager fs, ServerConfigurationFactory serverConfig, String application) throws IOException { - final AccumuloConfiguration conf = serverConfig.getConfiguration(); + final AccumuloConfiguration conf = serverConfig.getSystemConfiguration(); log.info(application + " starting"); log.info("Instance " + serverConfig.getInstance().getInstanceID()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/base/src/main/java/org/apache/accumulo/server/AccumuloServerContext.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/AccumuloServerContext.java b/server/base/src/main/java/org/apache/accumulo/server/AccumuloServerContext.java index ce7bfad..37ac6d9 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/AccumuloServerContext.java +++ b/server/base/src/main/java/org/apache/accumulo/server/AccumuloServerContext.java @@ -61,7 +61,7 @@ public class AccumuloServerContext extends ClientContext { * Construct a server context from the server's configuration */ public AccumuloServerContext(ServerConfigurationFactory confFactory, AuthenticationTokenSecretManager secretManager) { - super(confFactory.getInstance(), getCredentials(confFactory.getInstance()), confFactory.getConfiguration()); + super(confFactory.getInstance(), getCredentials(confFactory.getInstance()), confFactory.getSystemConfiguration()); this.confFactory = confFactory; this.secretManager = secretManager; if (null != getSaslParams()) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java index 9c0359f..134a804 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java +++ b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java @@ -284,7 +284,7 @@ public class ClientServiceHandler implements ClientService.Iface { ServerConfigurationFactory factory = context.getServerConfigurationFactory(); switch (type) { case CURRENT: - return conf(credentials, factory.getConfiguration()); + return conf(credentials, factory.getSystemConfiguration()); case SITE: return conf(credentials, factory.getSiteConfiguration()); case DEFAULT: @@ -441,7 +441,7 @@ public class ClientServiceHandler implements ClientService.Iface { } // use the same set of tableIds that were validated above to avoid race conditions - Map<TreeSet<String>,Long> diskUsage = TableDiskUsage.getDiskUsage(context.getServerConfigurationFactory().getConfiguration(), tableIds, fs, + Map<TreeSet<String>,Long> diskUsage = TableDiskUsage.getDiskUsage(context.getServerConfigurationFactory().getSystemConfiguration(), tableIds, fs, context.getConnector()); List<TDiskUsage> retUsages = new ArrayList<>(); for (Map.Entry<TreeSet<String>,Long> usageItem : diskUsage.entrySet()) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/base/src/main/java/org/apache/accumulo/server/conf/ConfigSanityCheck.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/ConfigSanityCheck.java b/server/base/src/main/java/org/apache/accumulo/server/conf/ConfigSanityCheck.java index cd01998..2608a03 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/conf/ConfigSanityCheck.java +++ b/server/base/src/main/java/org/apache/accumulo/server/conf/ConfigSanityCheck.java @@ -25,7 +25,7 @@ import com.google.auto.service.AutoService; public class ConfigSanityCheck implements KeywordExecutable { public static void main(String[] args) { - new ServerConfigurationFactory(HdfsZooInstance.getInstance()).getConfiguration(); + new ServerConfigurationFactory(HdfsZooInstance.getInstance()).getSystemConfiguration(); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java index 20ad8c9..bbd1354 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java +++ b/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java @@ -29,7 +29,6 @@ import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.zookeeper.ZooUtil; import org.apache.accumulo.fate.zookeeper.ZooCache; import org.apache.accumulo.fate.zookeeper.ZooCacheFactory; -import org.apache.accumulo.server.client.HdfsZooInstance; import org.apache.accumulo.server.conf.ZooCachePropertyAccessor.PropCacheKey; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,10 +44,6 @@ public class NamespaceConfiguration extends ObservableConfiguration { protected Instance inst = null; private ZooCacheFactory zcf = new ZooCacheFactory(); - public NamespaceConfiguration(String namespaceId, AccumuloConfiguration parent) { - this(namespaceId, HdfsZooInstance.getInstance(), parent); - } - public NamespaceConfiguration(String namespaceId, Instance inst, AccumuloConfiguration parent) { this.inst = inst; this.parent = parent; @@ -100,30 +95,13 @@ public class NamespaceConfiguration extends ObservableConfiguration { return getPropCacheAccessor().get(property, getPath(), getParent); } - private class SystemNamespaceFilter implements Predicate<String> { - - private Predicate<String> userFilter; - - SystemNamespaceFilter(Predicate<String> userFilter) { - this.userFilter = userFilter; - } - - @Override - public boolean test(String key) { - if (isIteratorOrConstraint(key)) - return false; - return userFilter.test(key); - } - - } - @Override public void getProperties(Map<String,String> props, Predicate<String> filter) { Predicate<String> parentFilter = filter; // exclude system iterators/constraints from the system namespace // so they don't affect the metadata or root tables. if (getNamespaceId().equals(Namespaces.ACCUMULO_NAMESPACE_ID)) - parentFilter = new SystemNamespaceFilter(filter); + parentFilter = key -> isIteratorOrConstraint(key) ? false : filter.test(key); getPropCacheAccessor().getProperties(props, getPath(), filter, parent, parentFilter); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java index 0b63927..d29ff89 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java +++ b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java @@ -18,17 +18,14 @@ package org.apache.accumulo.server.conf; import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.conf.AccumuloConfiguration; -import org.apache.accumulo.core.data.impl.KeyExtent; public abstract class ServerConfiguration { abstract public TableConfiguration getTableConfiguration(String tableId); - abstract public TableConfiguration getTableConfiguration(KeyExtent extent); - abstract public NamespaceConfiguration getNamespaceConfiguration(String namespaceId); - abstract public AccumuloConfiguration getConfiguration(); + abstract public AccumuloConfiguration getSystemConfiguration(); abstract public Instance getInstance(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java index 464dbdd..02a8301 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java +++ b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfigurationFactory.java @@ -25,7 +25,6 @@ import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.ConfigSanityCheck; import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.conf.SiteConfiguration; -import org.apache.accumulo.core.data.impl.KeyExtent; import org.apache.accumulo.fate.zookeeper.ZooCacheFactory; /** @@ -39,19 +38,13 @@ public class ServerConfigurationFactory extends ServerConfiguration { private static void addInstanceToCaches(String iid) { synchronized (tableConfigs) { - if (!tableConfigs.containsKey(iid)) { - tableConfigs.put(iid, new HashMap<String,TableConfiguration>()); - } + tableConfigs.computeIfAbsent(iid, k -> new HashMap<>()); } synchronized (namespaceConfigs) { - if (!namespaceConfigs.containsKey(iid)) { - namespaceConfigs.put(iid, new HashMap<String,NamespaceConfiguration>()); - } + namespaceConfigs.computeIfAbsent(iid, k -> new HashMap<>()); } synchronized (tableParentConfigs) { - if (!tableParentConfigs.containsKey(iid)) { - tableParentConfigs.put(iid, new HashMap<String,NamespaceConfiguration>()); - } + tableParentConfigs.computeIfAbsent(iid, k -> new HashMap<>()); } } @@ -122,7 +115,7 @@ public class ServerConfigurationFactory extends ServerConfiguration { } @Override - public synchronized AccumuloConfiguration getConfiguration() { + public synchronized AccumuloConfiguration getSystemConfiguration() { if (systemConfig == null) { systemConfig = new ZooConfigurationFactory().getInstance(instance, zcf, getSiteConfiguration()); } @@ -161,11 +154,6 @@ public class ServerConfigurationFactory extends ServerConfiguration { return conf; } - @Override - public TableConfiguration getTableConfiguration(KeyExtent extent) { - return getTableConfiguration(extent.getTableId()); - } - public NamespaceConfiguration getNamespaceConfigurationForTable(String tableId) { NamespaceConfiguration conf; synchronized (tableParentConfigs) { @@ -175,7 +163,7 @@ public class ServerConfigurationFactory extends ServerConfiguration { // which may result in creating multiple objects for the same id, but that's ok. if (conf == null) { // changed - include instance in constructor call - conf = new TableParentConfiguration(tableId, instance, getConfiguration()); + conf = new TableParentConfiguration(tableId, instance, getSystemConfiguration()); ConfigSanityCheck.validate(conf); synchronized (tableParentConfigs) { tableParentConfigs.get(instanceID).put(tableId, conf); @@ -194,7 +182,7 @@ public class ServerConfigurationFactory extends ServerConfiguration { } if (conf == null) { // changed - include instance in constructor call - conf = new NamespaceConfiguration(namespaceId, instance, getConfiguration()); + conf = new NamespaceConfiguration(namespaceId, instance, getSystemConfiguration()); conf.setZooCacheFactory(zcf); ConfigSanityCheck.validate(conf); synchronized (namespaceConfigs) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java index 123b5c4..e38bf77 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java +++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java @@ -89,7 +89,7 @@ public class VolumeManagerImpl implements VolumeManager { } public static org.apache.accumulo.server.fs.VolumeManager getLocal(String localBasePath) throws IOException { - AccumuloConfiguration accConf = DefaultConfiguration.getDefaultConfiguration(); + AccumuloConfiguration accConf = DefaultConfiguration.getInstance(); Volume defaultLocalVolume = VolumeConfiguration.create(FileSystem.getLocal(CachedConfiguration.getInstance()), localBasePath); // The default volume gets placed in the map, but local filesystem is only used for testing purposes http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java index 4a17e24..804cc83 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java +++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java @@ -44,6 +44,7 @@ import org.apache.accumulo.core.client.IteratorSetting.Column; import org.apache.accumulo.core.client.impl.Namespaces; import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.conf.SiteConfiguration; import org.apache.accumulo.core.data.Key; @@ -433,7 +434,7 @@ public class Initialize implements KeywordExecutable { // create table and default tablets directories createDirectories(fs, rootTabletDir, tableMetadataTabletDir, defaultMetadataTabletDir, replicationTableDefaultTabletDir); - String ext = FileOperations.getNewFileExtension(AccumuloConfiguration.getDefaultConfiguration()); + String ext = FileOperations.getNewFileExtension(DefaultConfiguration.getInstance()); // populate the metadata tables tablet with info about the replication table's one initial tablet String metadataFileName = tableMetadataTabletDir + Path.SEPARATOR + "0_1." + ext; @@ -470,7 +471,7 @@ public class Initialize implements KeywordExecutable { } FileSystem fs = volmanager.getVolumeByPath(new Path(fileName)).getFileSystem(); FileSKVWriter tabletWriter = FileOperations.getInstance().newWriterBuilder().forFile(fileName, fs, fs.getConf()) - .withTableConfiguration(AccumuloConfiguration.getDefaultConfiguration()).build(); + .withTableConfiguration(DefaultConfiguration.getInstance()).build(); tabletWriter.startDefaultLocalityGroup(); for (Entry<Key,Value> entry : sorted.entrySet()) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java index af7a5da..5023b36 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java @@ -32,8 +32,8 @@ import java.util.TreeMap; import java.util.regex.Pattern; import org.apache.accumulo.core.client.admin.TableOperations; -import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.ConfigurationObserver; +import org.apache.accumulo.core.conf.ConfigurationTypeHelper; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.impl.KeyExtent; import org.apache.accumulo.core.master.thrift.TabletServerStatus; @@ -77,7 +77,7 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con private static final int HOST_BALANCER_REGEX_MAX_MIGRATIONS_DEFAULT = 250; protected static final String DEFAULT_POOL = "HostTableLoadBalancer.ALL"; - protected long oobCheckMillis = AccumuloConfiguration.getTimeInMillis(HOST_BALANCER_OOB_DEFAULT); + protected long oobCheckMillis = ConfigurationTypeHelper.getTimeInMillis(HOST_BALANCER_OOB_DEFAULT); private Map<String,String> tableIdToTableName = null; private Map<String,Pattern> poolNameToRegexPattern = null; @@ -196,15 +196,15 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con } } } - String oobProperty = conf.getConfiguration().get(HOST_BALANCER_OOB_CHECK_KEY); + String oobProperty = conf.getSystemConfiguration().get(HOST_BALANCER_OOB_CHECK_KEY); if (null != oobProperty) { - oobCheckMillis = AccumuloConfiguration.getTimeInMillis(oobProperty); + oobCheckMillis = ConfigurationTypeHelper.getTimeInMillis(oobProperty); } - String ipBased = conf.getConfiguration().get(HOST_BALANCER_REGEX_USING_IPS_KEY); + String ipBased = conf.getSystemConfiguration().get(HOST_BALANCER_REGEX_USING_IPS_KEY); if (null != ipBased) { isIpBasedRegex = Boolean.parseBoolean(ipBased); } - String migrations = conf.getConfiguration().get(HOST_BALANCER_REGEX_MAX_MIGRATIONS_KEY); + String migrations = conf.getSystemConfiguration().get(HOST_BALANCER_REGEX_MAX_MIGRATIONS_KEY); if (null != migrations) { maxTServerMigrations = Integer.parseInt(migrations); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/base/src/main/java/org/apache/accumulo/server/master/balancer/RegexGroupBalancer.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/RegexGroupBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/RegexGroupBalancer.java index 8197028..f165ea3 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/RegexGroupBalancer.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/RegexGroupBalancer.java @@ -22,7 +22,7 @@ import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.ConfigurationTypeHelper; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.impl.KeyExtent; import org.apache.hadoop.io.Text; @@ -59,7 +59,7 @@ public class RegexGroupBalancer extends GroupBalancer { protected long getWaitTime() { Map<String,String> customProps = configuration.getTableConfiguration(tableId).getAllPropertiesWithPrefix(Property.TABLE_ARBITRARY_PROP_PREFIX); if (customProps.containsKey(WAIT_TIME_PROPERTY)) { - return AccumuloConfiguration.getTimeInMillis(customProps.get(WAIT_TIME_PROPERTY)); + return ConfigurationTypeHelper.getTimeInMillis(customProps.get(WAIT_TIME_PROPERTY)); } return super.getWaitTime(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java index 44219a5..babaf4c 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java +++ b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java @@ -127,8 +127,8 @@ public class LargestFirstMemoryManager implements MemoryManager { @Override public void init(ServerConfiguration conf) { this.config = conf; - maxMemory = conf.getConfiguration().getAsBytes(Property.TSERV_MAXMEM); - maxConcurrentMincs = conf.getConfiguration().getCount(Property.TSERV_MINC_MAXCONCURRENT); + maxMemory = conf.getSystemConfiguration().getAsBytes(Property.TSERV_MAXMEM); + maxConcurrentMincs = conf.getSystemConfiguration().getCount(Property.TSERV_MINC_MAXCONCURRENT); numWaitingMultiplier = TSERV_MINC_MAXCONCURRENT_NUMWAITING_MULTIPLIER; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java index a333c08..44171da 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java @@ -444,7 +444,7 @@ public class Admin implements KeywordExecutable { } } Connector connector = context.getConnector(); - defaultConfig = AccumuloConfiguration.getDefaultConfiguration(); + defaultConfig = DefaultConfiguration.getInstance(); siteConfig = connector.instanceOperations().getSiteConfiguration(); systemConfig = connector.instanceOperations().getSystemConfiguration(); if (opts.allConfiguration || opts.users) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java b/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java index 04724b3..c1f8894 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java @@ -47,7 +47,7 @@ public class LoginProperties implements KeywordExecutable { @Override public void execute(String[] args) throws Exception { - AccumuloConfiguration config = new ServerConfigurationFactory(HdfsZooInstance.getInstance()).getConfiguration(); + AccumuloConfiguration config = new ServerConfigurationFactory(HdfsZooInstance.getInstance()).getSystemConfiguration(); Authenticator authenticator = AccumuloVFSClassLoader.getClassLoader().loadClass(config.get(Property.INSTANCE_SECURITY_AUTHENTICATOR)) .asSubclass(Authenticator.class).newInstance(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/base/src/test/java/org/apache/accumulo/server/AccumuloServerContextTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/AccumuloServerContextTest.java b/server/base/src/test/java/org/apache/accumulo/server/AccumuloServerContextTest.java index 521fd7b..33dfe17 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/AccumuloServerContextTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/AccumuloServerContextTest.java @@ -86,7 +86,7 @@ public class AccumuloServerContextTest { token.readFields(new DataInputStream(new ByteArrayInputStream(baos.toByteArray()))); ServerConfigurationFactory factory = EasyMock.createMock(ServerConfigurationFactory.class); - EasyMock.expect(factory.getConfiguration()).andReturn(conf).anyTimes(); + EasyMock.expect(factory.getSystemConfiguration()).andReturn(conf).anyTimes(); EasyMock.expect(factory.getSiteConfiguration()).andReturn(siteConfig).anyTimes(); EasyMock.expect(factory.getInstance()).andReturn(instance).anyTimes(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java index cec75c2..3fd1403 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java @@ -115,7 +115,7 @@ public class ServerConfigurationFactoryTest { public void testGetConfiguration() { mockInstanceForConfig(); ready(); - AccumuloConfiguration c = scf.getConfiguration(); + AccumuloConfiguration c = scf.getSystemConfiguration(); assertNotNull(c); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java index 2c0d20e..3969dd2 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java @@ -139,7 +139,7 @@ public abstract class BaseHostRegexTableLoadBalancerTest extends HostRegexTableL } @Override - public synchronized AccumuloConfiguration getConfiguration() { + public synchronized AccumuloConfiguration getSystemConfiguration() { return new ConfigurationCopy(DEFAULT_TABLE_PROPERTIES); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java index fb5fc1a..e14001f 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java @@ -175,7 +175,7 @@ public class HostRegexTableLoadBalancerTest extends BaseHostRegexTableLoadBalanc public void testSplitCurrentByRegexUsingIP() { init(new TestServerConfigurationFactory(instance) { @Override - public synchronized AccumuloConfiguration getConfiguration() { + public synchronized AccumuloConfiguration getSystemConfiguration() { HashMap<String,String> props = new HashMap<>(); props.put(HostRegexTableLoadBalancer.HOST_BALANCER_OOB_CHECK_KEY, "30s"); props.put(HostRegexTableLoadBalancer.HOST_BALANCER_REGEX_USING_IPS_KEY, "true"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java index e002c03..5a9fab0 100644 --- a/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java @@ -42,6 +42,7 @@ import org.apache.accumulo.core.client.impl.thrift.ClientService.Processor; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.ConfigurationCopy; +import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.server.AccumuloServerContext; import org.apache.accumulo.server.client.ClientServiceHandler; @@ -119,11 +120,11 @@ public class TServerUtilsTest { public TestServerConfigurationFactory(Instance instance) { super(instance); - conf = new ConfigurationCopy(AccumuloConfiguration.getDefaultConfiguration()); + conf = new ConfigurationCopy(DefaultConfiguration.getInstance()); } @Override - public synchronized AccumuloConfiguration getConfiguration() { + public synchronized AccumuloConfiguration getSystemConfiguration() { return conf; } @@ -185,14 +186,14 @@ public class TServerUtilsTest { @After public void resetProperty() { - ((ConfigurationCopy) factory.getConfiguration()).set(Property.TSERV_CLIENTPORT, Property.TSERV_CLIENTPORT.getDefaultValue()); - ((ConfigurationCopy) factory.getConfiguration()).set(Property.TSERV_PORTSEARCH, Property.TSERV_PORTSEARCH.getDefaultValue()); + ((ConfigurationCopy) factory.getSystemConfiguration()).set(Property.TSERV_CLIENTPORT, Property.TSERV_CLIENTPORT.getDefaultValue()); + ((ConfigurationCopy) factory.getSystemConfiguration()).set(Property.TSERV_PORTSEARCH, Property.TSERV_PORTSEARCH.getDefaultValue()); } @Test public void testStartServerZeroPort() throws Exception { TServer server = null; - ((ConfigurationCopy) factory.getConfiguration()).set(Property.TSERV_CLIENTPORT, "0"); + ((ConfigurationCopy) factory.getSystemConfiguration()).set(Property.TSERV_CLIENTPORT, "0"); try { ServerAddress address = startServer(); assertNotNull(address); @@ -210,7 +211,7 @@ public class TServerUtilsTest { public void testStartServerFreePort() throws Exception { TServer server = null; int port = getFreePort(1024); - ((ConfigurationCopy) factory.getConfiguration()).set(Property.TSERV_CLIENTPORT, Integer.toString(port)); + ((ConfigurationCopy) factory.getSystemConfiguration()).set(Property.TSERV_CLIENTPORT, Integer.toString(port)); try { ServerAddress address = startServer(); assertNotNull(address); @@ -230,7 +231,7 @@ public class TServerUtilsTest { InetAddress addr = InetAddress.getByName("localhost"); // Bind to the port ServerSocket s = new ServerSocket(port, 50, addr); - ((ConfigurationCopy) factory.getConfiguration()).set(Property.TSERV_CLIENTPORT, Integer.toString(port)); + ((ConfigurationCopy) factory.getSystemConfiguration()).set(Property.TSERV_CLIENTPORT, Integer.toString(port)); try { startServer(); } finally { @@ -245,8 +246,8 @@ public class TServerUtilsTest { // Bind to the port InetAddress addr = InetAddress.getByName("localhost"); ServerSocket s = new ServerSocket(port[0], 50, addr); - ((ConfigurationCopy) factory.getConfiguration()).set(Property.TSERV_CLIENTPORT, Integer.toString(port[0])); - ((ConfigurationCopy) factory.getConfiguration()).set(Property.TSERV_PORTSEARCH, "true"); + ((ConfigurationCopy) factory.getSystemConfiguration()).set(Property.TSERV_CLIENTPORT, Integer.toString(port[0])); + ((ConfigurationCopy) factory.getSystemConfiguration()).set(Property.TSERV_PORTSEARCH, "true"); try { ServerAddress address = startServer(); assertNotNull(address); @@ -266,7 +267,7 @@ public class TServerUtilsTest { TServer server = null; int[] port = findTwoFreeSequentialPorts(1024); String portRange = Integer.toString(port[0]) + "-" + Integer.toString(port[1]); - ((ConfigurationCopy) factory.getConfiguration()).set(Property.TSERV_CLIENTPORT, portRange); + ((ConfigurationCopy) factory.getSystemConfiguration()).set(Property.TSERV_CLIENTPORT, portRange); try { ServerAddress address = startServer(); assertNotNull(address); @@ -288,7 +289,7 @@ public class TServerUtilsTest { String portRange = Integer.toString(port[0]) + "-" + Integer.toString(port[1]); // Bind to the port ServerSocket s = new ServerSocket(port[0], 50, addr); - ((ConfigurationCopy) factory.getConfiguration()).set(Property.TSERV_CLIENTPORT, portRange); + ((ConfigurationCopy) factory.getSystemConfiguration()).set(Property.TSERV_CLIENTPORT, portRange); try { ServerAddress address = startServer(); assertNotNull(address); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java ---------------------------------------------------------------------- diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java index 923af12..b762e19 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java @@ -155,7 +155,7 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa opts.parseArgs(app, args); SimpleGarbageCollector gc = new SimpleGarbageCollector(opts, fs, conf); - DistributedTrace.enable(opts.getAddress(), app, conf.getConfiguration()); + DistributedTrace.enable(opts.getAddress(), app, conf.getSystemConfiguration()); try { gc.run(); } finally { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java ---------------------------------------------------------------------- diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java index 59f1b36..3ab6cbf 100644 --- a/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java +++ b/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java @@ -72,7 +72,7 @@ public class SimpleGarbageCollectorTest { systemConfig = createSystemConfig(); ServerConfigurationFactory factory = createMock(ServerConfigurationFactory.class); expect(factory.getInstance()).andReturn(instance).anyTimes(); - expect(factory.getConfiguration()).andReturn(systemConfig).anyTimes(); + expect(factory.getSystemConfiguration()).andReturn(systemConfig).anyTimes(); expect(factory.getSiteConfiguration()).andReturn(siteConfig).anyTimes(); // Just make the SiteConfiguration delegate to our AccumuloConfiguration http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/master/src/main/java/org/apache/accumulo/master/Master.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java index b5877bb..1b6f303 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/Master.java +++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java @@ -601,7 +601,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List this.fs = fs; this.hostname = hostname; - AccumuloConfiguration aconf = serverConfig.getConfiguration(); + AccumuloConfiguration aconf = serverConfig.getSystemConfiguration(); log.info("Version " + Constants.VERSION); log.info("Instance " + getInstance().getInstanceID()); @@ -1447,7 +1447,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List VolumeManager fs = VolumeManagerImpl.get(); Accumulo.init(fs, conf, app); Master master = new Master(conf, fs, hostname); - DistributedTrace.enable(hostname, app, conf.getConfiguration()); + DistributedTrace.enable(hostname, app, conf.getSystemConfiguration()); master.run(); } catch (Exception ex) { log.error("Unexpected exception, exiting", ex); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java index d0cbe36..12f6ae4 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/WriteExportFiles.java @@ -39,7 +39,6 @@ import org.apache.accumulo.core.client.impl.AcceptableThriftTableOperationExcept import org.apache.accumulo.core.client.impl.Tables; import org.apache.accumulo.core.client.impl.thrift.TableOperation; import org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType; -import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.Key; @@ -240,7 +239,7 @@ class WriteExportFiles extends MasterRepo { AccumuloSecurityException, TableNotFoundException, IOException { Connector conn = context.getConnector(); - DefaultConfiguration defaultConfig = AccumuloConfiguration.getDefaultConfiguration(); + DefaultConfiguration defaultConfig = DefaultConfiguration.getInstance(); Map<String,String> siteConfig = conn.instanceOperations().getSiteConfiguration(); Map<String,String> systemConfig = conn.instanceOperations().getSystemConfiguration(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java ---------------------------------------------------------------------- diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java index 346820a..3b5eab1 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java @@ -257,7 +257,7 @@ public class Monitor implements HighlyAvailableService { synchronized (Monitor.class) { // Learn our instance name asynchronously so we don't hang up if zookeeper is down if (cachedInstanceName.get().equals(DEFAULT_INSTANCE_NAME)) { - SimpleTimer.getInstance(config.getConfiguration()).schedule(new TimerTask() { + SimpleTimer.getInstance(config.getSystemConfiguration()).schedule(new TimerTask() { @Override public void run() { synchronized (Monitor.class) { @@ -444,7 +444,7 @@ public class Monitor implements HighlyAvailableService { // Servlets need access to limit requests when the monitor is not active, but Servlets are instantiated // via reflection. Expose the service this way instead. Monitor.HA_SERVICE_INSTANCE = monitor; - DistributedTrace.enable(hostname, app, config.getConfiguration()); + DistributedTrace.enable(hostname, app, config.getSystemConfiguration()); try { monitor.run(hostname); } finally { @@ -456,7 +456,7 @@ public class Monitor implements HighlyAvailableService { public void run(String hostname) { Monitor.START_TIME = System.currentTimeMillis(); - int ports[] = config.getConfiguration().getPort(Property.MONITOR_PORT); + int ports[] = config.getSystemConfiguration().getPort(Property.MONITOR_PORT); for (int port : ports) { try { log.debug("Creating monitor on port " + port); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java ---------------------------------------------------------------------- diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java index a6bdaa8..2ad1b9d 100644 --- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java +++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java @@ -186,7 +186,7 @@ public class TraceServer implements Watcher { this.serverConfiguration = serverConfiguration; log.info("Version " + Constants.VERSION); log.info("Instance " + serverConfiguration.getInstance().getInstanceID()); - AccumuloConfiguration conf = serverConfiguration.getConfiguration(); + AccumuloConfiguration conf = serverConfiguration.getSystemConfiguration(); tableName = conf.get(Property.TRACE_TABLE); connector = ensureTraceTableExists(conf); @@ -278,7 +278,7 @@ public class TraceServer implements Watcher { } public void run() throws Exception { - SimpleTimer.getInstance(serverConfiguration.getConfiguration()).schedule(new Runnable() { + SimpleTimer.getInstance(serverConfiguration.getSystemConfiguration()).schedule(new Runnable() { @Override public void run() { flush(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java index 8bc0fed..790de81 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/FileManager.java @@ -317,7 +317,8 @@ public class FileManager { FileSystem ns = fs.getVolumeByPath(path).getFileSystem(); // log.debug("Opening "+file + " path " + path); FileSKVIterator reader = FileOperations.getInstance().newReaderBuilder().forFile(path.toString(), ns, ns.getConf()) - .withTableConfiguration(context.getServerConfigurationFactory().getTableConfiguration(tablet)).withBlockCache(dataCache, indexCache).build(); + .withTableConfiguration(context.getServerConfigurationFactory().getTableConfiguration(tablet.getTableId())).withBlockCache(dataCache, indexCache) + .build(); reservedFiles.add(reader); readersReserved.put(reader, file); } catch (Exception e) { @@ -474,7 +475,7 @@ public class FileManager { dataSources = new ArrayList<>(); this.tablet = tablet; - continueOnFailure = context.getServerConfigurationFactory().getTableConfiguration(tablet).getBoolean(Property.TABLE_FAILURES_IGNORE); + continueOnFailure = context.getServerConfigurationFactory().getTableConfiguration(tablet.getTableId()).getBoolean(Property.TABLE_FAILURES_IGNORE); if (tablet.isMeta()) { continueOnFailure = false; http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index abfa3e3..466c19f 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java @@ -2429,8 +2429,8 @@ public class TabletServer extends AccumuloServerContext implements Runnable { } else { processor = new Processor<>(rpcProxy); } - HostAndPort address = startServer(getServerConfigurationFactory().getConfiguration(), clientAddress.getHostText(), Property.TSERV_CLIENTPORT, processor, - "Thrift Client Server"); + HostAndPort address = startServer(getServerConfigurationFactory().getSystemConfiguration(), clientAddress.getHostText(), Property.TSERV_CLIENTPORT, + processor, "Thrift Client Server"); log.info("address = " + address); return address; } @@ -2440,7 +2440,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { ReplicationServicer.Iface rpcProxy = RpcWrapper.service(handler); ReplicationServicer.Iface repl = TCredentialsUpdatingWrapper.service(rpcProxy, handler.getClass(), getConfiguration()); ReplicationServicer.Processor<ReplicationServicer.Iface> processor = new ReplicationServicer.Processor<>(repl); - AccumuloConfiguration conf = getServerConfigurationFactory().getConfiguration(); + AccumuloConfiguration conf = getServerConfigurationFactory().getSystemConfiguration(); Property maxMessageSizeProperty = (conf.get(Property.TSERV_MAX_MESSAGE_SIZE) != null ? Property.TSERV_MAX_MESSAGE_SIZE : Property.GENERAL_MAX_MESSAGE_SIZE); ServerAddress sp = TServerUtils.startServer(this, clientAddress.getHostText(), Property.REPLICATION_RECEIPT_SERVICE_PORT, processor, "ReplicationServicerHandler", "Replication Servicer", null, Property.REPLICATION_MIN_THREADS, Property.REPLICATION_THREADCHECK, maxMessageSizeProperty); @@ -2918,8 +2918,8 @@ public class TabletServer extends AccumuloServerContext implements Runnable { Runnable contextCleaner = new Runnable() { @Override public void run() { - Set<String> contextProperties = getServerConfigurationFactory().getConfiguration().getAllPropertiesWithPrefix(Property.VFS_CONTEXT_CLASSPATH_PROPERTY) - .keySet(); + Set<String> contextProperties = getServerConfigurationFactory().getSystemConfiguration() + .getAllPropertiesWithPrefix(Property.VFS_CONTEXT_CLASSPATH_PROPERTY).keySet(); Set<String> configuredContexts = new HashSet<>(); for (String prop : contextProperties) { configuredContexts.add(prop.substring(Property.VFS_CONTEXT_CLASSPATH_PROPERTY.name().length())); @@ -3069,7 +3069,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { Accumulo.init(fs, conf, app); final TabletServer server = new TabletServer(conf, fs); server.config(hostname); - DistributedTrace.enable(hostname, app, conf.getConfiguration()); + DistributedTrace.enable(hostname, app, conf.getSystemConfiguration()); if (UserGroupInformation.isSecurityEnabled()) { UserGroupInformation loginUser = UserGroupInformation.getLoginUser(); loginUser.doAs(new PrivilegedExceptionAction<Void>() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java index b84997d..d10ff7b 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java @@ -145,14 +145,14 @@ public class TabletServerResourceManager { private ExecutorService createIdlingEs(Property max, String name, long timeout, TimeUnit timeUnit) { LinkedBlockingQueue<Runnable> queue = new LinkedBlockingQueue<Runnable>(); - int maxThreads = conf.getConfiguration().getCount(max); + int maxThreads = conf.getSystemConfiguration().getCount(max); ThreadPoolExecutor tp = new ThreadPoolExecutor(maxThreads, maxThreads, timeout, timeUnit, queue, new NamingThreadFactory(name)); tp.allowCoreThreadTimeOut(true); return addEs(max, name, tp); } private ExecutorService createEs(Property max, String name, BlockingQueue<Runnable> queue) { - int maxThreads = conf.getConfiguration().getCount(max); + int maxThreads = conf.getSystemConfiguration().getCount(max); ThreadPoolExecutor tp = new ThreadPoolExecutor(maxThreads, maxThreads, 0L, TimeUnit.MILLISECONDS, queue, new NamingThreadFactory(name)); return addEs(max, name, tp); } @@ -164,7 +164,7 @@ public class TabletServerResourceManager { public TabletServerResourceManager(TabletServer tserver, VolumeManager fs) { this.tserver = tserver; this.conf = tserver.getServerConfigurationFactory(); - final AccumuloConfiguration acuConf = conf.getConfiguration(); + final AccumuloConfiguration acuConf = conf.getSystemConfiguration(); long maxMemory = acuConf.getAsBytes(Property.TSERV_MAXMEM); boolean usingNativeMap = acuConf.getBoolean(Property.TSERV_NATIVEMAP_ENABLED) && NativeMap.isLoaded(); @@ -359,7 +359,7 @@ public class TabletServerResourceManager { MemoryManagementFramework() { tabletReports = Collections.synchronizedMap(new HashMap<KeyExtent,TabletStateImpl>()); memUsageReports = new LinkedBlockingQueue<>(); - maxMem = conf.getConfiguration().getAsBytes(Property.TSERV_MAXMEM); + maxMem = conf.getSystemConfiguration().getAsBytes(Property.TSERV_MAXMEM); Runnable r1 = new Runnable() { @Override @@ -517,7 +517,7 @@ public class TabletServerResourceManager { void waitUntilCommitsAreEnabled() { if (holdCommits) { - long timeout = System.currentTimeMillis() + conf.getConfiguration().getTimeInMillis(Property.GENERAL_RPC_TIMEOUT); + long timeout = System.currentTimeMillis() + conf.getSystemConfiguration().getTimeInMillis(Property.GENERAL_RPC_TIMEOUT); synchronized (commitHold) { while (holdCommits) { try { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java index 6f9233a..ccfb6ae 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategy.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.ConfigurationTypeHelper; import org.apache.accumulo.core.metadata.schema.DataFileValue; import org.apache.accumulo.server.fs.FileRef; @@ -35,7 +35,7 @@ public class SizeLimitCompactionStrategy extends DefaultCompactionStrategy { @Override public void init(Map<String,String> options) { - limit = AccumuloConfiguration.getFixedMemoryAsBytes(options.get(SIZE_LIMIT_OPT)); + limit = ConfigurationTypeHelper.getFixedMemoryAsBytes(options.get(SIZE_LIMIT_OPT)); } private MajorCompactionRequest filterFiles(MajorCompactionRequest mcr) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategy.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategy.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategy.java index a2cc52a..56b3889 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategy.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategy.java @@ -19,7 +19,7 @@ package org.apache.accumulo.tserver.compaction; import java.io.IOException; import java.util.Map; -import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.ConfigurationTypeHelper; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.metadata.schema.DataFileValue; import org.apache.accumulo.server.fs.FileRef; @@ -82,7 +82,7 @@ public class TwoTierCompactionStrategy extends DefaultCompactionStrategy { String threshold = options.get(LARGE_FILE_COMPRESSION_THRESHOLD); largeFileCompressionType = options.get(LARGE_FILE_COMPRESSION_TYPE); verifyRequiredProperties(threshold, largeFileCompressionType); - largeFileCompressionThreshold = AccumuloConfiguration.getFixedMemoryAsBytes(threshold); + largeFileCompressionThreshold = ConfigurationTypeHelper.getFixedMemoryAsBytes(threshold); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java index d110062..d0b13aa 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java @@ -149,7 +149,7 @@ public class AccumuloReplicaSystem implements ReplicaSystem { instanceName = configuration.substring(0, index); zookeepers = configuration.substring(index + 1); - conf = new ServerConfigurationFactory(HdfsZooInstance.getInstance()).getConfiguration(); + conf = new ServerConfigurationFactory(HdfsZooInstance.getInstance()).getSystemConfiguration(); try { fs = VolumeManagerImpl.get(conf); @@ -162,7 +162,7 @@ public class AccumuloReplicaSystem implements ReplicaSystem { @Override public Status replicate(final Path p, final Status status, final ReplicationTarget target, final ReplicaSystemHelper helper) { final Instance localInstance = HdfsZooInstance.getInstance(); - final AccumuloConfiguration localConf = new ServerConfigurationFactory(localInstance).getConfiguration(); + final AccumuloConfiguration localConf = new ServerConfigurationFactory(localInstance).getSystemConfiguration(); log.debug("Replication RPC timeout is {}", localConf.get(Property.REPLICATION_RPC_TIMEOUT.getKey())); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationWorker.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationWorker.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationWorker.java index 5e40ff6..829e8b3 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationWorker.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationWorker.java @@ -56,7 +56,7 @@ public class ReplicationWorker implements Runnable { @Override public void run() { - DefaultConfiguration defaultConf = DefaultConfiguration.getDefaultConfiguration(); + DefaultConfiguration defaultConf = DefaultConfiguration.getInstance(); long defaultDelay = defaultConf.getTimeInMillis(Property.REPLICATION_WORK_PROCESSOR_DELAY); long defaultPeriod = defaultConf.getTimeInMillis(Property.REPLICATION_WORK_PROCESSOR_PERIOD); long delay = conf.getTimeInMillis(Property.REPLICATION_WORK_PROCESSOR_DELAY); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java index 248e554..9fac722 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java @@ -31,7 +31,7 @@ import java.util.TreeMap; import java.util.TreeSet; import java.util.concurrent.TimeUnit; -import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.ConfigurationTypeHelper; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.impl.KeyExtent; import org.apache.accumulo.core.metadata.schema.DataFileValue; @@ -299,7 +299,7 @@ class DatafileManager { // find the smallest file long maxFileSize = Long.MAX_VALUE; - maxMergingMinorCompactionFileSize = AccumuloConfiguration.getFixedMemoryAsBytes(tablet.getTableConfiguration().get( + maxMergingMinorCompactionFileSize = ConfigurationTypeHelper.getFixedMemoryAsBytes(tablet.getTableConfiguration().get( Property.TABLE_MINC_MAX_MERGE_FILE_SIZE)); if (maxMergingMinorCompactionFileSize > 0) { maxFileSize = maxMergingMinorCompactionFileSize; http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/tserver/src/test/java/org/apache/accumulo/tserver/LargestFirstMemoryManagerTest.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/LargestFirstMemoryManagerTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/LargestFirstMemoryManagerTest.java index e2bec9d..47c763b 100644 --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/LargestFirstMemoryManagerTest.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/LargestFirstMemoryManagerTest.java @@ -63,7 +63,7 @@ public class LargestFirstMemoryManagerTest { ServerConfigurationFactory delegate = new ServerConfigurationFactory(inst); @Override - public AccumuloConfiguration getConfiguration() { + public AccumuloConfiguration getSystemConfiguration() { SiteConfiguration conf = SiteConfiguration.getInstance(); conf.set(Property.TSERV_MAXMEM, "1g"); return conf; @@ -75,11 +75,6 @@ public class LargestFirstMemoryManagerTest { } @Override - public TableConfiguration getTableConfiguration(KeyExtent extent) { - return delegate.getTableConfiguration(extent); - } - - @Override public NamespaceConfiguration getNamespaceConfiguration(String namespaceId) { return delegate.getNamespaceConfiguration(namespaceId); } @@ -185,7 +180,7 @@ public class LargestFirstMemoryManagerTest { ServerConfigurationFactory delegate = new ServerConfigurationFactory(inst); @Override - public AccumuloConfiguration getConfiguration() { + public AccumuloConfiguration getSystemConfiguration() { return DefaultConfiguration.getInstance(); } @@ -195,11 +190,6 @@ public class LargestFirstMemoryManagerTest { } @Override - public TableConfiguration getTableConfiguration(KeyExtent extent) { - return delegate.getTableConfiguration(extent); - } - - @Override public NamespaceConfiguration getNamespaceConfiguration(String namespaceId) { return delegate.getNamespaceConfiguration(namespaceId); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java index 0cb2ab2..f6a7c73 100644 --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/DefaultCompactionStrategyTest.java @@ -29,7 +29,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.data.ByteSequence; import org.apache.accumulo.core.data.Key; @@ -142,7 +141,7 @@ public class DefaultCompactionStrategyTest { } - static final DefaultConfiguration dfault = AccumuloConfiguration.getDefaultConfiguration(); + static final DefaultConfiguration dfault = DefaultConfiguration.getInstance(); private static class TestCompactionRequest extends MajorCompactionRequest { @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java index 2b56c88..2c5f136 100644 --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/SizeLimitCompactionStrategyTest.java @@ -21,7 +21,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.ConfigurationTypeHelper; +import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.data.impl.KeyExtent; import org.apache.accumulo.core.metadata.schema.DataFileValue; import org.apache.accumulo.server.fs.FileRef; @@ -36,7 +37,7 @@ public class SizeLimitCompactionStrategyTest { HashMap<FileRef,DataFileValue> ret = new HashMap<>(); for (int i = 0; i < sa.length; i += 2) { - ret.put(new FileRef("hdfs://nn1/accumulo/tables/5/t-0001/" + sa[i]), new DataFileValue(AccumuloConfiguration.getFixedMemoryAsBytes(sa[i + 1]), 1)); + ret.put(new FileRef("hdfs://nn1/accumulo/tables/5/t-0001/" + sa[i]), new DataFileValue(ConfigurationTypeHelper.getFixedMemoryAsBytes(sa[i + 1]), 1)); } return ret; @@ -51,7 +52,7 @@ public class SizeLimitCompactionStrategyTest { slcs.init(opts); KeyExtent ke = new KeyExtent("0", null, null); - MajorCompactionRequest mcr = new MajorCompactionRequest(ke, MajorCompactionReason.NORMAL, AccumuloConfiguration.getDefaultConfiguration()); + MajorCompactionRequest mcr = new MajorCompactionRequest(ke, MajorCompactionReason.NORMAL, DefaultConfiguration.getInstance()); mcr.setFiles(nfl("f1", "2G", "f2", "2G", "f3", "2G", "f4", "2G")); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategyTest.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategyTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategyTest.java index 4659193..60145a7 100644 --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategyTest.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/TwoTierCompactionStrategyTest.java @@ -23,6 +23,8 @@ import java.util.List; import java.util.Map; import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.ConfigurationTypeHelper; +import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.data.impl.KeyExtent; import org.apache.accumulo.core.metadata.schema.DataFileValue; import org.apache.accumulo.server.fs.FileRef; @@ -44,7 +46,7 @@ public class TwoTierCompactionStrategyTest { HashMap<FileRef,DataFileValue> ret = new HashMap<>(); for (int i = 0; i < sa.length; i += 2) { - ret.put(new FileRef("hdfs://nn1/accumulo/tables/5/t-0001/" + sa[i]), new DataFileValue(AccumuloConfiguration.getFixedMemoryAsBytes(sa[i + 1]), 1)); + ret.put(new FileRef("hdfs://nn1/accumulo/tables/5/t-0001/" + sa[i]), new DataFileValue(ConfigurationTypeHelper.getFixedMemoryAsBytes(sa[i + 1]), 1)); } return ret; @@ -60,7 +62,7 @@ public class TwoTierCompactionStrategyTest { @Test public void testDefaultCompaction() throws IOException { ttcs.init(opts); - conf = AccumuloConfiguration.getDefaultConfiguration(); + conf = DefaultConfiguration.getInstance(); KeyExtent ke = new KeyExtent("0", null, null); mcr = new MajorCompactionRequest(ke, MajorCompactionReason.NORMAL, conf); Map<FileRef,DataFileValue> fileMap = createFileMap("f1", "10M", "f2", "10M", "f3", "10M", "f4", "10M", "f5", "100M", "f6", "100M", "f7", "100M", "f8", @@ -79,7 +81,7 @@ public class TwoTierCompactionStrategyTest { @Test public void testLargeCompaction() throws IOException { ttcs.init(opts); - conf = AccumuloConfiguration.getDefaultConfiguration(); + conf = DefaultConfiguration.getInstance(); KeyExtent ke = new KeyExtent("0", null, null); mcr = new MajorCompactionRequest(ke, MajorCompactionReason.NORMAL, conf); Map<FileRef,DataFileValue> fileMap = createFileMap("f1", "2G", "f2", "2G", "f3", "2G", "f4", "2G"); @@ -108,7 +110,7 @@ public class TwoTierCompactionStrategyTest { @Test public void testFileSubsetCompaction() throws IOException { ttcs.init(opts); - conf = AccumuloConfiguration.getDefaultConfiguration(); + conf = DefaultConfiguration.getInstance(); KeyExtent ke = new KeyExtent("0", null, null); mcr = new MajorCompactionRequest(ke, MajorCompactionReason.NORMAL, conf); Map<FileRef,DataFileValue> fileMap = createFileMap("f1", "1G", "f2", "10M", "f3", "10M", "f4", "10M", "f5", "10M", "f6", "10M", "f7", "10M"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategyTest.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategyTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategyTest.java index 7498019..4f5dea3 100644 --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategyTest.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategyTest.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.accumulo.core.compaction.CompactionSettings; -import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.ConfigurationTypeHelper; import org.apache.accumulo.core.data.impl.KeyExtent; import org.apache.accumulo.core.metadata.schema.DataFileValue; import org.apache.accumulo.server.fs.FileRef; @@ -70,9 +70,9 @@ public class ConfigurableCompactionStrategyTest { plan = ccs.getCompactionPlan(mcr); - Assert.assertEquals(AccumuloConfiguration.getFixedMemoryAsBytes("64K"), plan.writeParameters.getBlockSize()); - Assert.assertEquals(AccumuloConfiguration.getFixedMemoryAsBytes("256M"), plan.writeParameters.getHdfsBlockSize()); - Assert.assertEquals(AccumuloConfiguration.getFixedMemoryAsBytes("32K"), plan.writeParameters.getIndexBlockSize()); + Assert.assertEquals(ConfigurationTypeHelper.getFixedMemoryAsBytes("64K"), plan.writeParameters.getBlockSize()); + Assert.assertEquals(ConfigurationTypeHelper.getFixedMemoryAsBytes("256M"), plan.writeParameters.getHdfsBlockSize()); + Assert.assertEquals(ConfigurationTypeHelper.getFixedMemoryAsBytes("32K"), plan.writeParameters.getIndexBlockSize()); Assert.assertEquals(5, plan.writeParameters.getReplication()); Assert.assertEquals("snappy", plan.writeParameters.getCompressType()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/DatafileManagerTest.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/DatafileManagerTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/DatafileManagerTest.java index 7f7560f..d53893d 100644 --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/DatafileManagerTest.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/tablet/DatafileManagerTest.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.util.SortedMap; import java.util.TreeMap; -import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.ConfigurationTypeHelper; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.impl.KeyExtent; import org.apache.accumulo.core.metadata.schema.DataFileValue; @@ -43,7 +43,7 @@ public class DatafileManagerTest { private SortedMap<FileRef,DataFileValue> createFileMap(String... sa) { SortedMap<FileRef,DataFileValue> ret = new TreeMap<>(); for (int i = 0; i < sa.length; i += 2) { - ret.put(new FileRef("hdfs://nn1/accumulo/tables/5/t-0001/" + sa[i]), new DataFileValue(AccumuloConfiguration.getFixedMemoryAsBytes(sa[i + 1]), 1)); + ret.put(new FileRef("hdfs://nn1/accumulo/tables/5/t-0001/" + sa[i]), new DataFileValue(ConfigurationTypeHelper.getFixedMemoryAsBytes(sa[i + 1]), 1)); } return ret; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java index 482bd84..48fa5ba 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java +++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java @@ -32,7 +32,7 @@ import org.apache.accumulo.core.client.NamespaceNotFoundException; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.impl.Namespaces; import org.apache.accumulo.core.client.impl.Tables; -import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.security.ColumnVisibility; import org.apache.accumulo.core.util.BadArgumentException; @@ -150,7 +150,7 @@ public class ConfigCommand extends Command { siteConfig.putAll(shellState.getConnector().instanceOperations().getSiteConfiguration()); final TreeMap<String,String> defaults = new TreeMap<>(); - for (Entry<String,String> defaultEntry : AccumuloConfiguration.getDefaultConfiguration()) { + for (Entry<String,String> defaultEntry : DefaultConfiguration.getInstance()) { defaults.put(defaultEntry.getKey(), defaultEntry.getValue()); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteCommand.java index 915e3f8..7e67000 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteCommand.java +++ b/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteCommand.java @@ -24,7 +24,7 @@ import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.BatchWriterConfig; import org.apache.accumulo.core.client.TableNotFoundException; -import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.ConfigurationTypeHelper; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.security.ColumnVisibility; import org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException; @@ -41,7 +41,7 @@ public class DeleteCommand extends Command { protected long getTimeout(final CommandLine cl) { if (cl.hasOption(timeoutOption.getLongOpt())) { - return AccumuloConfiguration.getTimeInMillis(cl.getOptionValue(timeoutOption.getLongOpt())); + return ConfigurationTypeHelper.getTimeInMillis(cl.getOptionValue(timeoutOption.getLongOpt())); } return Long.MAX_VALUE;
