Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9C923200C7E for ; Tue, 23 May 2017 14:22:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9B5EC160BC3; Tue, 23 May 2017 12:22:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5800B160BD9 for ; Tue, 23 May 2017 14:22:49 +0200 (CEST) Received: (qmail 5370 invoked by uid 500); 23 May 2017 12:22:48 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 5154 invoked by uid 99); 23 May 2017 12:22:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 May 2017 12:22:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2BF84E3823; Tue, 23 May 2017 12:22:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dlmarion@apache.org To: commits@accumulo.apache.org Date: Tue, 23 May 2017 12:22:48 -0000 Message-Id: In-Reply-To: <561248980a3c443fb057fa454baf8b26@git.apache.org> References: <561248980a3c443fb057fa454baf8b26@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/13] accumulo git commit: ACCUMULO-4638 Clean up some AccumuloConfiguration archived-at: Tue, 23 May 2017 12:22:50 -0000 http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/shell/src/main/java/org/apache/accumulo/shell/commands/InsertCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/InsertCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/InsertCommand.java index c9da47e..d6bc20b 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/commands/InsertCommand.java +++ b/shell/src/main/java/org/apache/accumulo/shell/commands/InsertCommand.java @@ -30,7 +30,7 @@ import org.apache.accumulo.core.client.Durability; import org.apache.accumulo.core.client.MutationsRejectedException; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.security.SecurityErrorCode; -import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.ConfigurationTypeHelper; import org.apache.accumulo.core.data.ConstraintViolationSummary; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.TabletId; @@ -51,7 +51,7 @@ public class InsertCommand 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; http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/shell/src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java index d40f43a..a0571e1 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java +++ b/shell/src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java @@ -18,7 +18,7 @@ package org.apache.accumulo.shell.commands; import java.io.IOException; -import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.ConfigurationTypeHelper; import org.apache.accumulo.core.util.Merge; import org.apache.accumulo.shell.Shell; import org.apache.accumulo.shell.Shell.Command; @@ -49,7 +49,7 @@ public class MergeCommand extends Command { all = true; } if (cl.hasOption(sizeOpt.getOpt())) { - size = AccumuloConfiguration.getFixedMemoryAsBytes(cl.getOptionValue(sizeOpt.getOpt())); + size = ConfigurationTypeHelper.getFixedMemoryAsBytes(cl.getOptionValue(sizeOpt.getOpt())); } if (startRow == null && endRow == null && size < 0 && !all) { shellState.getReader().flush(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java index 4a18108..a77a881 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java +++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java @@ -23,6 +23,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map.Entry; import java.util.concurrent.TimeUnit; + import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.IteratorSetting; @@ -31,7 +32,7 @@ import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.ScannerBase; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.sample.SamplerConfiguration; -import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.ConfigurationTypeHelper; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; @@ -138,7 +139,7 @@ public class ScanCommand 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; http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/test/src/main/java/org/apache/accumulo/test/BulkImportMonitoringIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/BulkImportMonitoringIT.java b/test/src/main/java/org/apache/accumulo/test/BulkImportMonitoringIT.java index 9c7abf3..db7e76b 100644 --- a/test/src/main/java/org/apache/accumulo/test/BulkImportMonitoringIT.java +++ b/test/src/main/java/org/apache/accumulo/test/BulkImportMonitoringIT.java @@ -30,7 +30,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import org.apache.accumulo.core.client.Connector; -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; import org.apache.accumulo.core.data.Value; @@ -99,8 +99,8 @@ public class BulkImportMonitoringIT extends ConfigurableMacBase { fs.mkdirs(files); for (int i = 0; i < 10; i++) { FileSKVWriter writer = FileOperations.getInstance().newWriterBuilder() - .forFile(files.toString() + "/bulk_" + i + "." + RFile.EXTENSION, fs, fs.getConf()) - .withTableConfiguration(AccumuloConfiguration.getDefaultConfiguration()).build(); + .forFile(files.toString() + "/bulk_" + i + "." + RFile.EXTENSION, fs, fs.getConf()).withTableConfiguration(DefaultConfiguration.getInstance()) + .build(); writer.startDefaultLocalityGroup(); for (int j = 0x100; j < 0xfff; j += 3) { writer.append(new Key(Integer.toHexString(j)), new Value(new byte[0])); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/test/src/main/java/org/apache/accumulo/test/CreateRandomRFile.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/CreateRandomRFile.java b/test/src/main/java/org/apache/accumulo/test/CreateRandomRFile.java index 2a05f4e..991f543 100644 --- a/test/src/main/java/org/apache/accumulo/test/CreateRandomRFile.java +++ b/test/src/main/java/org/apache/accumulo/test/CreateRandomRFile.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.Random; -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.file.FileSKVWriter; @@ -69,7 +69,7 @@ public class CreateRandomRFile { FileSKVWriter mfw; try { FileSystem fs = FileSystem.get(conf); - mfw = new RFileOperations().newWriterBuilder().forFile(file, fs, conf).withTableConfiguration(AccumuloConfiguration.getDefaultConfiguration()).build(); + mfw = new RFileOperations().newWriterBuilder().forFile(file, fs, conf).withTableConfiguration(DefaultConfiguration.getInstance()).build(); } catch (IOException e) { throw new RuntimeException(e); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java b/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java index 9c2d089..ff8a6ac 100644 --- a/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java @@ -32,7 +32,7 @@ import org.apache.accumulo.core.client.BatchWriterConfig; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.security.tokens.PasswordToken; -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.conf.Property; import org.apache.accumulo.core.data.Key; @@ -106,7 +106,7 @@ public class ExistingMacIT extends ConfigurableMacBase { } final DefaultConfiguration defaultConfig = DefaultConfiguration.getInstance(); - final long zkTimeout = AccumuloConfiguration.getTimeInMillis(getCluster().getConfig().getSiteConfig().get(Property.INSTANCE_ZK_TIMEOUT.getKey())); + final long zkTimeout = ConfigurationTypeHelper.getTimeInMillis(getCluster().getConfig().getSiteConfig().get(Property.INSTANCE_ZK_TIMEOUT.getKey())); IZooReaderWriter zrw = new ZooReaderWriterFactory().getZooReaderWriter(getCluster().getZooKeepers(), (int) zkTimeout, defaultConfig.get(Property.INSTANCE_SECRET)); final String zInstanceRoot = Constants.ZROOT + "/" + conn.getInstance().getInstanceID(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java b/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java index 22a8cef..48610df 100644 --- a/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java +++ b/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java @@ -32,7 +32,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import org.apache.accumulo.core.client.Connector; -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; import org.apache.accumulo.core.data.Value; @@ -124,8 +124,8 @@ public class GetFileInfoBulkIT extends ConfigurableMacBase { fs.mkdirs(files); for (int i = 0; i < 100; i++) { FileSKVWriter writer = FileOperations.getInstance().newWriterBuilder() - .forFile(files.toString() + "/bulk_" + i + "." + RFile.EXTENSION, fs, fs.getConf()) - .withTableConfiguration(AccumuloConfiguration.getDefaultConfiguration()).build(); + .forFile(files.toString() + "/bulk_" + i + "." + RFile.EXTENSION, fs, fs.getConf()).withTableConfiguration(DefaultConfiguration.getInstance()) + .build(); writer.startDefaultLocalityGroup(); for (int j = 0x100; j < 0xfff; j += 3) { writer.append(new Key(Integer.toHexString(j)), new Value(new byte[0])); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java b/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java index 4adc621..73a2355 100644 --- a/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java +++ b/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java @@ -30,13 +30,13 @@ import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.impl.AccumuloServerException; import org.apache.accumulo.core.client.impl.Namespaces; +import org.apache.accumulo.core.conf.ConfigurationTypeHelper; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; -import org.apache.accumulo.server.conf.TableConfiguration; import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; @@ -78,7 +78,7 @@ public class LargeSplitRowIT extends ConfigurableMacBase { // Create a split point that is too large to be an end row and fill it with all 'm' SortedSet partitionKeys = new TreeSet<>(); - byte data[] = new byte[(int) (TableConfiguration.getFixedMemoryAsBytes(Property.TABLE_MAX_END_ROW_SIZE.getDefaultValue()) + 2)]; + byte data[] = new byte[(int) (ConfigurationTypeHelper.getFixedMemoryAsBytes(Property.TABLE_MAX_END_ROW_SIZE.getDefaultValue()) + 2)]; for (int i = 0; i < data.length; i++) { data[i] = 'm'; } @@ -123,7 +123,7 @@ public class LargeSplitRowIT extends ConfigurableMacBase { // Create a BatchWriter and key for a table entry that is longer than the allowed size for an end row // Fill this key with all m's except the last spot BatchWriter batchWriter = conn.createBatchWriter(tableName, new BatchWriterConfig()); - byte data[] = new byte[(int) (TableConfiguration.getFixedMemoryAsBytes(Property.TABLE_MAX_END_ROW_SIZE.getDefaultValue()) + 2)]; + byte data[] = new byte[(int) (ConfigurationTypeHelper.getFixedMemoryAsBytes(Property.TABLE_MAX_END_ROW_SIZE.getDefaultValue()) + 2)]; for (int i = 0; i < data.length - 1; i++) { data[i] = (byte) 'm'; } @@ -233,7 +233,7 @@ public class LargeSplitRowIT extends ConfigurableMacBase { // Create a BatchWriter and key for a table entry that is longer than the allowed size for an end row BatchWriter batchWriter = conn.createBatchWriter(tableName, new BatchWriterConfig()); - byte data[] = new byte[(int) (TableConfiguration.getFixedMemoryAsBytes(Property.TABLE_MAX_END_ROW_SIZE.getDefaultValue()) + 2)]; + byte data[] = new byte[(int) (ConfigurationTypeHelper.getFixedMemoryAsBytes(Property.TABLE_MAX_END_ROW_SIZE.getDefaultValue()) + 2)]; // Fill key with all j's except for last spot which alternates through 1 through 10 for every j value for (int j = 0; j < max; j += spacing) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java index b9b42a6..3948fd9 100644 --- a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java @@ -57,6 +57,7 @@ import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.client.summary.summarizers.DeletesSummarizer; import org.apache.accumulo.core.client.summary.summarizers.FamilySummarizer; 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; import org.apache.accumulo.core.data.Value; @@ -1348,7 +1349,7 @@ public class ShellServerIT extends SharedMiniClusterBase { File errorsDir = new File(rootPath, "errors"); assertTrue(errorsDir.mkdir()); fs.mkdirs(new Path(errorsDir.toString())); - AccumuloConfiguration aconf = AccumuloConfiguration.getDefaultConfiguration(); + AccumuloConfiguration aconf = DefaultConfiguration.getInstance(); FileSKVWriter evenWriter = FileOperations.getInstance().newWriterBuilder().forFile(even, fs, conf).withTableConfiguration(aconf).build(); evenWriter.startDefaultLocalityGroup(); FileSKVWriter oddWriter = FileOperations.getInstance().newWriterBuilder().forFile(odd, fs, conf).withTableConfiguration(aconf).build(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java b/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java index d91d76e..79036cc 100644 --- a/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java @@ -29,6 +29,7 @@ import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.impl.Namespaces; 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.harness.AccumuloClusterHarness; import org.apache.accumulo.server.conf.NamespaceConfiguration; @@ -54,8 +55,7 @@ public class TableConfigurationUpdateIT extends AccumuloClusterHarness { String table = getUniqueNames(1)[0]; conn.tableOperations().create(table); - final NamespaceConfiguration defaultConf = new NamespaceConfiguration(Namespaces.DEFAULT_NAMESPACE_ID, inst, - AccumuloConfiguration.getDefaultConfiguration()); + final NamespaceConfiguration defaultConf = new NamespaceConfiguration(Namespaces.DEFAULT_NAMESPACE_ID, inst, DefaultConfiguration.getInstance()); // Cache invalidates 25% of the time int randomMax = 4; http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/test/src/main/java/org/apache/accumulo/test/TestIngest.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/TestIngest.java b/test/src/main/java/org/apache/accumulo/test/TestIngest.java index de092e0..d16ced8 100644 --- a/test/src/main/java/org/apache/accumulo/test/TestIngest.java +++ b/test/src/main/java/org/apache/accumulo/test/TestIngest.java @@ -35,7 +35,7 @@ import org.apache.accumulo.core.client.TableExistsException; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.impl.TabletServerBatchWriter; import org.apache.accumulo.core.client.security.SecurityErrorCode; -import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.data.ConstraintViolationSummary; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Mutation; @@ -219,7 +219,7 @@ public class TestIngest { if (opts.outputFile != null) { Configuration conf = CachedConfiguration.getInstance(); writer = FileOperations.getInstance().newWriterBuilder().forFile(opts.outputFile + "." + RFile.EXTENSION, fs, conf) - .withTableConfiguration(AccumuloConfiguration.getDefaultConfiguration()).build(); + .withTableConfiguration(DefaultConfiguration.getInstance()).build(); writer.startDefaultLocalityGroup(); } else { bw = connector.createBatchWriter(opts.getTableName(), bwOpts.getBatchWriterConfig()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java b/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java index 10cde74..5edfe0a 100644 --- a/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java @@ -31,7 +31,7 @@ import org.apache.accumulo.core.client.impl.ClientContext; import org.apache.accumulo.core.client.impl.Credentials; import org.apache.accumulo.core.client.impl.ThriftTransportKey; import org.apache.accumulo.core.client.impl.ThriftTransportPool; -import org.apache.accumulo.core.conf.DefaultConfiguration; +import org.apache.accumulo.core.conf.ConfigurationTypeHelper; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.util.ServerServices; import org.apache.accumulo.core.util.ServerServices.Service; @@ -57,7 +57,7 @@ public class TransportCachingIT extends AccumuloClusterHarness { Instance instance = conn.getInstance(); ClientConfiguration clientConf = cluster.getClientConfig(); ClientContext context = new ClientContext(instance, new Credentials(getAdminPrincipal(), getAdminToken()), clientConf); - long rpcTimeout = DefaultConfiguration.getTimeInMillis(Property.GENERAL_RPC_TIMEOUT.getDefaultValue()); + long rpcTimeout = ConfigurationTypeHelper.getTimeInMillis(Property.GENERAL_RPC_TIMEOUT.getDefaultValue()); // create list of servers ArrayList servers = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java index ec8ce2d..87b3d5a 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java @@ -65,7 +65,7 @@ public class BulkFileIT extends AccumuloClusterHarness { splits.add(new Text(split)); c.tableOperations().addSplits(tableName, splits); Configuration conf = new Configuration(); - AccumuloConfiguration aconf = new ServerConfigurationFactory(c.getInstance()).getConfiguration(); + AccumuloConfiguration aconf = new ServerConfigurationFactory(c.getInstance()).getSystemConfiguration(); FileSystem fs = getCluster().getFileSystem(); String rootPath = cluster.getTemporaryPath().toString(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java index 4577813..df07e68 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java @@ -16,6 +16,7 @@ */ package org.apache.accumulo.test.functional; +import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; @@ -26,7 +27,7 @@ import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.BatchWriterConfig; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Scanner; -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.Mutation; import org.apache.accumulo.core.data.Range; @@ -42,7 +43,6 @@ import org.junit.Test; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; public class DeleteEverythingIT extends AccumuloClusterHarness { @@ -67,7 +67,7 @@ public class DeleteEverythingIT extends AccumuloClusterHarness { c.instanceOperations().setProperty(Property.TSERV_MAJC_DELAY.getKey(), "1s"); if (getClusterType() == ClusterType.STANDALONE) { // Gotta wait for the cluster to get out of the default sleep value - Thread.sleep(AccumuloConfiguration.getTimeInMillis(majcDelay)); + Thread.sleep(ConfigurationTypeHelper.getTimeInMillis(majcDelay)); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/test/src/main/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java index 1188915..ab54b3a 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java @@ -16,6 +16,7 @@ */ package org.apache.accumulo.test.functional; +import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static org.junit.Assert.fail; import java.util.Map; @@ -29,7 +30,7 @@ import org.apache.accumulo.core.client.impl.ClientContext; import org.apache.accumulo.core.client.impl.Credentials; import org.apache.accumulo.core.client.impl.MasterClient; import org.apache.accumulo.core.client.impl.thrift.ThriftNotActiveServiceException; -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.master.thrift.MasterClientService; import org.apache.accumulo.core.master.thrift.MasterMonitorInfo; @@ -44,8 +45,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; - public class DynamicThreadPoolsIT extends AccumuloClusterHarness { @Override @@ -69,7 +68,7 @@ public class DynamicThreadPoolsIT extends AccumuloClusterHarness { majcDelay = c.instanceOperations().getSystemConfiguration().get(Property.TSERV_MAJC_DELAY.getKey()); c.instanceOperations().setProperty(Property.TSERV_MAJC_DELAY.getKey(), "100ms"); if (getClusterType() == ClusterType.STANDALONE) { - Thread.sleep(AccumuloConfiguration.getTimeInMillis(majcDelay)); + Thread.sleep(ConfigurationTypeHelper.getTimeInMillis(majcDelay)); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java index 0074eac..ddace91 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java @@ -16,6 +16,7 @@ */ package org.apache.accumulo.test.functional; +import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; import java.util.Iterator; @@ -28,7 +29,7 @@ import org.apache.accumulo.core.client.BatchWriterConfig; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.admin.InstanceOperations; -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.Key; import org.apache.accumulo.core.data.Mutation; @@ -44,8 +45,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; - public class ScanSessionTimeOutIT extends AccumuloClusterHarness { private static final Logger log = LoggerFactory.getLogger(ScanSessionTimeOutIT.class); @@ -69,7 +68,7 @@ public class ScanSessionTimeOutIT extends AccumuloClusterHarness { sessionIdle = ops.getSystemConfiguration().get(Property.TSERV_SESSION_MAXIDLE.getKey()); ops.setProperty(Property.TSERV_SESSION_MAXIDLE.getKey(), getMaxIdleTimeString()); log.info("Waiting for existing session idle time to expire"); - Thread.sleep(AccumuloConfiguration.getTimeInMillis(sessionIdle)); + Thread.sleep(ConfigurationTypeHelper.getTimeInMillis(sessionIdle)); log.info("Finished waiting"); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java index d8eff6f..6009636 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java @@ -34,7 +34,7 @@ import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.admin.InstanceOperations; import org.apache.accumulo.core.client.security.tokens.PasswordToken; -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.Key; import org.apache.accumulo.core.data.Value; @@ -96,7 +96,7 @@ public class SplitIT extends AccumuloClusterHarness { // If we restarted the tservers, we don't need to re-wait for the majc delay if (!restarted) { - long millis = AccumuloConfiguration.getTimeInMillis(tservMajcDelay); + long millis = ConfigurationTypeHelper.getTimeInMillis(tservMajcDelay); log.info("Waiting for majc delay period: {}ms", millis); Thread.sleep(millis); log.info("Finished waiting for majc delay period"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java b/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java index 5af9ebe..61b8232 100644 --- a/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java +++ b/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java @@ -94,7 +94,7 @@ public class CloseWriteAheadLogReferencesIT extends ConfigurableMacBase { expect(mockInst.getZooKeepersSessionTimeOut()).andReturn(30000).anyTimes(); final AccumuloConfiguration systemConf = new ConfigurationCopy(new HashMap()); ServerConfigurationFactory factory = createMock(ServerConfigurationFactory.class); - expect(factory.getConfiguration()).andReturn(systemConf).anyTimes(); + expect(factory.getSystemConfiguration()).andReturn(systemConf).anyTimes(); expect(factory.getInstance()).andReturn(mockInst).anyTimes(); expect(factory.getSiteConfiguration()).andReturn(siteConfig).anyTimes(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java index a581099..6239ea7 100644 --- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java +++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java @@ -107,7 +107,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness { insertData(table, currentTimeMillis()); ClientConfiguration clientConf = cluster.getClientConfig(); - AccumuloConfiguration clusterClientConf = new ConfigurationCopy(new DefaultConfiguration()); + AccumuloConfiguration clusterClientConf = new ConfigurationCopy(DefaultConfiguration.getInstance()); // Pass SSL and CredentialProvider options into the ClientConfiguration given to AccumuloInputFormat boolean sslEnabled = Boolean.valueOf(clusterClientConf.get(Property.INSTANCE_RPC_SSL_ENABLED)); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/test/src/main/java/org/apache/accumulo/test/performance/metadata/FastBulkImportIT.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/performance/metadata/FastBulkImportIT.java b/test/src/main/java/org/apache/accumulo/test/performance/metadata/FastBulkImportIT.java index cd8c9d5..17894b0 100644 --- a/test/src/main/java/org/apache/accumulo/test/performance/metadata/FastBulkImportIT.java +++ b/test/src/main/java/org/apache/accumulo/test/performance/metadata/FastBulkImportIT.java @@ -23,7 +23,7 @@ import java.util.SortedSet; import java.util.TreeSet; import org.apache.accumulo.core.client.Connector; -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; import org.apache.accumulo.core.data.Value; @@ -91,7 +91,7 @@ public class FastBulkImportIT extends ConfigurableMacBase { fs.mkdirs(files); for (int i = 0; i < 100; i++) { FileSKVWriter writer = FileOperations.getInstance().newWriterBuilder().forFile(files.toString() + "/bulk_" + i + "." + RFile.EXTENSION, fs, fs.getConf()) - .withTableConfiguration(AccumuloConfiguration.getDefaultConfiguration()).build(); + .withTableConfiguration(DefaultConfiguration.getInstance()).build(); writer.startDefaultLocalityGroup(); for (int j = 0x100; j < 0xfff; j += 3) { writer.append(new Key(Integer.toHexString(j)), new Value(new byte[0])); http://git-wip-us.apache.org/repos/asf/accumulo/blob/b78edd33/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java index f4c9078..ceb1252 100644 --- a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java +++ b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java @@ -111,7 +111,7 @@ public class CollectTabletStats { Instance instance = opts.getInstance(); final ServerConfigurationFactory sconf = new ServerConfigurationFactory(instance); Credentials creds = new Credentials(opts.getPrincipal(), opts.getToken()); - ClientContext context = new ClientContext(instance, creds, sconf.getConfiguration()); + ClientContext context = new ClientContext(instance, creds, sconf.getSystemConfiguration()); String tableId = Tables.getNameToIdMap(instance).get(opts.getTableName()); if (tableId == null) { @@ -162,7 +162,7 @@ public class CollectTabletStats { Test test = new Test(ke) { @Override public int runTest() throws Exception { - return readFiles(fs, sconf.getConfiguration(), files, ke, columns); + return readFiles(fs, sconf.getSystemConfiguration(), files, ke, columns); } }; @@ -479,7 +479,7 @@ public class CollectTabletStats { for (FileRef file : files) { FileSystem ns = fs.getVolumeByPath(file.path()).getFileSystem(); readers.add(FileOperations.getInstance().newReaderBuilder().forFile(file.path().toString(), ns, ns.getConf()) - .withTableConfiguration(aconf.getConfiguration()).build()); + .withTableConfiguration(aconf.getSystemConfiguration()).build()); } List emptyIterinfo = Collections.emptyList();