tool
/
starrocks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[BugFix] Fix Warehouse Idle Check bug when switching warehouse (backport #56552) (backport #56604) (#56778) 

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
This commit is contained in:
mergify[bot] 2025-03-10 11:12:02 +00:00 committed by GitHub
parent 1189206caf
commit 2f78e09f3b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fe/fe-core/src/main/java/com/starrocks/qe/StmtExecutor.java
View File

@ -525,8 +525,10 @@ public class StmtExecutor {
httpResultSender = new HttpResultSender((HttpConnectContext) context);
}
if (shouldMarkIdleCheck(parsedStmt)) {
WarehouseIdleChecker.increaseRunningSQL(context.getCurrentWarehouseId());
final boolean shouldMarkIdleCheck = shouldMarkIdleCheck(parsedStmt);
final long originWarehouseId = context.getCurrentWarehouseId();
if (shouldMarkIdleCheck) {
WarehouseIdleChecker.increaseRunningSQL(originWarehouseId);
}
try {
context.getState().setIsQuery(parsedStmt instanceof QueryStatement);
@ -833,8 +835,8 @@ public class StmtExecutor {
// restore session variable in connect context
context.setSessionVariable(sessionVariableBackup);
if (shouldMarkIdleCheck(parsedStmt)) {
WarehouseIdleChecker.decreaseRunningSQL(context.getCurrentWarehouseId());
if (shouldMarkIdleCheck) {
WarehouseIdleChecker.decreaseRunningSQL(originWarehouseId);
}
}
}

11
fe/fe-core/src/main/java/com/starrocks/server/WarehouseManager.java
View File

@ -285,6 +285,17 @@ public class WarehouseManager implements Writable {
return workerGroupId;
}
public long getWarehouseResumeTime(long warehouseId) {
try (LockCloseable ignored = new LockCloseable(rwLock.readLock())) {
Warehouse warehouse = idToWh.get(warehouseId);
if (warehouse == null) {
return -1;
} else {
return warehouse.getResumeTime();
}
}
}
private Optional<Long> selectWorkerGroupInternal(long warehouseId) {
Warehouse warehouse = getWarehouse(warehouseId);
List<Long> ids = warehouse.getWorkerGroupIds();

5
fe/fe-core/src/main/java/com/starrocks/warehouse/DefaultWarehouse.java
View File

@ -72,4 +72,9 @@ public class DefaultWarehouse extends Warehouse {
public ProcResult fetchResult() {
return new BaseProcResult();
}
@Override
public long getResumeTime() {
return -1L;
}
}

2
fe/fe-core/src/main/java/com/starrocks/warehouse/Warehouse.java
View File

@ -56,6 +56,8 @@ public abstract class Warehouse implements Writable {
Text.writeString(out, json);
}
public abstract long getResumeTime();
public abstract Long getAnyWorkerGroupId();
public abstract List<Long> getWorkerGroupIds();

11
fe/fe-core/src/main/java/com/starrocks/warehouse/WarehouseIdleChecker.java
View File

@ -76,7 +76,16 @@ public class WarehouseIdleChecker extends FrontendDaemon {
if (runningJobCnt == 0
&& lastFinishedJobTime <
System.currentTimeMillis() - Config.warehouse_idle_check_interval_seconds * 2000) {
warehouseIdleTime.putIfAbsent(wId, System.currentTimeMillis());
long resumeTime = GlobalStateMgr.getCurrentState().getWarehouseMgr().getWarehouseResumeTime(wId);
warehouseIdleTime.compute(wId, (k, v) -> {
// If this is the first time to become idle, set idleTime to now.
// If resumed during an idle period, change idleTime to resumeTime.
if (v == null) {
return System.currentTimeMillis();
} else {
return v < resumeTime ? resumeTime : v;
}
});
LOG.info("warehouse: {} is idle, idle start time: {}",
wId, TimeUtils.longToTimeString(warehouseIdleTime.get(wId)));
} else {