Skip to content

Commit aed3919

Browse files
DomGarguiloDomGarguilo
authored
Use Duration in Retry instead of long+TimeUnit (apache#4301)
1 parent 3b1566f commit aed3919

File tree

14 files changed

+198
-194
lines changed

14 files changed

+198
-194
lines changed

‎core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java

+4-6
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,13 @@
2020

2121
import static com.google.common.base.Preconditions.checkArgument;
2222
import static java.nio.charset.StandardCharsets.UTF_8;
23-
import static java.util.concurrent.TimeUnit.MILLISECONDS;
24-
import static java.util.concurrent.TimeUnit.MINUTES;
25-
import static java.util.concurrent.TimeUnit.SECONDS;
2623
import static java.util.stream.Collectors.toList;
2724
import static org.apache.accumulo.core.rpc.ThriftUtil.createClient;
2825
import static org.apache.accumulo.core.rpc.ThriftUtil.createTransport;
2926
import static org.apache.accumulo.core.rpc.ThriftUtil.getClient;
3027
import static org.apache.accumulo.core.rpc.ThriftUtil.returnClient;
3128

29+
import java.time.Duration;
3230
import java.util.ArrayList;
3331
import java.util.Collections;
3432
import java.util.ConcurrentModificationException;
@@ -138,9 +136,9 @@ public Map<String,String> modifyProperties(final Consumer<Map<String,String>> ma
138136

139137
var log = LoggerFactory.getLogger(InstanceOperationsImpl.class);
140138

141-
Retry retry =
142-
Retry.builder().infiniteRetries().retryAfter(25, MILLISECONDS).incrementBy(25, MILLISECONDS)
143-
.maxWait(30, SECONDS).backOffFactor(1.5).logInterval(3, MINUTES).createRetry();
139+
Retry retry = Retry.builder().infiniteRetries().retryAfter(Duration.ofMillis(25))
140+
.incrementBy(Duration.ofMillis(25)).maxWait(Duration.ofSeconds(30)).backOffFactor(1.5)
141+
.logInterval(Duration.ofMinutes(3)).createRetry();
144142

145143
while (true) {
146144
try {

‎core/src/main/java/org/apache/accumulo/core/clientImpl/NamespaceOperationsImpl.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@
2020

2121
import static com.google.common.base.Preconditions.checkArgument;
2222
import static java.nio.charset.StandardCharsets.UTF_8;
23-
import static java.util.concurrent.TimeUnit.MILLISECONDS;
24-
import static java.util.concurrent.TimeUnit.MINUTES;
2523
import static java.util.concurrent.TimeUnit.SECONDS;
2624
import static org.apache.accumulo.core.util.Validators.EXISTING_NAMESPACE_NAME;
2725
import static org.apache.accumulo.core.util.Validators.NEW_NAMESPACE_NAME;
2826

2927
import java.nio.ByteBuffer;
28+
import java.time.Duration;
3029
import java.util.Arrays;
3130
import java.util.Collections;
3231
import java.util.ConcurrentModificationException;
@@ -245,9 +244,9 @@ public Map<String,String> modifyProperties(final String namespace,
245244
EXISTING_NAMESPACE_NAME.validate(namespace);
246245
checkArgument(mapMutator != null, "mapMutator is null");
247246

248-
Retry retry =
249-
Retry.builder().infiniteRetries().retryAfter(25, MILLISECONDS).incrementBy(25, MILLISECONDS)
250-
.maxWait(30, SECONDS).backOffFactor(1.5).logInterval(3, MINUTES).createRetry();
247+
Retry retry = Retry.builder().infiniteRetries().retryAfter(Duration.ofMillis(25))
248+
.incrementBy(Duration.ofMillis(25)).maxWait(Duration.ofSeconds(30)).backOffFactor(1.5)
249+
.logInterval(Duration.ofMinutes(3)).createRetry();
251250

252251
while (true) {
253252
try {

‎core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import static java.nio.charset.StandardCharsets.UTF_8;
2424
import static java.util.Objects.requireNonNull;
2525
import static java.util.concurrent.TimeUnit.MILLISECONDS;
26-
import static java.util.concurrent.TimeUnit.MINUTES;
2726
import static java.util.concurrent.TimeUnit.SECONDS;
2827
import static java.util.stream.Collectors.toSet;
2928
import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.LOCATION;
@@ -37,6 +36,7 @@
3736
import java.io.IOException;
3837
import java.io.InputStreamReader;
3938
import java.nio.ByteBuffer;
39+
import java.time.Duration;
4040
import java.util.ArrayList;
4141
import java.util.Arrays;
4242
import java.util.Collection;
@@ -1020,9 +1020,9 @@ public Map<String,String> modifyProperties(String tableName,
10201020
EXISTING_TABLE_NAME.validate(tableName);
10211021
checkArgument(mapMutator != null, "mapMutator is null");
10221022

1023-
Retry retry =
1024-
Retry.builder().infiniteRetries().retryAfter(25, MILLISECONDS).incrementBy(25, MILLISECONDS)
1025-
.maxWait(30, SECONDS).backOffFactor(1.5).logInterval(3, MINUTES).createRetry();
1023+
Retry retry = Retry.builder().infiniteRetries().retryAfter(Duration.ofMillis(25))
1024+
.incrementBy(Duration.ofMillis(25)).maxWait(Duration.ofSeconds(30)).backOffFactor(1.5)
1025+
.logInterval(Duration.ofMinutes(3)).createRetry();
10261026

10271027
while (true) {
10281028
try {
@@ -1886,9 +1886,9 @@ public Locations locate(String tableName, Collection<Range> ranges)
18861886

18871887
locator.invalidateCache();
18881888

1889-
Retry retry = Retry.builder().infiniteRetries().retryAfter(100, MILLISECONDS)
1890-
.incrementBy(100, MILLISECONDS).maxWait(2, SECONDS).backOffFactor(1.5)
1891-
.logInterval(3, MINUTES).createRetry();
1889+
Retry retry = Retry.builder().infiniteRetries().retryAfter(Duration.ofMillis(100))
1890+
.incrementBy(Duration.ofMillis(100)).maxWait(Duration.ofSeconds(2)).backOffFactor(1.5)
1891+
.logInterval(Duration.ofMinutes(3)).createRetry();
18921892

18931893
while (!locator.binRanges(context, rangeList, binnedRanges).isEmpty()) {
18941894
context.requireTableExists(tableId, tableName);

‎core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
*/
1919
package org.apache.accumulo.core.clientImpl;
2020

21-
import static java.util.concurrent.TimeUnit.MILLISECONDS;
22-
import static java.util.concurrent.TimeUnit.MINUTES;
2321
import static java.util.concurrent.TimeUnit.SECONDS;
2422

2523
import java.io.IOException;
@@ -251,9 +249,9 @@ private void binRanges(TabletLocator tabletLocator, List<Range> ranges,
251249

252250
int lastFailureSize = Integer.MAX_VALUE;
253251

254-
Retry retry = Retry.builder().infiniteRetries().retryAfter(100, MILLISECONDS)
255-
.incrementBy(100, MILLISECONDS).maxWait(10, SECONDS).backOffFactor(1.07)
256-
.logInterval(1, MINUTES).createFactory().createRetry();
252+
Retry retry = Retry.builder().infiniteRetries().retryAfter(Duration.ofMillis(100))
253+
.incrementBy(Duration.ofMillis(100)).maxWait(Duration.ofMinutes(10)).backOffFactor(1.07)
254+
.logInterval(Duration.ofMinutes(1)).createFactory().createRetry();
257255

258256
while (true) {
259257

‎core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
package org.apache.accumulo.core.clientImpl;
2020

2121
import static java.util.concurrent.TimeUnit.MILLISECONDS;
22-
import static java.util.concurrent.TimeUnit.MINUTES;
23-
import static java.util.concurrent.TimeUnit.SECONDS;
2422
import static java.util.function.Function.identity;
2523
import static java.util.stream.Collectors.toList;
2624
import static java.util.stream.Collectors.toMap;
@@ -29,6 +27,7 @@
2927
import java.lang.management.CompilationMXBean;
3028
import java.lang.management.GarbageCollectorMXBean;
3129
import java.lang.management.ManagementFactory;
30+
import java.time.Duration;
3231
import java.util.ArrayList;
3332
import java.util.Collections;
3433
import java.util.HashMap;
@@ -1093,9 +1092,9 @@ private boolean isALockHeld(String tserver) {
10931092

10941093
private void cancelSession() throws InterruptedException, ThriftSecurityException {
10951094

1096-
Retry retry = Retry.builder().infiniteRetries().retryAfter(100, MILLISECONDS)
1097-
.incrementBy(100, MILLISECONDS).maxWait(60, SECONDS).backOffFactor(1.5)
1098-
.logInterval(3, MINUTES).createRetry();
1095+
Retry retry = Retry.builder().infiniteRetries().retryAfter(Duration.ofMillis(100))
1096+
.incrementBy(Duration.ofMillis(100)).maxWait(Duration.ofMinutes(1)).backOffFactor(1.5)
1097+
.logInterval(Duration.ofMinutes(3)).createRetry();
10991098

11001099
final HostAndPort parsedServer = HostAndPort.fromString(location);
11011100

‎core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/BulkImport.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@
1919
package org.apache.accumulo.core.clientImpl.bulk;
2020

2121
import static java.nio.charset.StandardCharsets.UTF_8;
22-
import static java.util.concurrent.TimeUnit.MILLISECONDS;
23-
import static java.util.concurrent.TimeUnit.MINUTES;
2422
import static java.util.stream.Collectors.groupingBy;
2523
import static org.apache.accumulo.core.file.blockfile.impl.CachableBlockFile.pathToCacheId;
2624
import static org.apache.accumulo.core.util.Validators.EXISTING_TABLE_NAME;
2725

2826
import java.io.FileNotFoundException;
2927
import java.io.IOException;
3028
import java.nio.ByteBuffer;
29+
import java.time.Duration;
3130
import java.util.ArrayList;
3231
import java.util.Arrays;
3332
import java.util.Collection;
@@ -142,9 +141,9 @@ public void load()
142141
if (propValue != null) {
143142
maxTablets = Integer.parseInt(propValue);
144143
}
145-
Retry retry = Retry.builder().infiniteRetries().retryAfter(100, MILLISECONDS)
146-
.incrementBy(100, MILLISECONDS).maxWait(2, MINUTES).backOffFactor(1.5)
147-
.logInterval(3, MINUTES).createRetry();
144+
Retry retry = Retry.builder().infiniteRetries().retryAfter(Duration.ofMillis(100))
145+
.incrementBy(Duration.ofMillis(100)).maxWait(Duration.ofMinutes(2)).backOffFactor(1.5)
146+
.logInterval(Duration.ofMinutes(3)).createRetry();
148147

149148
// retry if a merge occurs
150149
boolean shouldRetry = true;

‎core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooReader.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
package org.apache.accumulo.core.fate.zookeeper;
2020

2121
import static java.util.Objects.requireNonNull;
22-
import static java.util.concurrent.TimeUnit.MILLISECONDS;
23-
import static java.util.concurrent.TimeUnit.MINUTES;
2422

23+
import java.time.Duration;
2524
import java.util.List;
2625
import java.util.concurrent.CountDownLatch;
2726
import java.util.concurrent.atomic.AtomicInteger;
@@ -42,8 +41,9 @@ public class ZooReader {
4241
private static final Logger log = LoggerFactory.getLogger(ZooReader.class);
4342

4443
protected static final RetryFactory RETRY_FACTORY =
45-
Retry.builder().maxRetries(10).retryAfter(250, MILLISECONDS).incrementBy(250, MILLISECONDS)
46-
.maxWait(2, MINUTES).backOffFactor(1.5).logInterval(3, MINUTES).createFactory();
44+
Retry.builder().maxRetries(10).retryAfter(Duration.ofMillis(250))
45+
.incrementBy(Duration.ofMillis(250)).maxWait(Duration.ofMinutes(2)).backOffFactor(1.5)
46+
.logInterval(Duration.ofMinutes(3)).createFactory();
4747

4848
protected final String keepers;
4949
protected final int timeout;

0 commit comments

Comments
 (0)