Skip to content

Ignore append locks for compaction when using concurrent locks #16316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AmatyaAvadhanula merged 2 commits into from
Apr 22, 2024
Merged

Ignore append locks for compaction when using concurrent locks #16316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74e7b09
Ignore append locks for compaction when using concurrent locks
AmatyaAvadhanula Apr 22, 2024
b22bf7c
Better formatting
AmatyaAvadhanula Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskLockbox.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,8 +960,19 @@ public Map<String, List<Interval>> getLockedIntervals(List<LockFilterPolicy> loc
}

final int priority = lockFilter.getPriority();
final boolean ignoreAppendLocks =
TaskLockType.REPLACE.name().equals(lockFilter.getContext().get(Tasks.TASK_LOCK_TYPE));
final boolean isReplaceLock = TaskLockType.REPLACE.name().equals(
lockFilter.getContext().getOrDefault(
Tasks.TASK_LOCK_TYPE,
Tasks.DEFAULT_TASK_LOCK_TYPE
)
);
final boolean isUsingConcurrentLocks = Boolean.TRUE.equals(
lockFilter.getContext().getOrDefault(
Tasks.USE_CONCURRENT_LOCKS,
Tasks.DEFAULT_USE_CONCURRENT_LOCKS
)
);
final boolean ignoreAppendLocks = isUsingConcurrentLocks || isReplaceLock;

running.get(datasource).forEach(
(startTime, startTimeLocks) -> startTimeLocks.forEach(
Expand Down
28 changes: 28 additions & 0 deletions indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLockboxTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,6 +1325,34 @@ public void testGetLockedIntervalsForLowerPriorityReplaceLock()
Assert.assertTrue(conflictingIntervals.isEmpty());
}

@Test
public void testGetLockedIntervalsForLowerPriorityUseConcurrentLocks()
{
final Task task = NoopTask.ofPriority(50);
lockbox.add(task);
taskStorage.insert(task, TaskStatus.running(task.getId()));
tryTimeChunkLock(
TaskLockType.APPEND,
task,
Intervals.of("2017/2018")
);

LockFilterPolicy requestForReplaceLowerPriorityLock = new LockFilterPolicy(
task.getDataSource(),
25,
ImmutableMap.of(
Tasks.TASK_LOCK_TYPE,
TaskLockType.EXCLUSIVE.name(),
Tasks.USE_CONCURRENT_LOCKS,
true
)
);

Map<String, List<Interval>> conflictingIntervals =
lockbox.getLockedIntervals(ImmutableList.of(requestForReplaceLowerPriorityLock));
Assert.assertTrue(conflictingIntervals.isEmpty());
}


@Test
public void testExclusiveLockCompatibility()
Expand Down