This is an automated email from the ASF dual-hosted git repository.
DomGarguilo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new f5f93d8944 Fix/improve a few ITs (#6434)
f5f93d8944 is described below
commit f5f93d8944dd3f2a546de233228ea84142bcc602
Author: Dom G. <[email protected]>
AuthorDate: Thu Jun 18 14:43:24 2026 -0400
Fix/improve a few ITs (#6434)
---
.../apache/accumulo/test/VerifySerialRecoveryIT.java | 18 ++++++++++++------
.../org/apache/accumulo/test/fate/FateStoreITBase.java | 2 +-
.../test/functional/DeleteAndVerifyFileRemovalsIT.java | 4 ----
.../accumulo/test/functional/SplitMillionIT.java | 6 ++++++
4 files changed, 19 insertions(+), 11 deletions(-)
diff --git
a/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
b/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
index 1f8fff06be..ed2c758d33 100644
--- a/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
@@ -126,25 +126,31 @@ public class VerifySerialRecoveryIT extends
ConfigurableMacBase {
// time
boolean ongoingRecovery = false;
int recoveries = 0;
+ String recoveryStartLine = null;
var pattern =
Pattern.compile(".*recovered \\d+ mutations creating \\d+ entries
from \\d+ walogs.*");
for (String line : result.split("\n")) {
- // ignore metadata and root tables
- if (line.contains(SystemTables.METADATA.tableId().canonical())
- || line.contains(SystemTables.ROOT.tableId().canonical())) {
+ // ignore system tables
+ if (SystemTables.tableIds().stream()
+ .anyMatch(tableId -> line.contains(tableId.canonical()))) {
continue;
}
if (line.contains("recovering data from walogs")) {
- assertFalse(ongoingRecovery, "Saw recovery start before previous
recovery finished");
+ assertFalse(ongoingRecovery,
+ "Saw recovery start before previous recovery finished. Previous
start: "
+ + recoveryStartLine + ", new start: " + line);
ongoingRecovery = true;
+ recoveryStartLine = line;
recoveries++;
}
if (pattern.matcher(line).matches()) {
- assertTrue(ongoingRecovery, "Saw recovery end without recovery
start");
+ assertTrue(ongoingRecovery, "Saw recovery end without recovery
start: " + line);
ongoingRecovery = false;
+ recoveryStartLine = null;
}
}
- assertFalse(ongoingRecovery, "Expected no ongoing recovery at end of
test");
+ assertFalse(ongoingRecovery,
+ "Expected no ongoing recovery at end of test. Last start: " +
recoveryStartLine);
assertTrue(recoveries > 0, "Expected at least one recovery to have
occurred");
}
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/FateStoreITBase.java
b/test/src/main/java/org/apache/accumulo/test/fate/FateStoreITBase.java
index 36e0c0f247..40d32f023d 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/FateStoreITBase.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/FateStoreITBase.java
@@ -396,8 +396,8 @@ public abstract class FateStoreITBase extends
SharedMiniClusterBase
// After deletion, make sure we can create again with the same key
var fateId2 =
seedTransaction(store, TEST_FATE_OP, fateKey, new TestRepo(),
true).orElseThrow();
- txStore = store.reserve(fateId);
assertEquals(fateId, fateId2);
+ txStore = store.reserve(fateId2);
assertTrue(txStore.timeCreated() > 0);
assertEquals(TStatus.SUBMITTED, txStore.getStatus());
} finally {
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/DeleteAndVerifyFileRemovalsIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/DeleteAndVerifyFileRemovalsIT.java
index 907d4453f8..efe89a75d7 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/DeleteAndVerifyFileRemovalsIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/DeleteAndVerifyFileRemovalsIT.java
@@ -256,10 +256,6 @@ public class DeleteAndVerifyFileRemovalsIT extends
ConfigurableMacBase {
assertEquals(4, ample.stream().count());
}
- // A GcCandidate for each tablet directory should exist until the shared
references are
- // compacted.
- Wait.waitFor(() -> countGcCandidates(sourceTableId, 4), GC_MAX_WAIT,
POLLING_WAIT);
-
client.tableOperations().compact(cloneTable, new
CompactionConfig().setWait(true));
Wait.waitFor(() -> !fs.exists(sourceDir), GC_MAX_WAIT, POLLING_WAIT,
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/SplitMillionIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/SplitMillionIT.java
index 57eeb68415..b0ef4562ff 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SplitMillionIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SplitMillionIT.java
@@ -20,6 +20,7 @@ package org.apache.accumulo.test.functional;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.time.Duration;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -77,6 +78,11 @@ public class SplitMillionIT extends ConfigurableMacBase {
cfg.setMemory(ServerType.TABLET_SERVER, 1, MemoryUnit.GIGABYTE);
}
+ @Override
+ protected Duration defaultTimeout() {
+ return Duration.ofMinutes(20);
+ }
+
@SuppressFBWarnings(value = {"PREDICTABLE_RANDOM",
"DMI_RANDOM_USED_ONLY_ONCE"},
justification = "predictable random is ok for testing")
@Test
