This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 1.10
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/1.10 by this push:
new f80843e Tune timeouts for some flakey tests
f80843e is described below
commit f80843e35a9f2fe3a73f7de5b17bccf6cfb9a5d9
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Fri Aug 21 11:20:44 2020 -0400
Tune timeouts for some flakey tests
Increase default timeouts for some tests which routinely time out during
CI testing on Jenkins.
---
.../java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java | 4 ++--
test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java | 5 +----
test/src/main/java/org/apache/accumulo/test/LocatorIT.java | 2 +-
test/src/main/java/org/apache/accumulo/test/ScanFlushWithTimeIT.java | 2 +-
.../java/org/apache/accumulo/test/TableConfigurationUpdateIT.java | 2 +-
.../main/java/org/apache/accumulo/test/TabletServerGivesUpIT.java | 2 +-
.../org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java | 5 +----
test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java | 5 +----
8 files changed, 9 insertions(+), 18 deletions(-)
diff --git
a/test/src/main/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java
b/test/src/main/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java
index fc1719f..ba458f3 100644
--- a/test/src/main/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/BalanceWithOfflineTableIT.java
@@ -35,7 +35,7 @@ public class BalanceWithOfflineTableIT extends
ConfigurableMacBase {
@Override
protected int defaultTimeoutSeconds() {
- return 30;
+ return 120;
}
@Override
@@ -82,7 +82,7 @@ public class BalanceWithOfflineTableIT extends
ConfigurableMacBase {
return true;
}
});
- wait.get(20, TimeUnit.SECONDS);
+ wait.get((2 * defaultTimeoutSeconds()) / 3, TimeUnit.SECONDS);
log.info("Balance succeeded with an offline table");
}
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 b97a92d..67a22a6 100644
--- a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@ -109,15 +109,12 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.Iterables;
-/**
- *
- */
public class ConditionalWriterIT extends AccumuloClusterHarness {
private static final Logger log =
LoggerFactory.getLogger(ConditionalWriterIT.class);
@Override
protected int defaultTimeoutSeconds() {
- return 60;
+ return 120;
}
@Override
diff --git a/test/src/main/java/org/apache/accumulo/test/LocatorIT.java
b/test/src/main/java/org/apache/accumulo/test/LocatorIT.java
index 46a166b..c8a9bce 100644
--- a/test/src/main/java/org/apache/accumulo/test/LocatorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/LocatorIT.java
@@ -50,7 +50,7 @@ public class LocatorIT extends AccumuloClusterHarness {
@Override
protected int defaultTimeoutSeconds() {
- return 60;
+ return 120;
}
private void assertContains(Locations locations, HashSet<String> tservers,
diff --git
a/test/src/main/java/org/apache/accumulo/test/ScanFlushWithTimeIT.java
b/test/src/main/java/org/apache/accumulo/test/ScanFlushWithTimeIT.java
index 9d1e648..c70184e 100644
--- a/test/src/main/java/org/apache/accumulo/test/ScanFlushWithTimeIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ScanFlushWithTimeIT.java
@@ -47,7 +47,7 @@ public class ScanFlushWithTimeIT extends
AccumuloClusterHarness {
@Override
protected int defaultTimeoutSeconds() {
- return 30;
+ return 120;
}
@Test
diff --git
a/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java
b/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java
index e273a9f..d6118b7 100644
---
a/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java
@@ -45,7 +45,7 @@ public class TableConfigurationUpdateIT extends
AccumuloClusterHarness {
@Override
public int defaultTimeoutSeconds() {
- return 60;
+ return 120;
}
@Test
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 a617469..9ea33fb 100644
--- a/test/src/main/java/org/apache/accumulo/test/TabletServerGivesUpIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/TabletServerGivesUpIT.java
@@ -46,7 +46,7 @@ public class TabletServerGivesUpIT extends
ConfigurableMacBase {
@Override
protected int defaultTimeoutSeconds() {
- return 45;
+ return 120;
}
@Test
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 824cabd..f27d6ad 100644
---
a/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java
@@ -40,9 +40,6 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.Text;
import org.junit.Test;
-/**
- *
- */
public class TracerRecoversAfterOfflineTableIT extends ConfigurableMacBase {
@Override
@@ -52,7 +49,7 @@ public class TracerRecoversAfterOfflineTableIT extends
ConfigurableMacBase {
@Override
public int defaultTimeoutSeconds() {
- return 60;
+ return 120;
}
@Test
diff --git a/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java
b/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java
index f7b0b57..03d6db7 100644
--- a/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java
@@ -54,9 +54,6 @@ import org.apache.hadoop.fs.RawLocalFileSystem;
import org.apache.hadoop.io.Text;
import org.junit.Test;
-/**
- *
- */
public class VolumeChooserIT extends ConfigurableMacBase {
private static final Text EMPTY = new Text();
@@ -69,7 +66,7 @@ public class VolumeChooserIT extends ConfigurableMacBase {
@Override
protected int defaultTimeoutSeconds() {
- return 30;
+ return 120;
}
@Override
