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 CA105200D06 for ; Mon, 25 Sep 2017 19:27:03 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C89E51609BB; Mon, 25 Sep 2017 17:27:03 +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 9B33D1609B5 for ; Mon, 25 Sep 2017 19:27:01 +0200 (CEST) Received: (qmail 26333 invoked by uid 500); 25 Sep 2017 17:27: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 26324 invoked by uid 99); 25 Sep 2017 17:27: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; Mon, 25 Sep 2017 17:27:00 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id E9E598174E; Mon, 25 Sep 2017 17:26:56 +0000 (UTC) Date: Mon, 25 Sep 2017 17:26:57 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] 01/02: ACCUMULO-4702 Merged up Guava changes from #299 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: mmiller@apache.org Reply-To: "commits@accumulo.apache.org" In-Reply-To: <150636041660.25316.9319961484166619471@gitbox.apache.org> References: <150636041660.25316.9319961484166619471@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 6e2e2e7c609d6b55122bf6afdf5308de9526342d X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20170925172657.E9E598174E@gitbox.apache.org> archived-at: Mon, 25 Sep 2017 17:27:04 -0000 This is an automated email from the ASF dual-hosted git repository. mmiller pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 6e2e2e7c609d6b55122bf6afdf5308de9526342d Author: Mike Miller AuthorDate: Mon Sep 25 13:16:43 2017 -0400 ACCUMULO-4702 Merged up Guava changes from #299 --- .../accumulo/core/client/IsolatedScanner.java | 2 +- .../core/client/impl/ConditionalWriterImpl.java | 2 +- .../accumulo/core/client/impl/MasterClient.java | 2 +- .../accumulo/core/client/impl/OfflineIterator.java | 2 +- .../client/impl/ReplicationOperationsImpl.java | 2 +- .../core/client/impl/RootTabletLocator.java | 2 +- .../accumulo/core/client/impl/ServerClient.java | 2 +- .../core/client/impl/TableOperationsImpl.java | 2 +- .../core/client/impl/TabletLocatorImpl.java | 2 +- .../apache/accumulo/core/client/impl/Writer.java | 2 +- .../core/client/mapred/AbstractInputFormat.java | 2 +- .../core/client/mapreduce/AbstractInputFormat.java | 2 +- .../core/file/rfile/VisMetricsGatherer.java | 20 +++++++----- .../accumulo/core/client/TestThrift1474.java | 2 +- .../java/org/apache/accumulo/fate/ZooStore.java | 2 +- .../apache/accumulo/fate/util/UtilWaitThread.java | 36 ++++++++++++++++++++++ .../accumulo/minicluster/MiniAccumuloRunner.java | 7 +++-- .../minicluster/impl/MiniAccumuloClusterImpl.java | 2 +- .../main/java/org/apache/accumulo/proxy/Proxy.java | 4 +-- .../java/org/apache/accumulo/server/Accumulo.java | 2 +- .../accumulo/server/client/BulkImporter.java | 2 +- .../java/org/apache/accumulo/server/util/Halt.java | 2 +- .../accumulo/server/util/MasterMetadataUtil.java | 2 +- .../accumulo/server/util/MetadataTableUtil.java | 2 +- .../accumulo/server/util/ReplicationTableUtil.java | 2 +- .../accumulo/server/util/TabletIterator.java | 2 +- .../apache/accumulo/gc/SimpleGarbageCollector.java | 2 +- .../java/org/apache/accumulo/master/Master.java | 2 +- .../master/MasterClientServiceHandler.java | 2 +- .../apache/accumulo/master/TabletGroupWatcher.java | 2 +- .../DistributedWorkQueueWorkAssigner.java | 2 +- .../master/replication/UnorderedWorkAssigner.java | 2 +- .../accumulo/master/replication/WorkDriver.java | 2 +- .../accumulo/master/tableOps/BulkImport.java | 2 +- .../apache/accumulo/master/tableOps/LoadFiles.java | 2 +- .../java/org/apache/accumulo/monitor/Monitor.java | 2 +- .../apache/accumulo/monitor/ZooKeeperStatus.java | 2 +- .../org/apache/accumulo/tracer/TraceServer.java | 2 +- .../org/apache/accumulo/tserver/InMemoryMap.java | 2 +- .../org/apache/accumulo/tserver/TabletServer.java | 2 +- .../tserver/TabletServerResourceManager.java | 2 +- .../accumulo/tserver/log/TabletServerLogger.java | 2 +- .../tserver/replication/AccumuloReplicaSystem.java | 2 +- .../accumulo/tserver/tablet/DatafileManager.java | 2 +- .../accumulo/tserver/tablet/MinorCompactor.java | 2 +- .../org/apache/accumulo/tserver/tablet/Tablet.java | 2 +- .../accumulo/shell/commands/TraceCommand.java | 2 +- .../accumulo/test/BadDeleteMarkersCreatedIT.java | 2 +- .../org/apache/accumulo/test/BalanceFasterIT.java | 2 +- .../java/org/apache/accumulo/test/CleanWalIT.java | 2 +- .../apache/accumulo/test/ConditionalWriterIT.java | 2 +- .../apache/accumulo/test/GetFileInfoBulkIT.java | 4 +-- .../org/apache/accumulo/test/IMMLGBenchmark.java | 2 +- .../apache/accumulo/test/MetaGetsReadersIT.java | 2 +- .../apache/accumulo/test/MultiTableRecoveryIT.java | 2 +- .../org/apache/accumulo/test/NamespacesIT.java | 2 +- .../accumulo/test/NativeMapPerformanceTest.java | 2 +- .../org/apache/accumulo/test/ShellServerIT.java | 2 +- .../apache/accumulo/test/SplitCancelsMajCIT.java | 2 +- .../org/apache/accumulo/test/SplitRecoveryIT.java | 2 +- .../apache/accumulo/test/TableOperationsIT.java | 2 +- .../accumulo/test/TabletServerGivesUpIT.java | 2 +- .../org/apache/accumulo/test/TotalQueuedIT.java | 2 +- .../test/TracerRecoversAfterOfflineTableIT.java | 2 +- .../accumulo/test/functional/AddSplitIT.java | 2 +- .../test/functional/BadIteratorMincIT.java | 2 +- .../accumulo/test/functional/BatchScanSplitIT.java | 2 +- .../test/functional/BatchWriterFlushIT.java | 2 +- .../test/functional/BulkSplitOptimizationIT.java | 2 +- .../accumulo/test/functional/CacheTestReader.java | 2 +- .../accumulo/test/functional/CacheTestWriter.java | 2 +- .../accumulo/test/functional/ClassLoaderIT.java | 2 +- .../accumulo/test/functional/ConcurrencyIT.java | 2 +- .../accumulo/test/functional/ConstraintIT.java | 2 +- .../test/functional/DeleteEverythingIT.java | 2 +- .../test/functional/DeleteRowsSplitIT.java | 2 +- .../test/functional/DynamicThreadPoolsIT.java | 2 +- .../test/functional/GarbageCollectorIT.java | 2 +- .../test/functional/HalfDeadTServerIT.java | 2 +- .../accumulo/test/functional/LargeRowIT.java | 2 +- .../accumulo/test/functional/MetadataIT.java | 2 +- .../test/functional/MetadataMaxFilesIT.java | 2 +- .../accumulo/test/functional/MetadataSplitIT.java | 2 +- .../apache/accumulo/test/functional/RestartIT.java | 2 +- .../accumulo/test/functional/RestartStressIT.java | 2 +- .../apache/accumulo/test/functional/ScanIdIT.java | 2 +- .../test/functional/ScanSessionTimeOutIT.java | 2 +- .../test/functional/ServerSideErrorIT.java | 2 +- .../accumulo/test/functional/ShutdownIT.java | 2 +- .../test/functional/SimpleBalancerFairnessIT.java | 2 +- .../accumulo/test/functional/SlowConstraint.java | 2 +- .../accumulo/test/functional/SlowIterator.java | 2 +- .../apache/accumulo/test/functional/SplitIT.java | 2 +- .../apache/accumulo/test/functional/TimeoutIT.java | 2 +- .../accumulo/test/functional/WALSunnyDayIT.java | 2 +- .../accumulo/test/functional/ZombieTServer.java | 2 +- .../test/functional/ZookeeperRestartIT.java | 2 +- .../test/mapreduce/AccumuloInputFormatIT.java | 2 +- .../test/performance/thrift/NullTserver.java | 5 +-- .../accumulo/test/proxy/ProxyDurabilityIT.java | 2 +- .../accumulo/test/proxy/SimpleProxyBase.java | 2 +- .../replication/MultiInstanceReplicationIT.java | 2 +- .../accumulo/test/replication/ReplicationIT.java | 2 +- .../UnorderedWorkAssignerReplicationIT.java | 2 +- 104 files changed, 157 insertions(+), 115 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java b/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java index 689bc6b..f1065f8 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java +++ b/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.core.client; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.ArrayList; import java.util.Iterator; diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java index ceb4204..47b801f 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java @@ -17,8 +17,8 @@ package org.apache.accumulo.core.client.impl; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java b/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java index 35e5356..c9194b1 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java @@ -17,7 +17,7 @@ package org.apache.accumulo.core.client.impl; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.net.UnknownHostException; import java.util.List; diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java index 40095c1..a6d8720 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineIterator.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.core.client.impl; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.ArrayList; diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java index f691f19..7811651 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.core.client.impl; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.util.Objects.requireNonNull; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Collections; import java.util.HashSet; diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java index 2bbe113..fb002e3 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.core.client.impl; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Collection; import java.util.Collections; diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java index bfaaefb..d21a32e 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java @@ -17,8 +17,8 @@ package org.apache.accumulo.core.client.impl; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.ArrayList; import java.util.concurrent.TimeUnit; diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java index fd37cbd..a81d9cf 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java @@ -17,10 +17,10 @@ package org.apache.accumulo.core.client.impl; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toSet; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.BufferedReader; import java.io.FileNotFoundException; diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java index fe5479d..7c7a631 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.core.client.impl; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.Serializable; import java.util.ArrayList; diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java b/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java index 392d2d5..deabe08 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java @@ -17,8 +17,8 @@ package org.apache.accumulo.core.client.impl; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.concurrent.TimeUnit; diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java index 1b8ac2a..632a442 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.core.client.mapred; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.net.InetAddress; diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java index 0d89c7a..3cf2cf4 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.core.client.mapreduce; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.net.InetAddress; diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/VisMetricsGatherer.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/VisMetricsGatherer.java index 8c8c949..b648335 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/rfile/VisMetricsGatherer.java +++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/VisMetricsGatherer.java @@ -19,6 +19,8 @@ package org.apache.accumulo.core.file.rfile; import static java.nio.charset.StandardCharsets.UTF_8; import java.io.PrintStream; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -30,9 +32,6 @@ import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; import org.apache.hadoop.io.Text; -import com.google.common.hash.HashCode; -import com.google.common.hash.HashFunction; -import com.google.common.hash.Hashing; import com.google.common.util.concurrent.AtomicLongMap; /** @@ -127,11 +126,16 @@ public class VisMetricsGatherer implements MetricsGatherer entry : metric.get(lGName).asMap().entrySet()) { - HashFunction hf = Hashing.md5(); - HashCode hc = hf.newHasher().putString(entry.getKey(), UTF_8).hash(); - if (hash) - out.printf("%-20s", hc.toString().substring(0, 8)); - else + if (hash) { + String md5String = ""; + try { + byte[] md5Bytes = MessageDigest.getInstance("MD5").digest(entry.getKey().getBytes(UTF_8)); + md5String = new String(md5Bytes, UTF_8); + } catch (NoSuchAlgorithmException e) { + out.println("Failed to convert key to MD5 hash: " + e.getMessage()); + } + out.printf("%-20s", md5String.substring(0, 8)); + } else out.printf("%-20s", entry.getKey()); out.print("\t\t" + entry.getValue() + "\t\t\t"); out.printf("%.2f", ((double) entry.getValue() / numEntries.get(i)) * 100); diff --git a/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java b/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java index 4326e33..2ae1a56 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java +++ b/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.core.client; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java index 2a68f44..f98b598 100644 --- a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java +++ b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.fate; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java b/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java index de31fb0..8a14ded 100644 --- a/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java +++ b/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java @@ -16,6 +16,10 @@ */ package org.apache.accumulo.fate.util; +import static java.util.concurrent.TimeUnit.NANOSECONDS; + +import java.util.concurrent.TimeUnit; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,4 +33,36 @@ public class UtilWaitThread { log.error("{}", e.getMessage(), e); } } + + /** + * Copied from Guava release 23. The Uniterruptibles class was annotated as Beta by Google, therefore unstable to use. The following javadoc was copied from + * com.google.common.util.concurrent.Uninterruptibles: + * + * Utilities for treating interruptible operations as uninterruptible. In all cases, if a thread is interrupted during such a call, the call continues to + * block until the result is available or the timeout elapses, and only then re-interrupts the thread. + * + * @author Anthony Zana + * @since 10.0 + */ + public static void sleepUninterruptibly(long sleepFor, TimeUnit unit) { + boolean interrupted = false; + try { + long remainingNanos = unit.toNanos(sleepFor); + long end = System.nanoTime() + remainingNanos; + while (true) { + try { + // TimeUnit.sleep() treats negative timeouts just like zero. + NANOSECONDS.sleep(remainingNanos); + return; + } catch (InterruptedException e) { + interrupted = true; + remainingNanos = end - System.nanoTime(); + } + } + } finally { + if (interrupted) { + Thread.currentThread().interrupt(); + } + } + } } diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java index 4745e0a..eaa8903 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java @@ -21,6 +21,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.net.ServerSocket; +import java.nio.file.Files; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -35,7 +36,6 @@ import org.slf4j.LoggerFactory; import com.beust.jcommander.IStringConverter; import com.beust.jcommander.Parameter; -import com.google.common.io.Files; /** * A runner for starting up a {@link MiniAccumuloCluster} from the command line using an optional configuration properties file. An example property file looks @@ -154,8 +154,9 @@ public class MiniAccumuloRunner { if (opts.prop.containsKey(DIRECTORY_PROP)) miniDir = new File(opts.prop.getProperty(DIRECTORY_PROP)); - else - miniDir = Files.createTempDir(); + else { + miniDir = Files.createTempDirectory(System.currentTimeMillis() + "").toFile(); + } String rootPass = opts.prop.containsKey(ROOT_PASSWORD_PROP) ? opts.prop.getProperty(ROOT_PASSWORD_PROP) : "secret"; diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java index 2d70e87..6fd2577 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.minicluster.impl; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java index 0924920..50d28ee 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java @@ -20,6 +20,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.nio.file.Files; import java.util.Properties; import org.apache.accumulo.core.cli.Help; @@ -53,7 +54,6 @@ import org.slf4j.LoggerFactory; import com.beust.jcommander.IStringConverter; import com.beust.jcommander.Parameter; import com.google.auto.service.AutoService; -import com.google.common.io.Files; @AutoService(KeywordExecutable.class) public class Proxy implements KeywordExecutable { @@ -163,7 +163,7 @@ public class Proxy implements KeywordExecutable { if (useMini) { log.info("Creating mini cluster"); - final File folder = Files.createTempDir(); + final File folder = Files.createTempDirectory(System.currentTimeMillis() + "").toFile(); final MiniAccumuloCluster accumulo = new MiniAccumuloCluster(folder, "secret"); accumulo.start(); props.setProperty("instance", accumulo.getConfig().getInstanceName()); diff --git a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java index e0d9e22..b39996b 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java +++ b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.server; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.File; import java.io.FileInputStream; diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java index eabd395..46d9514 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java +++ b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.server.client; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.ArrayList; diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java b/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java index e0dadee..4228ce7 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.server.util; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.concurrent.TimeUnit; diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java index b72b4e3..fee711b 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.server.util; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.ArrayList; diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java index 7e4da6c..e69c86d 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java @@ -16,11 +16,11 @@ */ package org.apache.accumulo.server.util; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN; import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily.TIME_COLUMN; import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.ArrayList; diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java index a6ba4c5..9ddde7d 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/ReplicationTableUtil.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.server.util; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Collections; import java.util.EnumSet; diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java b/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java index d6d97f2..bc2b7e3 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/TabletIterator.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.server.util; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Iterator; import java.util.Map; diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java index 47b5292..ba23505 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.gc; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java index 180acee..8660751 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/Master.java +++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.master; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.ArrayList; diff --git a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java index 970efa1..ee7542e 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java +++ b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.master; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java index d6a13d9..4e8556f 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java +++ b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.master; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.lang.Math.min; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.ArrayList; diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java b/server/master/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java index 3d22d9f..0b25a2f 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java +++ b/server/master/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.master.replication; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Collection; import java.util.Map.Entry; diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/UnorderedWorkAssigner.java b/server/master/src/main/java/org/apache/accumulo/master/replication/UnorderedWorkAssigner.java index 93d4cc2..8e8a2da 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/replication/UnorderedWorkAssigner.java +++ b/server/master/src/main/java/org/apache/accumulo/master/replication/UnorderedWorkAssigner.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.master.replication; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.HashSet; import java.util.Iterator; diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java b/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java index cc9d936..dabfc79 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java +++ b/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.master.replication; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.concurrent.TimeUnit; diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java index 9c0a506..75f9aed 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.master.tableOps; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java index 2c649e3..58c24e3 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.master.tableOps; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.BufferedWriter; import java.io.OutputStreamWriter; diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java index d90a101..b1d6db4 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.monitor; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java index 49a3178..eb88237 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.monitor; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Collection; import java.util.Objects; diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java index a717563..c3e6d5f 100644 --- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java +++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.tracer; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java index 233c151..cba5c76 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.tserver; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.ArrayList; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index ebb0bfe..20f00ca 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java @@ -16,10 +16,10 @@ */ package org.apache.accumulo.tserver; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.NANOSECONDS; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.apache.accumulo.server.problems.ProblemType.TABLET_LOAD; import java.io.IOException; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java index 1cdc8bf..be1e019 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.tserver; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.util.Objects.requireNonNull; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.ArrayList; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java index ff5fb49..736f8bf 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.tserver.log; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.ArrayList; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java index 9e167be..4e9e488 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.tserver.replication; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.util.Objects.requireNonNull; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java index bbdb4f0..7502b93 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.tserver.tablet; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.Collection; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java index fe7585a..7ea894f 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.tserver.tablet; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.Collections; diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java index fc496dd..62c5c4f 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java @@ -16,9 +16,9 @@ */ package org.apache.accumulo.tserver.tablet; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Objects.requireNonNull; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.ByteArrayInputStream; import java.io.DataInputStream; diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java index 7c298f8..214ed32 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java +++ b/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.shell.commands; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.Map; diff --git a/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java b/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java index cde84c1..e997d8b 100644 --- a/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java +++ b/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Map; import java.util.Map.Entry; 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 6e01cea..70e94f7 100644 --- a/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java +++ b/test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeFalse; diff --git a/test/src/main/java/org/apache/accumulo/test/CleanWalIT.java b/test/src/main/java/org/apache/accumulo/test/CleanWalIT.java index d3ddd72..bcefcf8 100644 --- a/test/src/main/java/org/apache/accumulo/test/CleanWalIT.java +++ b/test/src/main/java/org/apache/accumulo/test/CleanWalIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import java.util.Map.Entry; diff --git a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java index f46c2b8..45ed2f3 100644 --- a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java @@ -17,8 +17,8 @@ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertTrue; import java.io.IOException; 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 48610df..9f6d24d 100644 --- a/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java +++ b/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java @@ -16,6 +16,7 @@ */ package org.apache.accumulo.test; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -52,7 +53,6 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; import org.junit.Test; -import com.google.common.util.concurrent.Uninterruptibles; import com.google.gson.Gson; // ACCUMULO-3949, ACCUMULO-3953 @@ -161,7 +161,7 @@ public class GetFileInfoBulkIT extends ConfigurableMacBase { es.shutdown(); es.awaitTermination(2, TimeUnit.MINUTES); log.info(String.format("Completed in %.2f seconds", (System.currentTimeMillis() - now) / 1000.)); - Uninterruptibles.sleepUninterruptibly(30, TimeUnit.SECONDS); + sleepUninterruptibly(30, TimeUnit.SECONDS); long getFileInfoOpts = getOpts() - startOps; log.info("# opts: {}", getFileInfoOpts); assertTrue("unexpected number of getFileOps", getFileInfoOpts < 2100 && getFileInfoOpts > 1000); diff --git a/test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java b/test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java index 6bae346..140410b 100644 --- a/test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java +++ b/test/src/main/java/org/apache/accumulo/test/IMMLGBenchmark.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.ArrayList; import java.util.HashMap; 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 9785f8a..1476900 100644 --- a/test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java +++ b/test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java @@ -17,7 +17,7 @@ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; 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 3bba08e..94db212 100644 --- a/test/src/main/java/org/apache/accumulo/test/MultiTableRecoveryIT.java +++ b/test/src/main/java/org/apache/accumulo/test/MultiTableRecoveryIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java b/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java index 89f1de2..31b7016 100644 --- a/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java +++ b/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java b/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java index 52fdc11..ff22cbc 100644 --- a/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java +++ b/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Collections; import java.util.Iterator; 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 18b9868..6dd9b42 100644 --- a/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/test/src/main/java/org/apache/accumulo/test/SplitCancelsMajCIT.java b/test/src/main/java/org/apache/accumulo/test/SplitCancelsMajCIT.java index 1afd33d..1e29009 100644 --- a/test/src/main/java/org/apache/accumulo/test/SplitCancelsMajCIT.java +++ b/test/src/main/java/org/apache/accumulo/test/SplitCancelsMajCIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertTrue; import java.util.EnumSet; diff --git a/test/src/main/java/org/apache/accumulo/test/SplitRecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/SplitRecoveryIT.java index e8cdad7..724c5e8 100644 --- a/test/src/main/java/org/apache/accumulo/test/SplitRecoveryIT.java +++ b/test/src/main/java/org/apache/accumulo/test/SplitRecoveryIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import java.util.Map.Entry; diff --git a/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java b/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java index 8455a40..807e425 100644 --- a/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; 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 bad1a55..a1a784e 100644 --- a/test/src/main/java/org/apache/accumulo/test/TabletServerGivesUpIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TabletServerGivesUpIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import java.util.TreeSet; 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 64d0850..bdf2a41 100644 --- a/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertTrue; import java.util.Random; 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 afa3a1a..ebc7686 100644 --- a/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertTrue; import java.util.concurrent.TimeUnit; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java index 7f9ac6d..7c5babe 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java @@ -16,8 +16,8 @@ */ 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.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Collection; import java.util.Iterator; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java index 64fc905..0d60cce 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java @@ -16,8 +16,8 @@ */ 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.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import java.util.EnumSet; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java index 09a18d7..a3add3d 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java @@ -16,8 +16,8 @@ */ 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.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.ArrayList; import java.util.Collection; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java index 9b50306..ea04867 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java @@ -16,8 +16,8 @@ */ 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.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.ArrayList; import java.util.Collections; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java index 21539b2..6b7ca47 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java @@ -16,8 +16,8 @@ */ 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.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.concurrent.TimeUnit; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java index 0703694..809d75a 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java @@ -16,8 +16,8 @@ */ 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.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.File; import java.io.FileOutputStream; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java index 9f1dc67..c19c111 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java @@ -16,8 +16,8 @@ */ 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.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.File; import java.io.FileInputStream; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ClassLoaderIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ClassLoaderIT.java index 9c2b71f..22ac6a7 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ClassLoaderIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ClassLoaderIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyIT.java index 929bb61..087b412 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyIT.java @@ -16,8 +16,8 @@ */ 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.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.EnumSet; import java.util.Map; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java index 4abbfd0..7b92951 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java @@ -16,8 +16,8 @@ */ 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.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.HashMap; import java.util.Iterator; 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 df07e68..7b21ca3 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,8 +16,8 @@ */ 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.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import java.util.Map; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java index 66fc7fb..107c4c5 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java @@ -16,8 +16,8 @@ */ 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.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertTrue; import java.util.ArrayList; 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 ab54b3a..7982b98 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,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.fail; import java.util.Map; 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 83f38ae..f531603 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 @@ -16,8 +16,8 @@ */ 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.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; 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 5cc364e..2006bc0 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 @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java b/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java index 90438ee..5630f81 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java @@ -16,8 +16,8 @@ */ 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.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Map; import java.util.Map.Entry; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java index 42ef7b4..eb4e400 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; 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 f78477d..9dcf6cd 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 @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import java.util.Map.Entry; 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 fc66c12..c32cbe0 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 @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java index 38d388d..3f9dd83 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java @@ -16,8 +16,8 @@ */ 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.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import java.io.IOException; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java index 1fb56ef..45767d3 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java @@ -16,8 +16,8 @@ */ 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.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import java.util.Map; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java index 46bf3fc..c82e302 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java @@ -16,8 +16,8 @@ */ 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.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; 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 ddace91..ec3fdba 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,8 +16,8 @@ */ 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.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Iterator; import java.util.Map; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java index 37bef1a..f70fc32 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.Collections; import java.util.Map.Entry; 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 ca099bf..fc4e5ee 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 @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; 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 7c27300..4348d66 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 @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SlowConstraint.java b/test/src/main/java/org/apache/accumulo/test/functional/SlowConstraint.java index aca092b..5e8034a 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/SlowConstraint.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/SlowConstraint.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.List; import java.util.concurrent.TimeUnit; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SlowIterator.java b/test/src/main/java/org/apache/accumulo/test/functional/SlowIterator.java index 2f72db4..d5d7164 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/SlowIterator.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/SlowIterator.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.io.IOException; import java.util.Collection; 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 783f294..272b8dd 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 @@ -16,8 +16,8 @@ */ 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.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TimeoutIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TimeoutIT.java index 8511d10..d9fa3bd 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/TimeoutIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/TimeoutIT.java @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.fail; import java.util.Collections; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java index 8834926..9d88c70 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java @@ -16,13 +16,13 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static org.apache.accumulo.core.conf.Property.GC_CYCLE_DELAY; import static org.apache.accumulo.core.conf.Property.GC_CYCLE_START; import static org.apache.accumulo.core.conf.Property.INSTANCE_ZK_TIMEOUT; import static org.apache.accumulo.core.conf.Property.TSERV_WALOG_MAX_SIZE; import static org.apache.accumulo.core.conf.Property.TSERV_WAL_REPLICATION; import static org.apache.accumulo.core.security.Authorizations.EMPTY; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.apache.accumulo.minicluster.ServerType.GARBAGE_COLLECTOR; import static org.apache.accumulo.minicluster.ServerType.TABLET_SERVER; import static org.junit.Assert.assertEquals; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java index 0a8ef35..6550c3e 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java @@ -16,8 +16,8 @@ */ 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.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.HashMap; import java.util.Random; 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 e376555..a7eaef3 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 @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.functional; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; 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 6239ea7..7d44833 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 @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.mapreduce; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.lang.System.currentTimeMillis; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; diff --git a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java b/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java index 93ff392..4cd1e27 100644 --- a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java +++ b/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java @@ -16,8 +16,6 @@ */ package org.apache.accumulo.test.performance.thrift; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; - import java.net.InetAddress; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -87,6 +85,9 @@ import org.apache.thrift.TException; import com.beust.jcommander.Parameter; import org.apache.accumulo.core.util.HostAndPort; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; +import org.apache.accumulo.core.tabletserver.thrift.TUnloadTabletGoal; + /** * The purpose of this class is to server as fake tserver that is a data sink like /dev/null. NullTserver modifies the metadata location entries for a table to * point to it. This allows thrift performance to be measured by running any client code that writes to a table. 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 fd8ad83..a9d5a3d 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 @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.proxy; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java index 0f919a6..7685668 100644 --- a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java +++ b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.proxy; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; 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 16b2e5e..9910383 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 @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.replication; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.HashMap; import java.util.Iterator; 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 28b37f4..59343ae 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 @@ -16,8 +16,8 @@ */ package org.apache.accumulo.test.replication; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.net.URI; import java.net.URISyntaxException; 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 75b1842..3ee9f93 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 @@ -16,7 +16,7 @@ */ package org.apache.accumulo.test.replication; -import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; +import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly; import java.util.HashMap; import java.util.Iterator; -- To stop receiving notification emails like this one, please contact "commits@accumulo.apache.org" .