This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/elasticity by this push:
new e9d4e5c2b9 Revert "Add Sunny Tag to more tests for elasticity branch
(#3816)" (#3881)
e9d4e5c2b9 is described below
commit e9d4e5c2b9a4916f12b04ea4a45293de3f26429f
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Mon Oct 23 16:41:39 2023 -0400
Revert "Add Sunny Tag to more tests for elasticity branch (#3816)" (#3881)
This reverts commit bdac4cd5b117d489d6947fc2355f87f943dcb6c5.
---
.../org/apache/accumulo/test/ScanServerConcurrentTabletScanIT.java | 2 --
test/src/main/java/org/apache/accumulo/test/ScanServerIT.java | 2 --
.../src/main/java/org/apache/accumulo/test/ScanServerIT_NoServers.java | 2 --
.../org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java | 2 --
.../java/org/apache/accumulo/test/ScanServerMetadataEntriesIT.java | 2 --
.../main/java/org/apache/accumulo/test/ScanServerMultipleScansIT.java | 2 --
.../org/apache/accumulo/test/compaction/ExternalCompaction4_IT.java | 3 ---
.../org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java | 3 ---
.../org/apache/accumulo/test/compaction/ExternalCompaction_2_IT.java | 3 ---
.../org/apache/accumulo/test/compaction/ExternalCompaction_3_IT.java | 3 ---
test/src/main/java/org/apache/accumulo/test/functional/BulkNewIT.java | 3 ---
.../main/java/org/apache/accumulo/test/functional/CompactionIT.java | 3 ---
test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java | 3 ---
.../org/apache/accumulo/test/functional/OnDemandTabletUnloadingIT.java | 3 ---
test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java | 3 ---
15 files changed, 39 deletions(-)
diff --git
a/test/src/main/java/org/apache/accumulo/test/ScanServerConcurrentTabletScanIT.java
b/test/src/main/java/org/apache/accumulo/test/ScanServerConcurrentTabletScanIT.java
index 94bb6fe7a0..0a9009a8df 100644
---
a/test/src/main/java/org/apache/accumulo/test/ScanServerConcurrentTabletScanIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/ScanServerConcurrentTabletScanIT.java
@@ -19,7 +19,6 @@
package org.apache.accumulo.test;
import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY;
-import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY;
import static org.apache.accumulo.test.ScanServerIT.createTableAndIngest;
import static org.apache.accumulo.test.ScanServerIT.ingest;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -56,7 +55,6 @@ import org.junit.jupiter.api.Test;
import com.google.common.collect.Iterables;
@Tag(MINI_CLUSTER_ONLY)
-@Tag(SUNNY_DAY)
public class ScanServerConcurrentTabletScanIT extends SharedMiniClusterBase {
private static class ScanServerConcurrentTabletScanITConfiguration
diff --git a/test/src/main/java/org/apache/accumulo/test/ScanServerIT.java
b/test/src/main/java/org/apache/accumulo/test/ScanServerIT.java
index 749ebea454..8d815b96a7 100644
--- a/test/src/main/java/org/apache/accumulo/test/ScanServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ScanServerIT.java
@@ -19,7 +19,6 @@
package org.apache.accumulo.test;
import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY;
-import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -87,7 +86,6 @@ import org.opentest4j.AssertionFailedError;
import com.google.common.collect.Iterables;
@Tag(MINI_CLUSTER_ONLY)
-@Tag(SUNNY_DAY)
public class ScanServerIT extends SharedMiniClusterBase {
private static class ScanServerITConfiguration implements
MiniClusterConfigurationCallback {
diff --git
a/test/src/main/java/org/apache/accumulo/test/ScanServerIT_NoServers.java
b/test/src/main/java/org/apache/accumulo/test/ScanServerIT_NoServers.java
index 054eecfdef..c6aa4d64a2 100644
--- a/test/src/main/java/org/apache/accumulo/test/ScanServerIT_NoServers.java
+++ b/test/src/main/java/org/apache/accumulo/test/ScanServerIT_NoServers.java
@@ -19,7 +19,6 @@
package org.apache.accumulo.test;
import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY;
-import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY;
import static org.apache.accumulo.test.ScanServerIT.createTableAndIngest;
import static org.apache.accumulo.test.ScanServerIT.ingest;
import static org.apache.accumulo.test.ScanServerIT.setupTableWithHostingMix;
@@ -54,7 +53,6 @@ import org.junit.jupiter.api.Test;
import com.google.common.collect.Iterables;
@Tag(MINI_CLUSTER_ONLY)
-@Tag(SUNNY_DAY)
public class ScanServerIT_NoServers extends SharedMiniClusterBase {
// This is the same as ScanServerIT, but without any scan servers running.
diff --git
a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java
b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java
index b4e1b67c06..a11385d955 100644
---
a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java
@@ -19,7 +19,6 @@
package org.apache.accumulo.test;
import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY;
-import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -40,7 +39,6 @@ import org.junit.jupiter.api.Test;
import com.google.common.net.HostAndPort;
@Tag(MINI_CLUSTER_ONLY)
-@Tag(SUNNY_DAY)
public class ScanServerMetadataEntriesCleanIT extends SharedMiniClusterBase {
@BeforeAll
diff --git
a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesIT.java
b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesIT.java
index 6ab7d7c087..ff5caf6bc6 100644
---
a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesIT.java
@@ -19,7 +19,6 @@
package org.apache.accumulo.test;
import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY;
-import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY;
import static org.apache.accumulo.test.ScanServerIT.ingest;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -70,7 +69,6 @@ import org.slf4j.LoggerFactory;
import com.google.common.net.HostAndPort;
@Tag(MINI_CLUSTER_ONLY)
-@Tag(SUNNY_DAY)
public class ScanServerMetadataEntriesIT extends SharedMiniClusterBase {
public static final Logger log =
LoggerFactory.getLogger(ScanServerMetadataEntriesIT.class);
diff --git
a/test/src/main/java/org/apache/accumulo/test/ScanServerMultipleScansIT.java
b/test/src/main/java/org/apache/accumulo/test/ScanServerMultipleScansIT.java
index dc810a9ae7..22dd9c52a7 100644
--- a/test/src/main/java/org/apache/accumulo/test/ScanServerMultipleScansIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ScanServerMultipleScansIT.java
@@ -19,7 +19,6 @@
package org.apache.accumulo.test;
import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY;
-import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY;
import static org.apache.accumulo.test.ScanServerIT.createTableAndIngest;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
@@ -67,7 +66,6 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.Iterables;
@Tag(MINI_CLUSTER_ONLY)
-@Tag(SUNNY_DAY)
public class ScanServerMultipleScansIT extends SharedMiniClusterBase {
private static final Logger log =
LoggerFactory.getLogger(ScanServerMultipleScansIT.class);
diff --git
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction4_IT.java
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction4_IT.java
index 36215f46e1..140f746b99 100644
---
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction4_IT.java
+++
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction4_IT.java
@@ -18,7 +18,6 @@
*/
package org.apache.accumulo.test.compaction;
-import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.createTable;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -44,10 +43,8 @@ import
org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
import org.apache.accumulo.test.functional.ErrorThrowingIterator;
import org.apache.accumulo.test.functional.ReadWriteIT;
import org.apache.hadoop.conf.Configuration;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
-@Tag(SUNNY_DAY)
public class ExternalCompaction4_IT extends AccumuloClusterHarness {
@Override
diff --git
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
index c91c6e2d7c..af13e5e576 100644
---
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
+++
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
@@ -18,7 +18,6 @@
*/
package org.apache.accumulo.test.compaction;
-import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.GROUP1;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.GROUP2;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.GROUP3;
@@ -80,12 +79,10 @@ import
org.apache.accumulo.test.functional.CompactionIT.ErrorThrowingSelector;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import com.google.common.base.Preconditions;
-@Tag(SUNNY_DAY)
public class ExternalCompaction_1_IT extends SharedMiniClusterBase {
public static class ExternalCompaction1Config implements
MiniClusterConfigurationCallback {
diff --git
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_2_IT.java
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_2_IT.java
index 273fa85446..f532451c18 100644
---
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_2_IT.java
+++
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_2_IT.java
@@ -18,7 +18,6 @@
*/
package org.apache.accumulo.test.compaction;
-import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.GROUP1;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.GROUP3;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.GROUP4;
@@ -66,11 +65,9 @@ import org.apache.accumulo.server.ServerContext;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.slf4j.LoggerFactory;
-@Tag(SUNNY_DAY)
public class ExternalCompaction_2_IT extends SharedMiniClusterBase {
public static class ExternalCompaction2Config implements
MiniClusterConfigurationCallback {
diff --git
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_3_IT.java
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_3_IT.java
index c48f522b33..52da17e009 100644
---
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_3_IT.java
+++
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_3_IT.java
@@ -18,7 +18,6 @@
*/
package org.apache.accumulo.test.compaction;
-import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.GROUP2;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.compact;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.confirmCompactionCompleted;
@@ -60,12 +59,10 @@ import org.apache.thrift.TException;
import org.apache.thrift.transport.TTransportException;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import com.google.common.net.HostAndPort;
-@Tag(SUNNY_DAY)
public class ExternalCompaction_3_IT extends SharedMiniClusterBase {
public static class ExternalCompaction3Config implements
MiniClusterConfigurationCallback {
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/BulkNewIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/BulkNewIT.java
index c22617fd8a..3e63bed845 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkNewIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkNewIT.java
@@ -21,7 +21,6 @@ package org.apache.accumulo.test.functional;
import static
org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.FILES;
import static
org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.LOADED;
import static
org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.PREV_ROW;
-import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -86,12 +85,10 @@ import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-@Tag(SUNNY_DAY)
public class BulkNewIT extends SharedMiniClusterBase {
@Override
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
index 6af6bc19d6..b45c0337bd 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
@@ -21,7 +21,6 @@ package org.apache.accumulo.test.functional;
import static java.util.concurrent.TimeUnit.SECONDS;
import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toSet;
-import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -81,7 +80,6 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.RawLocalFileSystem;
import org.apache.hadoop.io.Text;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -90,7 +88,6 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Supplier;
import com.google.common.collect.Iterators;
-@Tag(SUNNY_DAY)
public class CompactionIT extends AccumuloClusterHarness {
public static class TestFilter extends Filter {
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java
index 8672f4e038..94e5927927 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java
@@ -19,7 +19,6 @@
package org.apache.accumulo.test.functional;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY;
import static
org.apache.accumulo.test.util.FileMetadataUtil.printAndVerifyFileMetadata;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -66,14 +65,12 @@ import org.apache.accumulo.test.TestIngest.IngestParams;
import org.apache.accumulo.test.VerifyIngest;
import org.apache.accumulo.test.VerifyIngest.VerifyParams;
import org.apache.hadoop.io.Text;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Iterables;
-@Tag(SUNNY_DAY)
public class MergeIT extends AccumuloClusterHarness {
private static final Logger log = LoggerFactory.getLogger(MergeIT.class);
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingIT.java
index b18e591270..6578927ea2 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingIT.java
@@ -18,7 +18,6 @@
*/
package org.apache.accumulo.test.functional;
-import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -60,10 +59,8 @@ import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
-@Tag(SUNNY_DAY)
public class OnDemandTabletUnloadingIT extends SharedMiniClusterBase {
private static final int managerTabletGroupWatcherInterval = 5;
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 eb28de8e12..852d2c2ec3 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
@@ -21,7 +21,6 @@ package org.apache.accumulo.test.functional;
import static java.util.Collections.singletonMap;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.accumulo.core.util.LazySingletons.RANDOM;
-import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -75,7 +74,6 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -84,7 +82,6 @@ import com.google.common.base.Preconditions;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-@Tag(SUNNY_DAY)
public class SplitIT extends AccumuloClusterHarness {
private static final Logger log = LoggerFactory.getLogger(SplitIT.class);
