Skip to content

Fix bug that balance slot may not be released when balance task is done #757

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
chaoyli merged 1 commit into from
Mar 14, 2019
Merged

Fix bug that balance slot may not be released when balance task is done #757

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions fe/src/main/java/org/apache/doris/clone/TabletSchedCtx.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,6 @@ public void finishCloneTask(CloneTask cloneTask, TFinishTaskRequest request)
throw new SchedException(Status.UNRECOVERABLE, e.getMessage());
}
throw e;

} finally {
db.writeUnlock();
}
Expand Down Expand Up @@ -1001,7 +1000,7 @@ public int compareTo(TabletSchedCtx o) {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("tablet id: ").append(tabletId).append(", status: ").append(tabletStatus.name());
sb.append(", state: ").append(state.name());
sb.append(", state: ").append(state.name()).append(", type: ").append(type.name());
if (srcReplica != null) {
sb.append(". from backend: ").append(srcReplica.getBackendId());
sb.append(", src path hash: ").append(srcPathHash);
Expand Down
10 changes: 8 additions & 2 deletions fe/src/main/java/org/apache/doris/clone/TabletScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,12 @@ private void schedulePendingTablets() {
if (tabletCtx.getFailedSchedCounter() > 10) {
finalizeTabletCtx(tabletCtx, TabletSchedCtx.State.CANCELLED,
"schedule failed too many times and " + e.getMessage());
} else {
// we must release resource it current hold, and be scheduled again
tabletCtx.releaseResource(this);
// adjust priority to avoid some higher priority always be the first in pendingTablets
stat.counterTabletScheduledFailed.incrementAndGet();
dynamicAdjustPrioAndAddBackToPendingTablets(tabletCtx, e.getMessage());
}
}
} else {
Expand Down Expand Up @@ -1253,8 +1259,8 @@ public synchronized long takeAnAvailBalanceSlotFrom(Set<Long> pathHashs) {
return -1;
}

public void freeBalanceSlot(long destPathHash) {
Slot slot = pathSlots.get(destPathHash);
public synchronized void freeBalanceSlot(long pathHash) {
Slot slot = pathSlots.get(pathHash);
if (slot == null) {
return;
}
Expand Down