From commits-return-22413-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Thu Dec 13 21:55:03 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id B24D3180609 for ; Thu, 13 Dec 2018 21:55:01 +0100 (CET) Received: (qmail 68606 invoked by uid 500); 13 Dec 2018 20:55:00 -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 68597 invoked by uid 99); 13 Dec 2018 20:55:00 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Dec 2018 20:55:00 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 2B9C382F11; Thu, 13 Dec 2018 20:55:00 +0000 (UTC) Date: Thu, 13 Dec 2018 20:55:00 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] branch master updated: #820 - Converted getClient to createClient (#828) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154473450005.28684.10987502752534404914@gitbox.apache.org> From: mwalch@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 18d30b1db9aa025d7270092081792ae3f92a810d X-Git-Newrev: e154a4139e7e143e429c287a0484be1801dcc4e7 X-Git-Rev: e154a4139e7e143e429c287a0484be1801dcc4e7 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. mwalch pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/master by this push: new e154a41 #820 - Converted getClient to createClient (#828) e154a41 is described below commit e154a4139e7e143e429c287a0484be1801dcc4e7 Author: Mike Walch AuthorDate: Thu Dec 13 15:54:55 2018 -0500 #820 - Converted getClient to createClient (#828) --- .../hadoop/its/mapred/AccumuloOutputFormatIT.java | 4 ++-- .../accumulo/hadoop/its/mapreduce/RowHashIT.java | 2 +- .../org/apache/accumulo/test/AuditMessageIT.java | 2 +- .../org/apache/accumulo/test/BalanceFasterIT.java | 2 +- .../accumulo/test/BalanceWithOfflineTableIT.java | 2 +- .../accumulo/test/BulkImportMonitoringIT.java | 2 +- .../test/ConfigurableMajorCompactionIT.java | 2 +- .../accumulo/test/CountNameNodeOpsBulkIT.java | 2 +- .../accumulo/test/DetectDeadTabletServersIT.java | 2 +- .../org/apache/accumulo/test/ExistingMacIT.java | 2 +- .../apache/accumulo/test/GarbageCollectWALIT.java | 2 +- .../org/apache/accumulo/test/LargeSplitRowIT.java | 10 ++++----- .../java/org/apache/accumulo/test/ManySplitIT.java | 2 +- .../test/MasterRepairsDualAssignmentIT.java | 2 +- .../apache/accumulo/test/MetaGetsReadersIT.java | 2 +- .../org/apache/accumulo/test/MetaRecoveryIT.java | 2 +- .../test/MissingWalHeaderCompletesRecoveryIT.java | 8 +++---- .../apache/accumulo/test/MultiTableRecoveryIT.java | 4 ++-- .../accumulo/test/RewriteTabletDirectoriesIT.java | 2 +- .../accumulo/test/TabletServerGivesUpIT.java | 2 +- .../accumulo/test/TabletServerHdfsRestartIT.java | 2 +- .../org/apache/accumulo/test/TotalQueuedIT.java | 2 +- .../test/TracerRecoversAfterOfflineTableIT.java | 2 +- .../java/org/apache/accumulo/test/UnusedWALIT.java | 2 +- .../accumulo/test/VerifySerialRecoveryIT.java | 2 +- .../accumulo/test/VolumeChooserFailureIT.java | 4 ++-- .../org/apache/accumulo/test/VolumeChooserIT.java | 10 ++++----- .../java/org/apache/accumulo/test/VolumeIT.java | 14 ++++++------ .../org/apache/accumulo/test/WaitForBalanceIT.java | 2 +- .../accumulo/test/functional/BackupMasterIT.java | 2 +- .../functional/BalanceAfterCommsFailureIT.java | 2 +- .../accumulo/test/functional/CleanTmpIT.java | 2 +- .../test/functional/ConfigurableCompactionIT.java | 4 ++-- .../test/functional/ConfigurableMacBase.java | 11 ++------- .../accumulo/test/functional/DurabilityIT.java | 14 ++++++------ .../test/functional/GarbageCollectorIT.java | 10 ++++----- .../test/functional/HalfDeadTServerIT.java | 2 +- .../accumulo/test/functional/MapReduceIT.java | 2 +- .../test/functional/MetadataMaxFilesIT.java | 2 +- .../accumulo/test/functional/MetadataSplitIT.java | 2 +- .../test/functional/RecoveryWithEmptyRFileIT.java | 2 +- .../test/functional/RegexGroupBalanceIT.java | 2 +- .../test/functional/SessionDurabilityIT.java | 8 +++---- .../accumulo/test/functional/ShutdownIT.java | 4 ++-- .../test/functional/SimpleBalancerFairnessIT.java | 2 +- .../org/apache/accumulo/test/functional/SslIT.java | 10 ++++----- .../test/functional/WatchTheWatchCountIT.java | 2 +- .../accumulo/test/functional/ZooCacheIT.java | 2 +- .../test/functional/ZookeeperRestartIT.java | 2 +- .../CloseWriteAheadLogReferencesIT.java | 8 ++++++- .../test/mapred/AccumuloOutputFormatIT.java | 4 ++-- .../apache/accumulo/test/master/MergeStateIT.java | 2 +- .../test/performance/RollWALPerformanceIT.java | 2 +- .../accumulo/test/proxy/ProxyDurabilityIT.java | 2 +- .../test/replication/FinishedWorkUpdaterIT.java | 2 +- ...GarbageCollectorCommunicatesWithTServersIT.java | 8 +++---- .../replication/MultiInstanceReplicationIT.java | 8 +++---- .../replication/MultiTserverReplicationIT.java | 4 ++-- .../RemoveCompleteReplicationRecordsIT.java | 2 +- .../accumulo/test/replication/ReplicationIT.java | 26 +++++++++++----------- .../replication/ReplicationOperationsImplIT.java | 2 +- .../test/replication/SequentialWorkAssignerIT.java | 2 +- .../accumulo/test/replication/StatusMakerIT.java | 2 +- .../test/replication/UnorderedWorkAssignerIT.java | 2 +- .../UnorderedWorkAssignerReplicationIT.java | 8 +++---- .../UnusedWalDoesntCloseReplicationStatusIT.java | 2 +- .../accumulo/test/replication/WorkMakerIT.java | 2 +- 67 files changed, 136 insertions(+), 137 deletions(-) diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloOutputFormatIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloOutputFormatIT.java index 87438e6..74ea09f 100644 --- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloOutputFormatIT.java +++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloOutputFormatIT.java @@ -70,7 +70,7 @@ public class AccumuloOutputFormatIT extends ConfigurableMacBase { // Prevent regression of ACCUMULO-3709. @Test public void testMapred() throws Exception { - try (AccumuloClient accumuloClient = getClient()) { + try (AccumuloClient accumuloClient = createClient()) { // create a table and put some data in it accumuloClient.tableOperations().create(testName.getMethodName()); @@ -200,7 +200,7 @@ public class AccumuloOutputFormatIT extends ConfigurableMacBase { @Test public void testMR() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { String instanceName = getCluster().getInstanceName(); String table1 = instanceName + "_t1"; String table2 = instanceName + "_t2"; diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/RowHashIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/RowHashIT.java index fe39b20..f6ad850 100644 --- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/RowHashIT.java +++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/RowHashIT.java @@ -77,7 +77,7 @@ public class RowHashIT extends ConfigurableMacBase { @Test public void test() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { runTest(client, getCluster()); } } diff --git a/test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java b/test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java index aa63241..fa9bbad 100644 --- a/test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java +++ b/test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java @@ -167,7 +167,7 @@ public class AuditMessageIT extends ConfigurableMacBase { @Before public void resetInstance() throws Exception { - client = getClient(); + client = createClient(); removeUsersAndTables(); diff --git a/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java b/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java index 825a9ba..28f3c97 100644 --- a/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java +++ b/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java @@ -65,7 +65,7 @@ public class BalanceFasterIT extends ConfigurableMacBase { public void test() throws Exception { // create a table, add a bunch of splits String tableName = getUniqueNames(1)[0]; - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { client.tableOperations().create(tableName); SortedSet splits = new TreeSet<>(); for (int i = 0; i < 1000; i++) { diff --git a/test/src/main/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java b/test/src/main/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java index c4671ac..32e0513 100644 --- a/test/src/main/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java +++ b/test/src/main/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java @@ -46,7 +46,7 @@ public class BalanceWithOfflineTableIT extends ConfigurableMacBase { final String tableName = tableNames[0]; // create a table with a bunch of splits - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { log.info("Creating table {}", tableName); c.tableOperations().create(tableName); final SortedSet splits = new TreeSet<>(); 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 84ed7f6..c18bf8d 100644 --- a/test/src/main/java/org/apache/accumulo/test/BulkImportMonitoringIT.java +++ b/test/src/main/java/org/apache/accumulo/test/BulkImportMonitoringIT.java @@ -62,7 +62,7 @@ public class BulkImportMonitoringIT extends ConfigurableMacBase { @Test public void test() throws Exception { getCluster().getClusterControl().start(ServerType.MONITOR); - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { final String tableName = getUniqueNames(1)[0]; c.tableOperations().create(tableName); c.tableOperations().setProperty(tableName, Property.TABLE_MAJC_RATIO.getKey(), "1"); diff --git a/test/src/main/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java b/test/src/main/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java index 70bf322..34c107e 100644 --- a/test/src/main/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java @@ -81,7 +81,7 @@ public class ConfigurableMajorCompactionIT extends ConfigurableMacBase { @Test public void test() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { String tableName = getUniqueNames(1)[0]; client.tableOperations().create(tableName); client.tableOperations().setProperty(tableName, Property.TABLE_COMPACTION_STRATEGY.getKey(), diff --git a/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java b/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java index 576a2aa..06f4ce5 100644 --- a/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java +++ b/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java @@ -93,7 +93,7 @@ public class CountNameNodeOpsBulkIT extends ConfigurableMacBase { @Test public void compareOldNewBulkImportTest() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { getCluster().getClusterControl().kill(ServerType.GARBAGE_COLLECTOR, "localhost"); final String tableName = getUniqueNames(1)[0]; c.tableOperations().create(tableName); diff --git a/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java b/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java index 9a9763e..b268d5b 100644 --- a/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java +++ b/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java @@ -51,7 +51,7 @@ public class DetectDeadTabletServersIT extends ConfigurableMacBase { @Test public void test() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { log.info("verifying that everything is up"); Iterators.size(c.createScanner(MetadataTable.NAME, Authorizations.EMPTY).iterator()); 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 54c02cb..0820be5 100644 --- a/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ExistingMacIT.java @@ -158,7 +158,7 @@ public class ExistingMacIT extends ConfigurableMacBase { @Test public void testExistingRunningInstance() throws Exception { final String table = getUniqueNames(1)[0]; - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { // Ensure that a master and tserver are up so the existing instance check won't fail. client.tableOperations().create(table); BatchWriter bw = client.createBatchWriter(table, new BatchWriterConfig()); diff --git a/test/src/main/java/org/apache/accumulo/test/GarbageCollectWALIT.java b/test/src/main/java/org/apache/accumulo/test/GarbageCollectWALIT.java index a8b5127..9e6b732 100644 --- a/test/src/main/java/org/apache/accumulo/test/GarbageCollectWALIT.java +++ b/test/src/main/java/org/apache/accumulo/test/GarbageCollectWALIT.java @@ -53,7 +53,7 @@ public class GarbageCollectWALIT extends ConfigurableMacBase { // not yet, please String tableName = getUniqueNames(1)[0]; cluster.getClusterControl().stop(ServerType.GARBAGE_COLLECTOR); - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { c.tableOperations().create(tableName); // count the number of WALs in the filesystem assertEquals(2, countWALsInFS(cluster)); 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 7275586..d527ecf 100644 --- a/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java +++ b/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java @@ -67,7 +67,7 @@ public class LargeSplitRowIT extends ConfigurableMacBase { // make a table and lower the TABLE_END_ROW_MAX_SIZE property final String tableName = getUniqueNames(1)[0]; - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { client.tableOperations().create(tableName); client.tableOperations().setProperty(tableName, Property.TABLE_MAX_END_ROW_SIZE.getKey(), "1000"); @@ -121,7 +121,7 @@ public class LargeSplitRowIT extends ConfigurableMacBase { // make a table and lower the configure properties final String tableName = getUniqueNames(1)[0]; - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { client.tableOperations().create(tableName); client.tableOperations().setProperty(tableName, Property.TABLE_SPLIT_THRESHOLD.getKey(), "10K"); @@ -180,7 +180,7 @@ public class LargeSplitRowIT extends ConfigurableMacBase { @Test(timeout = 60 * 1000) public void automaticSplitWithGaps() throws Exception { log.info("Automatic Split With Gaps"); - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { automaticSplit(client, 30, 2); } } @@ -189,7 +189,7 @@ public class LargeSplitRowIT extends ConfigurableMacBase { @Test(timeout = 60 * 1000) public void automaticSplitWithoutGaps() throws Exception { log.info("Automatic Split Without Gaps"); - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { automaticSplit(client, 15, 1); } } @@ -197,7 +197,7 @@ public class LargeSplitRowIT extends ConfigurableMacBase { @Test(timeout = 60 * 1000) public void automaticSplitLater() throws Exception { log.info("Split later"); - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { automaticSplit(client, 15, 1); String tableName = new String(); diff --git a/test/src/main/java/org/apache/accumulo/test/ManySplitIT.java b/test/src/main/java/org/apache/accumulo/test/ManySplitIT.java index ba132d8..0d42cef 100644 --- a/test/src/main/java/org/apache/accumulo/test/ManySplitIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ManySplitIT.java @@ -59,7 +59,7 @@ public class ManySplitIT extends ConfigurableMacBase { final String tableName = getUniqueNames(1)[0]; - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { log.info("Creating table"); log.info("splitting metadata table"); diff --git a/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java b/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java index c6b90c5..cac4b63 100644 --- a/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java +++ b/test/src/main/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java @@ -69,7 +69,7 @@ public class MasterRepairsDualAssignmentIT extends ConfigurableMacBase { @Test public void test() throws Exception { // make some tablets, spread 'em around - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { ClientContext context = getClientContext(); String table = this.getUniqueNames(1)[0]; c.securityOperations().grantTablePermission("root", MetadataTable.NAME, diff --git a/test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java b/test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java index c6412ff..d0112db 100644 --- a/test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java +++ b/test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java @@ -80,7 +80,7 @@ public class MetaGetsReadersIT extends ConfigurableMacBase { @Test(timeout = 2 * 60 * 1000) public void test() throws Exception { final String tableName = getUniqueNames(1)[0]; - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { c.tableOperations().create(tableName); Random random = new SecureRandom(); BatchWriter bw = c.createBatchWriter(tableName, null); diff --git a/test/src/main/java/org/apache/accumulo/test/MetaRecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/MetaRecoveryIT.java index 141d216..1b7ac9c 100644 --- a/test/src/main/java/org/apache/accumulo/test/MetaRecoveryIT.java +++ b/test/src/main/java/org/apache/accumulo/test/MetaRecoveryIT.java @@ -56,7 +56,7 @@ public class MetaRecoveryIT extends ConfigurableMacBase { @Test(timeout = 4 * 60 * 1000) public void test() throws Exception { String[] tables = getUniqueNames(10); - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { int i = 0; for (String table : tables) { log.info("Creating table {}", i); diff --git a/test/src/main/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java index ebd0c74..85ecc0e 100644 --- a/test/src/main/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java +++ b/test/src/main/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java @@ -78,7 +78,7 @@ public class MissingWalHeaderCompletesRecoveryIT extends ConfigurableMacBase { @Before public void setupMetadataPermission() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { rootHasWritePermission = client.securityOperations().hasTablePermission("root", MetadataTable.NAME, TablePermission.WRITE); if (!rootHasWritePermission) { @@ -92,7 +92,7 @@ public class MissingWalHeaderCompletesRecoveryIT extends ConfigurableMacBase { @After public void resetMetadataPermission() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { // Final state doesn't match the original if (rootHasWritePermission != client.securityOperations().hasTablePermission("root", MetadataTable.NAME, TablePermission.WRITE)) { @@ -111,7 +111,7 @@ public class MissingWalHeaderCompletesRecoveryIT extends ConfigurableMacBase { @Test public void testEmptyWalRecoveryCompletes() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { MiniAccumuloClusterImpl cluster = getCluster(); FileSystem fs = cluster.getFileSystem(); @@ -167,7 +167,7 @@ public class MissingWalHeaderCompletesRecoveryIT extends ConfigurableMacBase { @Test public void testPartialHeaderWalRecoveryCompletes() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { MiniAccumuloClusterImpl cluster = getCluster(); FileSystem fs = getCluster().getFileSystem(); diff --git a/test/src/main/java/org/apache/accumulo/test/MultiTableRecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/MultiTableRecoveryIT.java index 609e3fb..52716d2 100644 --- a/test/src/main/java/org/apache/accumulo/test/MultiTableRecoveryIT.java +++ b/test/src/main/java/org/apache/accumulo/test/MultiTableRecoveryIT.java @@ -57,7 +57,7 @@ public class MultiTableRecoveryIT extends ConfigurableMacBase { @Test(timeout = 4 * 60 * 1000) public void testRecoveryOverMultipleTables() throws Exception { final int N = 3; - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { final String[] tables = getUniqueNames(N); final BatchWriter[] writers = new BatchWriter[N]; final byte[][] values = new byte[N][]; @@ -116,7 +116,7 @@ public class MultiTableRecoveryIT extends ConfigurableMacBase { return new Thread() { @Override public void run() { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { int i = 0; while (!stop.get()) { sleepUninterruptibly(10, TimeUnit.SECONDS); diff --git a/test/src/main/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java b/test/src/main/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java index 2f1428c..d35a6c7 100644 --- a/test/src/main/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java +++ b/test/src/main/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java @@ -80,7 +80,7 @@ public class RewriteTabletDirectoriesIT extends ConfigurableMacBase { @Test public void test() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { c.securityOperations().grantTablePermission(c.whoami(), MetadataTable.NAME, TablePermission.WRITE); final String tableName = getUniqueNames(1)[0]; diff --git a/test/src/main/java/org/apache/accumulo/test/TabletServerGivesUpIT.java b/test/src/main/java/org/apache/accumulo/test/TabletServerGivesUpIT.java index 7b608ca..8d8645a 100644 --- a/test/src/main/java/org/apache/accumulo/test/TabletServerGivesUpIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TabletServerGivesUpIT.java @@ -46,7 +46,7 @@ public class TabletServerGivesUpIT extends ConfigurableMacBase { @Test(timeout = 45 * 1000) public void test() throws Exception { - try (AccumuloClient client = this.getClient()) { + try (AccumuloClient client = this.createClient()) { // Yes, there's a tabletserver assertEquals(1, client.instanceOperations().getTabletServers().size()); final String tableName = getUniqueNames(1)[0]; diff --git a/test/src/main/java/org/apache/accumulo/test/TabletServerHdfsRestartIT.java b/test/src/main/java/org/apache/accumulo/test/TabletServerHdfsRestartIT.java index 63d81de..097efd7 100644 --- a/test/src/main/java/org/apache/accumulo/test/TabletServerHdfsRestartIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TabletServerHdfsRestartIT.java @@ -44,7 +44,7 @@ public class TabletServerHdfsRestartIT extends ConfigurableMacBase { @Test(timeout = 2 * 60 * 1000) public void test() throws Exception { - try (AccumuloClient client = this.getClient()) { + try (AccumuloClient client = this.createClient()) { // Yes, there's a tabletserver assertEquals(1, client.instanceOperations().getTabletServers().size()); final String tableName = getUniqueNames(1)[0]; diff --git a/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java b/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java index e746eed..78d9e01 100644 --- a/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java @@ -56,7 +56,7 @@ public class TotalQueuedIT extends ConfigurableMacBase { @Test(timeout = 4 * 60 * 1000) public void test() throws Exception { Random random = new SecureRandom(); - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { c.instanceOperations().setProperty(Property.TSERV_TOTAL_MUTATION_QUEUE_MAX.getKey(), "" + SMALL_QUEUE_SIZE); String tableName = getUniqueNames(1)[0]; diff --git a/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java b/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java index 36f9281..eb715ad 100644 --- a/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java @@ -55,7 +55,7 @@ public class TracerRecoversAfterOfflineTableIT extends ConfigurableMacBase { @Test public void test() throws Exception { Process tracer = null; - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { if (!client.tableOperations().exists("trace")) { MiniAccumuloClusterImpl mac = cluster; tracer = mac.exec(TraceServer.class); diff --git a/test/src/main/java/org/apache/accumulo/test/UnusedWALIT.java b/test/src/main/java/org/apache/accumulo/test/UnusedWALIT.java index cc80d3b..33f5f41 100644 --- a/test/src/main/java/org/apache/accumulo/test/UnusedWALIT.java +++ b/test/src/main/java/org/apache/accumulo/test/UnusedWALIT.java @@ -78,7 +78,7 @@ public class UnusedWALIT extends ConfigurableMacBase { String[] tableNames = getUniqueNames(2); String bigTable = tableNames[0]; String lilTable = tableNames[1]; - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { c.tableOperations().create(bigTable); c.tableOperations().create(lilTable); diff --git a/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java index 901c8ab..ef3d6b3 100644 --- a/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java +++ b/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java @@ -74,7 +74,7 @@ public class VerifySerialRecoveryIT extends ConfigurableMacBase { public void testSerializedRecovery() throws Exception { // make a table with many splits String tableName = getUniqueNames(1)[0]; - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { c.tableOperations().create(tableName); SortedSet splits = new TreeSet<>(); for (int i = 0; i < 200; i++) { diff --git a/test/src/main/java/org/apache/accumulo/test/VolumeChooserFailureIT.java b/test/src/main/java/org/apache/accumulo/test/VolumeChooserFailureIT.java index 66bc314..ce464dc 100644 --- a/test/src/main/java/org/apache/accumulo/test/VolumeChooserFailureIT.java +++ b/test/src/main/java/org/apache/accumulo/test/VolumeChooserFailureIT.java @@ -117,7 +117,7 @@ public class VolumeChooserFailureIT extends ConfigurableMacBase { log.info("Starting missingVolumePreferredVolumeChooser"); // Create namespace - try (AccumuloClient accumuloClient = getClient()) { + try (AccumuloClient accumuloClient = createClient()) { accumuloClient.namespaceOperations().create(namespace1); // Set properties on the namespace @@ -140,7 +140,7 @@ public class VolumeChooserFailureIT extends ConfigurableMacBase { log.info("Starting notInstancePreferredVolumeChooser"); // Create namespace - try (AccumuloClient accumuloClient = getClient()) { + try (AccumuloClient accumuloClient = createClient()) { accumuloClient.namespaceOperations().create(namespace1); // Set properties on the namespace diff --git a/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java b/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java index 369505c..668101f 100644 --- a/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java +++ b/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java @@ -259,7 +259,7 @@ public class VolumeChooserIT extends ConfigurableMacBase { log.info("Starting twoTablesPreferredVolumeChooser"); // Create namespace - try (AccumuloClient accumuloClient = getClient()) { + try (AccumuloClient accumuloClient = createClient()) { accumuloClient.namespaceOperations().create(namespace1); // Set properties on the namespace @@ -291,7 +291,7 @@ public class VolumeChooserIT extends ConfigurableMacBase { log.info("Starting twoTablesRandomVolumeChooser()"); // Create namespace - try (AccumuloClient accumuloClient = getClient()) { + try (AccumuloClient accumuloClient = createClient()) { accumuloClient.namespaceOperations().create(namespace1); // Set properties on the namespace @@ -342,7 +342,7 @@ public class VolumeChooserIT extends ConfigurableMacBase { log.info("Starting twoTablesDiffChoosers"); // Create namespace - try (AccumuloClient accumuloClient = getClient()) { + try (AccumuloClient accumuloClient = createClient()) { accumuloClient.namespaceOperations().create(namespace1); // Set properties on the namespace @@ -366,7 +366,7 @@ public class VolumeChooserIT extends ConfigurableMacBase { @Test public void includeSpecialVolumeForTable() throws Exception { log.info("Starting includeSpecialVolumeForTable"); - try (AccumuloClient accumuloClient = getClient()) { + try (AccumuloClient accumuloClient = createClient()) { // the following table will be configured to go to the excluded volume String configuredVolumes = v4.toString(); @@ -380,7 +380,7 @@ public class VolumeChooserIT extends ConfigurableMacBase { public void waLogsSentToConfiguredVolumes() throws Exception { log.info("Starting waLogsSentToConfiguredVolumes"); - try (AccumuloClient accumuloClient = getClient()) { + try (AccumuloClient accumuloClient = createClient()) { String tableName = "anotherTable"; accumuloClient.tableOperations().create(tableName); diff --git a/test/src/main/java/org/apache/accumulo/test/VolumeIT.java b/test/src/main/java/org/apache/accumulo/test/VolumeIT.java index f52c382..c9626f6 100644 --- a/test/src/main/java/org/apache/accumulo/test/VolumeIT.java +++ b/test/src/main/java/org/apache/accumulo/test/VolumeIT.java @@ -122,7 +122,7 @@ public class VolumeIT extends ConfigurableMacBase { @Test public void test() throws Exception { // create a table - try (AccumuloClient accumuloClient = getClient()) { + try (AccumuloClient accumuloClient = createClient()) { String tableName = getUniqueNames(1)[0]; accumuloClient.tableOperations().create(tableName); SortedSet partitions = new TreeSet<>(); @@ -193,7 +193,7 @@ public class VolumeIT extends ConfigurableMacBase { List expected = new ArrayList<>(); - try (AccumuloClient accumuloClient = getClient()) { + try (AccumuloClient accumuloClient = createClient()) { String tableName = getUniqueNames(1)[0]; accumuloClient.tableOperations().create(tableName, new NewTableConfiguration().withoutDefaultIterators()); @@ -282,7 +282,7 @@ public class VolumeIT extends ConfigurableMacBase { @Test public void testAddVolumes() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { String[] tableNames = getUniqueNames(2); // grab this before shutting down cluster @@ -328,7 +328,7 @@ public class VolumeIT extends ConfigurableMacBase { String[] tableNames = getUniqueNames(2); // grab this before shutting down cluster - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { String uuid = client.getInstanceID(); verifyVolumesUsed(client, tableNames[0], false, v1, v2); @@ -489,7 +489,7 @@ public class VolumeIT extends ConfigurableMacBase { @Test public void testRemoveVolumes() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { String[] tableNames = getUniqueNames(2); verifyVolumesUsed(client, tableNames[0], false, v1, v2); @@ -590,14 +590,14 @@ public class VolumeIT extends ConfigurableMacBase { @Test public void testCleanReplaceVolumes() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { testReplaceVolume(client, true); } } @Test public void testDirtyReplaceVolumes() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { testReplaceVolume(client, false); } } diff --git a/test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java b/test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java index d753b7f..4dbefdf 100644 --- a/test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java +++ b/test/src/main/java/org/apache/accumulo/test/WaitForBalanceIT.java @@ -48,7 +48,7 @@ public class WaitForBalanceIT extends ConfigurableMacBase { @Test public void test() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { // ensure the metadata table is online Iterators.size(c.createScanner(MetadataTable.NAME, Authorizations.EMPTY).iterator()); c.instanceOperations().waitForBalance(); diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BackupMasterIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BackupMasterIT.java index 18f810b..fe0b5cc 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BackupMasterIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BackupMasterIT.java @@ -41,7 +41,7 @@ public class BackupMasterIT extends ConfigurableMacBase { UtilWaitThread.sleep(1000); // create a backup Process backup = exec(Master.class); - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { String secret = getCluster().getSiteConfiguration().get(Property.INSTANCE_SECRET); IZooReaderWriter writer = new ZooReaderWriterFactory() .getZooReaderWriter(cluster.getZooKeepers(), 30 * 1000, secret); diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java index e2faf63..e4862a7 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java @@ -63,7 +63,7 @@ public class BalanceAfterCommsFailureIT extends ConfigurableMacBase { @Test public void test() throws Exception { - try (AccumuloClient c = this.getClient()) { + try (AccumuloClient c = this.createClient()) { c.tableOperations().create("test"); Collection tservers = getCluster().getProcesses() .get(ServerType.TABLET_SERVER); diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CleanTmpIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CleanTmpIT.java index ada13af..f8f3f75 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CleanTmpIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CleanTmpIT.java @@ -65,7 +65,7 @@ public class CleanTmpIT extends ConfigurableMacBase { @Test public void test() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { // make a table String tableName = getUniqueNames(1)[0]; c.tableOperations().create(tableName); diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java index 43c5686..03bf219 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java @@ -91,7 +91,7 @@ public class ConfigurableCompactionIT extends ConfigurableMacBase { @Test public void test() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { final String tableName = getUniqueNames(1)[0]; c.tableOperations().create(tableName); c.tableOperations().setProperty(tableName, Property.TABLE_COMPACTION_STRATEGY.getKey(), @@ -105,7 +105,7 @@ public class ConfigurableCompactionIT extends ConfigurableMacBase { @Test public void testPerTableClasspath() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { final String tableName = getUniqueNames(1)[0]; File destFile = installJar(getCluster().getConfig().getAccumuloDir(), "/TestCompactionStrat.jar"); diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java index 1d50404..f34604d 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java @@ -69,7 +69,6 @@ public class ConfigurableMacBase extends AccumuloITBase { public static final Logger log = LoggerFactory.getLogger(ConfigurableMacBase.class); protected MiniAccumuloClusterImpl cluster; - protected AccumuloClient client; protected void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {} @@ -190,20 +189,14 @@ public class ConfigurableMacBase extends AccumuloITBase { // ignored } } - if (client != null) { - client.close(); - } } protected MiniAccumuloClusterImpl getCluster() { return cluster; } - protected AccumuloClient getClient() { - if (client == null) { - client = getCluster().createAccumuloClient("root", new PasswordToken(ROOT_PASSWORD)); - } - return client; + protected AccumuloClient createClient() { + return getCluster().createAccumuloClient("root", new PasswordToken(ROOT_PASSWORD)); } protected ClientContext getClientContext() { diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java index c2aff7b..8b21d1e 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java @@ -92,7 +92,7 @@ public class DurabilityIT extends ConfigurableMacBase { @Test(timeout = 2 * 60 * 1000) public void testWriteSpeed() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { TableOperations tableOps = client.tableOperations(); String tableNames[] = init(client); // write some gunk, delete the table to keep that table from messing with the performance @@ -118,7 +118,7 @@ public class DurabilityIT extends ConfigurableMacBase { @Test(timeout = 4 * 60 * 1000) public void testSync() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { String tableNames[] = init(client); // sync table should lose nothing writeSome(client, tableNames[0], N); @@ -130,7 +130,7 @@ public class DurabilityIT extends ConfigurableMacBase { @Test(timeout = 4 * 60 * 1000) public void testFlush() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { String tableNames[] = init(client); // flush table won't lose anything since we're not losing power/dfs writeSome(client, tableNames[1], N); @@ -142,7 +142,7 @@ public class DurabilityIT extends ConfigurableMacBase { @Test(timeout = 4 * 60 * 1000) public void testLog() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { String tableNames[] = init(client); // we're probably going to lose something the the log setting writeSome(client, tableNames[2], N); @@ -155,7 +155,7 @@ public class DurabilityIT extends ConfigurableMacBase { @Test(timeout = 4 * 60 * 1000) public void testNone() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { String tableNames[] = init(client); // probably won't get any data back without logging writeSome(client, tableNames[3], N); @@ -168,7 +168,7 @@ public class DurabilityIT extends ConfigurableMacBase { @Test(timeout = 4 * 60 * 1000) public void testIncreaseDurability() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { String tableName = getUniqueNames(1)[0]; c.tableOperations().create(tableName); c.tableOperations().setProperty(tableName, Property.TABLE_DURABILITY.getKey(), "none"); @@ -193,7 +193,7 @@ public class DurabilityIT extends ConfigurableMacBase { @Test(timeout = 4 * 60 * 1000) public void testMetaDurability() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { String tableName = getUniqueNames(1)[0]; c.instanceOperations().setProperty(Property.TABLE_DURABILITY.getKey(), "none"); Map props = map(c.tableOperations().getProperties(MetadataTable.NAME)); diff --git a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java index c8101ee..4182a57 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java @@ -115,7 +115,7 @@ public class GarbageCollectorIT extends ConfigurableMacBase { @Test public void gcTest() throws Exception { killMacGc(); - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { c.tableOperations().create("test_ingest"); c.tableOperations().setProperty("test_ingest", Property.TABLE_SPLIT_THRESHOLD.getKey(), "5K"); TestIngest.Opts opts = new TestIngest.Opts(); @@ -149,7 +149,7 @@ public class GarbageCollectorIT extends ConfigurableMacBase { killMacGc(); log.info("Filling metadata table with bogus delete flags"); - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { addEntries(c, new BatchWriterOpts()); cluster.getConfig().setDefaultMemory(10, MemoryUnit.MEGABYTE); Process gc = cluster.exec(SimpleGarbageCollector.class); @@ -173,7 +173,7 @@ public class GarbageCollectorIT extends ConfigurableMacBase { public void dontGCRootLog() throws Exception { killMacGc(); // dirty metadata - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { String table = getUniqueNames(1)[0]; c.tableOperations().create(table); // let gc run for a bit @@ -203,7 +203,7 @@ public class GarbageCollectorIT extends ConfigurableMacBase { @Test public void testInvalidDelete() throws Exception { killMacGc(); - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { String table = getUniqueNames(1)[0]; c.tableOperations().create(table); @@ -256,7 +256,7 @@ public class GarbageCollectorIT extends ConfigurableMacBase { @Test public void testProperPortAdvertisement() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { ZooReaderWriter zk = new ZooReaderWriter(cluster.getZooKeepers(), 30000, OUR_SECRET); String path = ZooUtil.getRoot(client.getInstanceID()) + Constants.ZGC_LOCK; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java index 1c20a30..edc14d7 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java @@ -119,7 +119,7 @@ public class HalfDeadTServerIT extends ConfigurableMacBase { public String test(int seconds, boolean expectTserverDied) throws Exception { if (!makeDiskFailureLibrary()) return null; - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { assertEquals(1, c.instanceOperations().getTabletServers().size()); // create our own tablet server with the special test library diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MapReduceIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MapReduceIT.java index c015ce5..dc16e07 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/MapReduceIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/MapReduceIT.java @@ -65,7 +65,7 @@ public class MapReduceIT extends ConfigurableMacBase { @Test public void test() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { runTest(client, getCluster()); } } diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java index 1be20f2..2eec405 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java @@ -60,7 +60,7 @@ public class MetadataMaxFilesIT extends ConfigurableMacBase { @Test public void test() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { SortedSet splits = new TreeSet<>(); for (int i = 0; i < 1000; i++) { splits.add(new Text(String.format("%03d", i))); diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MetadataSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MetadataSplitIT.java index adf3d7b..2ec02d7 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/MetadataSplitIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/MetadataSplitIT.java @@ -44,7 +44,7 @@ public class MetadataSplitIT extends ConfigurableMacBase { @Test public void test() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { assertEquals(1, c.tableOperations().listSplits(MetadataTable.NAME).size()); c.tableOperations().setProperty(MetadataTable.NAME, Property.TABLE_SPLIT_THRESHOLD.getKey(), "500"); diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RecoveryWithEmptyRFileIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RecoveryWithEmptyRFileIT.java index 5d36925..09adeb3 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/RecoveryWithEmptyRFileIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/RecoveryWithEmptyRFileIT.java @@ -69,7 +69,7 @@ public class RecoveryWithEmptyRFileIT extends ConfigurableMacBase { public void replaceMissingRFile() throws Exception { log.info("Ingest some data, verify it was stored properly, replace an" + " underlying rfile with an empty one and verify we can scan."); - try (AccumuloClient accumuloClient = getClient()) { + try (AccumuloClient accumuloClient = createClient()) { String tableName = getUniqueNames(1)[0]; ReadWriteIT.ingest(accumuloClient, getClientInfo(), ROWS, COLS, 50, 0, tableName); ReadWriteIT.verify(accumuloClient, getClientInfo(), ROWS, COLS, 50, 0, tableName); diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RegexGroupBalanceIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RegexGroupBalanceIT.java index 2ba10c8..4a17262 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/RegexGroupBalanceIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/RegexGroupBalanceIT.java @@ -53,7 +53,7 @@ public class RegexGroupBalanceIT extends ConfigurableMacBase { @Test(timeout = 120000) public void testBalancing() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { String tablename = getUniqueNames(1)[0]; client.tableOperations().create(tablename); diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java index 526acd5..208e301 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java @@ -51,7 +51,7 @@ public class SessionDurabilityIT extends ConfigurableMacBase { @Test(timeout = 3 * 60 * 1000) public void nondurableTableHasDurableWrites() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { String tableName = getUniqueNames(1)[0]; // table default has no durability c.tableOperations().create(tableName); @@ -69,7 +69,7 @@ public class SessionDurabilityIT extends ConfigurableMacBase { @Test(timeout = 3 * 60 * 1000) public void durableTableLosesNonDurableWrites() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { String tableName = getUniqueNames(1)[0]; // table default is durable writes c.tableOperations().create(tableName); @@ -101,7 +101,7 @@ public class SessionDurabilityIT extends ConfigurableMacBase { @Test(timeout = 3 * 60 * 1000) public void testConditionDurability() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { String tableName = getUniqueNames(1)[0]; // table default is durable writes c.tableOperations().create(tableName); @@ -120,7 +120,7 @@ public class SessionDurabilityIT extends ConfigurableMacBase { @Test(timeout = 3 * 60 * 1000) public void testConditionDurability2() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { String tableName = getUniqueNames(1)[0]; // table default is durable writes c.tableOperations().create(tableName); diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java index 5cac102..a87ce2e 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java @@ -73,7 +73,7 @@ public class ShutdownIT extends ConfigurableMacBase { @Test public void shutdownDuringDeleteTable() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { for (int i = 0; i < 10; i++) { c.tableOperations().create("table" + i); } @@ -104,7 +104,7 @@ public class ShutdownIT extends ConfigurableMacBase { @Test public void adminStop() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { runAdminStopTest(c, cluster); } } diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java index 807f482..139dd7c 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java @@ -63,7 +63,7 @@ public class SimpleBalancerFairnessIT extends ConfigurableMacBase { @Test public void simpleBalancerFairness() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { c.tableOperations().create("test_ingest"); c.tableOperations().setProperty("test_ingest", Property.TABLE_SPLIT_THRESHOLD.getKey(), "10K"); diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SslIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SslIT.java index 94e8cb8..eb231b7 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/SslIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/SslIT.java @@ -44,7 +44,7 @@ public class SslIT extends ConfigurableMacBase { @Test public void binary() throws AccumuloException, AccumuloSecurityException, Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { String tableName = getUniqueNames(1)[0]; client.tableOperations().create(tableName); BinaryIT.runTest(client, tableName); @@ -53,21 +53,21 @@ public class SslIT extends ConfigurableMacBase { @Test public void concurrency() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { ConcurrencyIT.runTest(client, getUniqueNames(1)[0]); } } @Test public void adminStop() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { ShutdownIT.runAdminStopTest(client, getCluster()); } } @Test public void bulk() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { BulkIT.runTest(client, getClientInfo(), cluster.getFileSystem(), new Path(getCluster().getConfig().getDir().getAbsolutePath(), "tmp"), getUniqueNames(1)[0], this.getClass().getName(), testName.getMethodName(), true); @@ -76,7 +76,7 @@ public class SslIT extends ConfigurableMacBase { @Test public void mapReduce() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { MapReduceIT.runTest(client, getCluster()); } } diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java index 4b6738e..b7e4906 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java @@ -47,7 +47,7 @@ public class WatchTheWatchCountIT extends ConfigurableMacBase { justification = "unencrypted socket is okay for testing") @Test public void test() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { String[] tableNames = getUniqueNames(3); for (String tableName : tableNames) { c.tableOperations().create(tableName); diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZooCacheIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ZooCacheIT.java index 19dc57b..666897c 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ZooCacheIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ZooCacheIT.java @@ -58,7 +58,7 @@ public class ZooCacheIT extends ConfigurableMacBase { Thread reader = new Thread() { @Override public void run() { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { CacheTestReader.main(new String[] {pathName, testDir.getAbsolutePath(), getClientInfo().getZooKeepers()}); } catch (Exception ex) { diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java index 185bf95..2e0cabf 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java @@ -59,7 +59,7 @@ public class ZookeeperRestartIT extends ConfigurableMacBase { @Test public void test() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { c.tableOperations().create("test_ingest"); BatchWriter bw = c.createBatchWriter("test_ingest", null); Mutation m = new Mutation("row"); 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 791a0b6..2fb7b2a 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 @@ -56,6 +56,7 @@ import org.apache.accumulo.server.replication.proto.Replication.Status; import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.hadoop.io.Text; import org.easymock.EasyMock; +import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -79,7 +80,7 @@ public class CloseWriteAheadLogReferencesIT extends ConfigurableMacBase { @Before public void setupInstance() throws Exception { - client = getClient(); + client = createClient(); client.securityOperations().grantTablePermission(client.whoami(), ReplicationTable.NAME, TablePermission.WRITE); client.securityOperations().grantTablePermission(client.whoami(), MetadataTable.NAME, @@ -87,6 +88,11 @@ public class CloseWriteAheadLogReferencesIT extends ConfigurableMacBase { ReplicationTable.setOnline(client); } + @After + public void teardownInstance() { + client.close(); + } + @Before public void setupEasyMockStuff() { SiteConfiguration siteConfig = EasyMock.createMock(SiteConfiguration.class); diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java index a275e11..bb43b48 100644 --- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java +++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java @@ -70,7 +70,7 @@ public class AccumuloOutputFormatIT extends ConfigurableMacBase { // Prevent regression of ACCUMULO-3709. @Test public void testMapred() throws Exception { - try (AccumuloClient accumuloClient = getClient()) { + try (AccumuloClient accumuloClient = createClient()) { // create a table and put some data in it accumuloClient.tableOperations().create(testName.getMethodName()); @@ -202,7 +202,7 @@ public class AccumuloOutputFormatIT extends ConfigurableMacBase { @Test public void testMR() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { String instanceName = getCluster().getInstanceName(); String table1 = instanceName + "_t1"; String table2 = instanceName + "_t2"; diff --git a/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java b/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java index 745fc67..eb601e6 100644 --- a/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java +++ b/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java @@ -107,7 +107,7 @@ public class MergeStateIT extends ConfigurableMacBase { @Test public void test() throws Exception { ServerContext context = EasyMock.createMock(ServerContext.class); - try (AccumuloClient accumuloClient = getClient()) { + try (AccumuloClient accumuloClient = createClient()) { EasyMock.expect(context.getClient()).andReturn(accumuloClient).anyTimes(); EasyMock.replay(context); accumuloClient.securityOperations().grantTablePermission(accumuloClient.whoami(), diff --git a/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java b/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java index 591d58d..160fe00 100644 --- a/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java +++ b/test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java @@ -107,7 +107,7 @@ public class RollWALPerformanceIT extends ConfigurableMacBase { @Test public void testWalPerformanceOnce() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { // get time with a small WAL, which will cause many WAL roll-overs long avg1 = getAverage(c); // use a bigger WAL max size to eliminate WAL roll-overs diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java b/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java index ca8bbaf..3b25622 100644 --- a/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java +++ b/test/src/main/java/org/apache/accumulo/test/proxy/ProxyDurabilityIT.java @@ -84,7 +84,7 @@ public class ProxyDurabilityIT extends ConfigurableMacBase { @SuppressFBWarnings(value = "HARD_CODE_PASSWORD", justification = "test password is okay") @Test public void testDurability() throws Exception { - try (AccumuloClient c = getClient()) { + try (AccumuloClient c = createClient()) { Properties proxyProps = new Properties(); // Avoid issues with locally installed client configuration files with custom properties File emptyFile = Files.createTempFile(null, null).toFile(); diff --git a/test/src/main/java/org/apache/accumulo/test/replication/FinishedWorkUpdaterIT.java b/test/src/main/java/org/apache/accumulo/test/replication/FinishedWorkUpdaterIT.java index dafba26..1644332 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/FinishedWorkUpdaterIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/FinishedWorkUpdaterIT.java @@ -50,7 +50,7 @@ public class FinishedWorkUpdaterIT extends ConfigurableMacBase { @Before public void configureUpdater() throws Exception { - client = getClient(); + client = createClient(); updater = new FinishedWorkUpdater(client); } diff --git a/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java b/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java index 9c83d83..3aa09bc 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/GarbageCollectorCommunicatesWithTServersIT.java @@ -125,7 +125,7 @@ public class GarbageCollectorCommunicatesWithTServersIT extends ConfigurableMacB * Fetch all of the rfiles referenced by tablets in the metadata table for this table */ private Set getFilesForTable(String tableName) throws Exception { - final AccumuloClient client = getClient(); + final AccumuloClient client = createClient(); final Table.ID tableId = Table.ID.of(client.tableOperations().tableIdMap().get(tableName)); assertNotNull("Could not determine table ID for " + tableName, tableId); @@ -153,7 +153,7 @@ public class GarbageCollectorCommunicatesWithTServersIT extends ConfigurableMacB * entries) */ private Map getMetadataStatusForTable(String tableName) throws Exception { - final AccumuloClient client = getClient(); + final AccumuloClient client = createClient(); final String tableId = client.tableOperations().tableIdMap().get(tableName); assertNotNull("Could not determine table ID for " + tableName, tableId); @@ -178,7 +178,7 @@ public class GarbageCollectorCommunicatesWithTServersIT extends ConfigurableMacB @Test public void testActiveWalPrecludesClosing() throws Exception { final String table = getUniqueNames(1)[0]; - final AccumuloClient client = getClient(); + final AccumuloClient client = createClient(); // Bring the replication table online first and foremost ReplicationTable.setOnline(client); @@ -270,7 +270,7 @@ public class GarbageCollectorCommunicatesWithTServersIT extends ConfigurableMacB final String[] names = getUniqueNames(2); // `table` will be replicated, `otherTable` is only used to roll the WAL on the tserver final String table = names[0], otherTable = names[1]; - final AccumuloClient client = getClient(); + final AccumuloClient client = createClient(); // Bring the replication table online first and foremost ReplicationTable.setOnline(client); diff --git a/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java index 66af2d3..68c93ae 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java @@ -175,7 +175,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacBase { peerCluster.start(); - try (AccumuloClient clientMaster = getClient(); + try (AccumuloClient clientMaster = createClient(); AccumuloClient clientPeer = peerCluster.createAccumuloClient("root", new PasswordToken(ROOT_PASSWORD))) { @@ -349,7 +349,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacBase { peer1Cluster.start(); - try (AccumuloClient clientMaster = getClient(); + try (AccumuloClient clientMaster = createClient(); AccumuloClient clientPeer = peer1Cluster.createAccumuloClient("root", new PasswordToken(ROOT_PASSWORD))) { String peerClusterName = "peer"; @@ -509,7 +509,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacBase { peerCluster.start(); - try (AccumuloClient clientMaster = getClient(); + try (AccumuloClient clientMaster = createClient(); AccumuloClient clientPeer = peerCluster.createAccumuloClient("root", new PasswordToken(ROOT_PASSWORD))) { @@ -629,7 +629,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacBase { peer1Cluster.start(); - try (AccumuloClient clientMaster = getClient(); + try (AccumuloClient clientMaster = createClient(); AccumuloClient clientPeer = peer1Cluster.createAccumuloClient("root", new PasswordToken(ROOT_PASSWORD))) { diff --git a/test/src/main/java/org/apache/accumulo/test/replication/MultiTserverReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/MultiTserverReplicationIT.java index 0338232..fce0887 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/MultiTserverReplicationIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/MultiTserverReplicationIT.java @@ -53,7 +53,7 @@ public class MultiTserverReplicationIT extends ConfigurableMacBase { @Test public void tserverReplicationServicePortsAreAdvertised() throws Exception { // Wait for the cluster to be up - AccumuloClient client = getClient(); + AccumuloClient client = createClient(); ClientContext context = getClientContext(); // Wait for a tserver to come up to fulfill this request @@ -90,7 +90,7 @@ public class MultiTserverReplicationIT extends ConfigurableMacBase { @Test public void masterReplicationServicePortsAreAdvertised() throws Exception { // Wait for the cluster to be up - AccumuloClient client = getClient(); + AccumuloClient client = createClient(); ClientContext context = getClientContext(); // Wait for a tserver to come up to fulfill this request diff --git a/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java b/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java index 52f5076..3253ac5 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java @@ -73,7 +73,7 @@ public class RemoveCompleteReplicationRecordsIT extends ConfigurableMacBase { @Before public void initialize() throws Exception { - client = getClient(); + client = createClient(); rcrr = new MockRemoveCompleteReplicationRecords(client); client.securityOperations().grantTablePermission(client.whoami(), ReplicationTable.NAME, TablePermission.READ); diff --git a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java index d0e503f..d4e8421 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationIT.java @@ -215,7 +215,7 @@ public class ReplicationIT extends ConfigurableMacBase { @Test public void replicationTableCreated() throws AccumuloException, AccumuloSecurityException { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { assertTrue(client.tableOperations().exists(ReplicationTable.NAME)); assertEquals(ReplicationTable.ID.canonicalID(), client.tableOperations().tableIdMap().get(ReplicationTable.NAME)); @@ -225,7 +225,7 @@ public class ReplicationIT extends ConfigurableMacBase { @Test public void verifyReplicationTableConfig() throws AccumuloException, TableNotFoundException, AccumuloSecurityException { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { TableOperations tops = client.tableOperations(); Map> iterators = tops.listIterators(ReplicationTable.NAME); @@ -294,7 +294,7 @@ public class ReplicationIT extends ConfigurableMacBase { @Test public void correctRecordsCompleteFile() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { String table = "table1"; client.tableOperations().create(table); // If we have more than one tserver, this is subject to a race condition. @@ -370,7 +370,7 @@ public class ReplicationIT extends ConfigurableMacBase { @Test public void noRecordsWithoutReplication() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { List tables = new ArrayList<>(); // replication shouldn't be online when we begin @@ -410,7 +410,7 @@ public class ReplicationIT extends ConfigurableMacBase { @Test public void twoEntriesForTwoTables() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { String table1 = "table1", table2 = "table2"; // replication shouldn't exist when we begin @@ -542,7 +542,7 @@ public class ReplicationIT extends ConfigurableMacBase { @Test public void replicationEntriesPrecludeWalDeletion() throws Exception { final ServerContext context = getServerContext(); - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { String table1 = "table1", table2 = "table2", table3 = "table3"; final Multimap logs = HashMultimap.create(); final AtomicBoolean keepRunning = new AtomicBoolean(true); @@ -657,7 +657,7 @@ public class ReplicationIT extends ConfigurableMacBase { @Test public void combinerWorksOnMetadata() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { client.securityOperations().grantTablePermission("root", MetadataTable.NAME, TablePermission.WRITE); @@ -703,7 +703,7 @@ public class ReplicationIT extends ConfigurableMacBase { @Test public void noDeadlock() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { ReplicationTable.setOnline(client); client.securityOperations().grantTablePermission("root", ReplicationTable.NAME, @@ -748,7 +748,7 @@ public class ReplicationIT extends ConfigurableMacBase { @Test public void filesClosedAfterUnused() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { String table = "table"; client.tableOperations().create(table); @@ -865,7 +865,7 @@ public class ReplicationIT extends ConfigurableMacBase { // against expected Status messages. getCluster().getClusterControl().stop(ServerType.GARBAGE_COLLECTOR); - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { String table1 = "table1"; // replication shouldn't be online when we begin @@ -1037,7 +1037,7 @@ public class ReplicationIT extends ConfigurableMacBase { @Test public void correctClusterNameInWorkEntry() throws Exception { - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { String table1 = "table1"; // replication shouldn't be online when we begin @@ -1122,7 +1122,7 @@ public class ReplicationIT extends ConfigurableMacBase { getCluster().getClusterControl().stop(ServerType.GARBAGE_COLLECTOR); final ServerContext context = getServerContext(); - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { ReplicationTable.setOnline(client); client.securityOperations().grantTablePermission("root", ReplicationTable.NAME, @@ -1300,7 +1300,7 @@ public class ReplicationIT extends ConfigurableMacBase { // Just stop it now, we'll restart it after we restart the tserver getCluster().getClusterControl().stop(ServerType.GARBAGE_COLLECTOR); - try (AccumuloClient client = getClient()) { + try (AccumuloClient client = createClient()) { log.info("Got client to MAC"); String table1 = "table1"; diff --git a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java index d469c11..cddf30d 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java @@ -69,7 +69,7 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase { @Before public void configureInstance() throws Exception { - client = getClient(); + client = createClient(); ReplicationTable.setOnline(client); client.securityOperations().grantTablePermission(client.whoami(), MetadataTable.NAME, TablePermission.WRITE); diff --git a/test/src/main/java/org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java b/test/src/main/java/org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java index ff43a4c..feb042f 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/SequentialWorkAssignerIT.java @@ -96,7 +96,7 @@ public class SequentialWorkAssignerIT extends ConfigurableMacBase { @Before public void init() throws Exception { - client = getClient(); + client = createClient(); assigner = new MockSequentialWorkAssigner(client); // grant ourselves write to the replication table client.securityOperations().grantTablePermission(client.whoami(), ReplicationTable.NAME, diff --git a/test/src/main/java/org/apache/accumulo/test/replication/StatusMakerIT.java b/test/src/main/java/org/apache/accumulo/test/replication/StatusMakerIT.java index aeb5c68..8896835 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/StatusMakerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/StatusMakerIT.java @@ -69,7 +69,7 @@ public class StatusMakerIT extends ConfigurableMacBase { @Before public void setupInstance() throws Exception { - client = getClient(); + client = createClient(); ReplicationTable.setOnline(client); client.securityOperations().grantTablePermission(client.whoami(), ReplicationTable.NAME, TablePermission.WRITE); diff --git a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java index 1eb8d92..731822b 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerIT.java @@ -110,7 +110,7 @@ public class UnorderedWorkAssignerIT extends ConfigurableMacBase { @Before public void init() throws Exception { - client = getClient(); + client = createClient(); assigner = new MockUnorderedWorkAssigner(client); ReplicationTable.setOnline(client); client.securityOperations().grantTablePermission(client.whoami(), ReplicationTable.NAME, diff --git a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java index 15244aa..bb20092 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java @@ -180,7 +180,7 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacBase { peerCluster.start(); - try (AccumuloClient clientMaster = getClient(); + try (AccumuloClient clientMaster = createClient(); AccumuloClient clientPeer = peerCluster.createAccumuloClient("root", new PasswordToken(ROOT_PASSWORD))) { @@ -345,7 +345,7 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacBase { peer1Cluster.start(); - try (AccumuloClient clientMaster = getClient(); + try (AccumuloClient clientMaster = createClient(); AccumuloClient clientPeer = peer1Cluster.createAccumuloClient("root", new PasswordToken(ROOT_PASSWORD))) { @@ -520,7 +520,7 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacBase { peerCluster.start(); - try (AccumuloClient clientMaster = getClient(); + try (AccumuloClient clientMaster = createClient(); AccumuloClient clientPeer = peerCluster.createAccumuloClient("root", new PasswordToken(ROOT_PASSWORD))) { @@ -636,7 +636,7 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacBase { peer1Cluster.start(); - try (AccumuloClient clientMaster = getClient(); + try (AccumuloClient clientMaster = createClient(); AccumuloClient clientPeer = peer1Cluster.createAccumuloClient("root", new PasswordToken(ROOT_PASSWORD))) { diff --git a/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java b/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java index 4994a76..f196894 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/UnusedWalDoesntCloseReplicationStatusIT.java @@ -74,7 +74,7 @@ public class UnusedWalDoesntCloseReplicationStatusIT extends ConfigurableMacBase @Test public void test() throws Exception { File accumuloDir = this.getCluster().getConfig().getAccumuloDir(); - final AccumuloClient client = getClient(); + final AccumuloClient client = createClient(); final String tableName = getUniqueNames(1)[0]; client.securityOperations().grantTablePermission("root", MetadataTable.NAME, diff --git a/test/src/main/java/org/apache/accumulo/test/replication/WorkMakerIT.java b/test/src/main/java/org/apache/accumulo/test/replication/WorkMakerIT.java index d6987cf..4580654 100644 --- a/test/src/main/java/org/apache/accumulo/test/replication/WorkMakerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/replication/WorkMakerIT.java @@ -79,7 +79,7 @@ public class WorkMakerIT extends ConfigurableMacBase { @Before public void setupInstance() throws Exception { - client = getClient(); + client = createClient(); ReplicationTable.setOnline(client); client.securityOperations().grantTablePermission(client.whoami(), ReplicationTable.NAME, TablePermission.WRITE);