From 6cf5492bc6e1b22c066241d20425f8807b756604 Mon Sep 17 00:00:00 2001 From: Keith Turner Date: Fri, 29 Aug 2025 15:55:34 +0000 Subject: [PATCH] fixes RangedTableLocksIT --- .../org/apache/accumulo/test/fate/RangedTableLocksIT.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/src/main/java/org/apache/accumulo/test/fate/RangedTableLocksIT.java b/test/src/main/java/org/apache/accumulo/test/fate/RangedTableLocksIT.java index e0ff12ba799..8f16f11f5e2 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/RangedTableLocksIT.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/RangedTableLocksIT.java @@ -106,7 +106,8 @@ public void testCompactBulkMergeClone() throws Exception { Wait.waitFor(() -> !getLocksInfo().heldLocks.isEmpty()); var lockInfo = getLocksInfo(); - assertEquals(lockInfo.heldLocks.keySet(), lockInfo.findId(LockRange.of(null, "b5"))); + // For compactions the range (null, b5] will be widened to the table range (null,c] + assertEquals(lockInfo.heldLocks.keySet(), lockInfo.findId(LockRange.of(null, "c"))); // this bulk will overlap the compaction range, but should not get stuck because both are read // locks @@ -171,7 +172,7 @@ public void testCompactBulkMergeClone() throws Exception { // remove the fate op that only has a lock on the namespace lockInfo.heldLocks.values().removeIf(idList -> idList.equals(List.of("R:+default"))); - assertEquals(lockInfo.heldLocks.keySet(), lockInfo.findId(LockRange.of(null, "b5"))); + assertEquals(lockInfo.heldLocks.keySet(), lockInfo.findId(LockRange.of(null, "c"))); assertEquals(lockInfo.waitingLocks.keySet(), lockInfo.findId(LockRange.of("b", "d"), LockRange.of(null, "d"), LockRange.infinite()));