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
commit a76f5880cf4a84bd7bf637505fcea4693ac6f361
Merge: 3bc9e1d789 77ae357cf7
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Thu Jun 27 20:01:39 2024 -0400
Merge branch 'main' into elasticity
.../apache/accumulo/test/ComprehensiveBaseIT.java | 98 +++++++++++++++++++++-
1 file changed, 97 insertions(+), 1 deletion(-)
diff --cc test/src/main/java/org/apache/accumulo/test/ComprehensiveBaseIT.java
index fdd8759fed,93d80e3294..1dc1c2c0f9
--- a/test/src/main/java/org/apache/accumulo/test/ComprehensiveBaseIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ComprehensiveBaseIT.java
@@@ -64,9 -61,9 +64,11 @@@ import org.apache.accumulo.core.client.
import org.apache.accumulo.core.client.admin.CloneConfiguration;
import org.apache.accumulo.core.client.admin.CompactionConfig;
import org.apache.accumulo.core.client.admin.NewTableConfiguration;
+ import org.apache.accumulo.core.client.admin.PluginConfig;
+import org.apache.accumulo.core.client.admin.TabletAvailability;
+import org.apache.accumulo.core.client.admin.TabletInformation;
import org.apache.accumulo.core.client.admin.TimeType;
+ import org.apache.accumulo.core.client.admin.compaction.CompactionSelector;
import org.apache.accumulo.core.client.rfile.RFile;
import org.apache.accumulo.core.client.sample.Sampler;
import org.apache.accumulo.core.client.sample.SamplerConfiguration;
@@@ -99,9 -96,15 +101,12 @@@ import org.apache.accumulo.test.util.Wa
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-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.MoreCollectors;
+ import com.google.common.collect.Sets;
/**
* The purpose of this test is to exercise a large amount of Accumulo's
features in a single test.
@@@ -113,6 -117,22 +118,8 @@@ public abstract class ComprehensiveBase
public static final String DOG_AND_CAT = "DOG&CAT";
static final Authorizations AUTHORIZATIONS = new Authorizations("CAT",
"DOG");
+ private static final Logger log =
LoggerFactory.getLogger(ComprehensiveIT.class);
+
- @BeforeAll
- public static void setup() throws Exception {
- SharedMiniClusterBase.startMiniCluster();
-
- try (AccumuloClient client =
Accumulo.newClient().from(getClientProps()).build()) {
- client.securityOperations().changeUserAuthorizations("root",
AUTHORIZATIONS);
- }
- }
-
- @AfterAll
- public static void teardown() {
- SharedMiniClusterBase.stopMiniCluster();
- }
-
@Test
public void testBulkImport() throws Exception {
String table = getUniqueNames(1)[0];
@@@ -1045,7 -1079,7 +1136,12 @@@
private static void verifyData(AccumuloClient client, String table,
Authorizations auths,
SortedMap<Key,Value> expectedData) throws Exception {
try (var scanner = client.createScanner(table, auths)) {
-- assertEquals(expectedData, scan(scanner));
++ var seen = scan(scanner);
++ if (!expectedData.equals(seen)) {
++ log.info("expected - seen : {}",
Sets.difference(expectedData.keySet(), seen.keySet()));
++ log.info("seen - expected : {}", Sets.difference(seen.keySet(),
expectedData.keySet()));
++ }
++ assertEquals(expectedData, seen);
}
try (var scanner = client.createBatchScanner(table, auths)) {
