Skip to content
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

Jump to bottom

fixes bug in merge tablet reservations #4604

Merged
merged 1 commit into from
May 24, 2024
Merged

fixes bug in merge tablet reservations #4604

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 4 additions & 8 deletions server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/ReserveTablets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,10 @@ public long isReady(FateId fateId, Manager env) throws Exception {
}

long sleepTime = Math.min(Math.max(1000, count), maxSleepTime);
if (locations > 0 || otherOps > 0 || wals > 0) {
// need to wait on these tablets
return sleepTime;
}

if (opsSet != opsAccepted.get()) {
// not all operation ids were set
return sleepTime;
if (locations > 0 || otherOps > 0 || wals > 0 || opsSet != opsAccepted.get()) {
// need to wait on these tablets, must return non-zero to indicate not ready so need to handle
// case of sleepTime being zero
return Math.max(1, sleepTime);
}

// operations ids were set on all tablets and no tablets have locations, so ready
Expand Down