database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix some tablet scheduler bug (#686)

Browse Source 
1. The balance task does not taking storage medium into account.
2. When repairing tablet with version incomplete, tablet with replica (2-xx), (2-xx), (2-0) can't be handled.
3. Show proc stmt may throw null pointer exception when all replicas are missing.
This commit is contained in:
Mingyu Chen
2019-03-05 09:26:36 +08:00
committed by ZHAO Chun
parent f2bd98f76a
commit 49dddb458d
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe/src/main/java/org/apache/doris/catalog/TabletInvertedIndex.java
View File

@ -474,7 +474,7 @@ public class TabletInvertedIndex {
if (replicaMetaTable.containsRow(tabletId)) {
return Lists.newArrayList(replicaMetaTable.row(tabletId).values());
}
return null;
return Lists.newArrayList();
} finally {
readUnlock();
}

10
fe/src/main/java/org/apache/doris/clone/BackendLoadStatistic.java
View File

@ -25,6 +25,7 @@ import org.apache.doris.common.Config;
import org.apache.doris.common.util.DebugUtil;
import org.apache.doris.system.Backend;
import org.apache.doris.system.SystemInfoService;
import org.apache.doris.thrift.TStorageMedium;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
@ -241,15 +242,14 @@ public class BackendLoadStatistic implements Comparable<BackendLoadStatistic> {
/*
* Classify the paths into 'low', 'mid' and 'high',
* and skip offline path
* and skip offline path, and path with different storage medium
*/
public void getPathStatisticByClass(
Set<Long> low,
Set<Long> mid,
Set<Long> high) {
Set<Long> low, Set<Long> mid, Set<Long> high, TStorageMedium storageMedium) {
for (RootPathLoadStatistic pathStat : pathStatistics) {
if (pathStat.getDiskState() == DiskState.OFFLINE) {
if (pathStat.getDiskState() == DiskState.OFFLINE
|| (storageMedium != null && pathStat.getStorageMedium() != storageMedium)) {
continue;
}

4
fe/src/main/java/org/apache/doris/clone/LoadBalancer.java
View File

@ -119,7 +119,7 @@ public class LoadBalancer {
Set<Long> pathLow = Sets.newHashSet();
Set<Long> pathMid = Sets.newHashSet();
Set<Long> pathHigh = Sets.newHashSet();
beStat.getPathStatisticByClass(pathLow, pathMid, pathHigh);
beStat.getPathStatisticByClass(pathLow, pathMid, pathHigh, null);
// we only select tablets from available mid and high load path
pathHigh.addAll(pathMid);
@ -273,7 +273,7 @@ public class LoadBalancer {
Set<Long> pathLow = Sets.newHashSet();
Set<Long> pathMid = Sets.newHashSet();
Set<Long> pathHigh = Sets.newHashSet();
beStat.getPathStatisticByClass(pathLow, pathMid, pathHigh);
beStat.getPathStatisticByClass(pathLow, pathMid, pathHigh, tabletCtx.getStorageMedium());
pathLow.addAll(pathMid);
long pathHash = slot.takeAnAvailBalanceSlotFrom(pathLow);

4
fe/src/main/java/org/apache/doris/clone/TabletSchedCtx.java
View File

@ -494,7 +494,9 @@ public class TabletSchedCtx implements Comparable<TabletSchedCtx> {
continue;
}
if (replica.getLastFailedVersion() <= 0) {
if (replica.getLastFailedVersion() <= 0 && replica.getVersion() == visibleVersion
&& replica.getVersionHash() == visibleVersionHash) {
// skip healthy replica
continue;
}