mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-01-10 06:40:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix bug that dble can't start in performance mode (#2268)

Browse Source 
* fix hang in performance mode

* fix currentResponseService
This commit is contained in:
Collapsar
2020-11-11 14:00:28 +08:00
committed by yanhuqing
parent 0c1ceec54c
commit 32224cd738
2 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/com/actiontech/dble/services/mysqlauthenticate/MySQLBackAuthService.java
View File

@@ -238,20 +238,29 @@ public class MySQLBackAuthService extends AuthService {
@Override
public void taskToTotalQueue(ServiceTask task) {
Executor executor = DbleServer.getInstance().getBackendBusinessExecutor();
if (isHandling.compareAndSet(false, true)) {
executor.execute(() -> {
try {
handleInnerData();
} catch (Exception e) {
handleDataError(e);
} finally {
isHandling.set(false);
if (taskQueue.size() > 0) {
taskToTotalQueue(null);
}
}
});
if (SystemConfig.getInstance().getUsePerformanceMode() == 1) {
if (isHandling.compareAndSet(false, true)) {
DbleServer.getInstance().getConcurrentBackHandlerQueue().offer(task);
}
} else {
Executor executor = DbleServer.getInstance().getBackendBusinessExecutor();
if (isHandling.compareAndSet(false, true)) {
executor.execute(this::consumerInternalData);
}
}
}
@Override
public void consumerInternalData() {
try {
handleInnerData();
} catch (Exception e) {
handleDataError(e);
} finally {
isHandling.set(false);
if (taskQueue.size() > 0) {
taskToTotalQueue(null);
}
}
}

8
src/main/java/com/actiontech/dble/services/mysqlsharding/MySQLCurrentResponseService.java
View File

@@ -25,13 +25,17 @@ public class MySQLCurrentResponseService extends MySQLResponseService {
}
}
@Override
public void consumerInternalData() {
try {
super.handleInnerData();
handleInnerData();
} catch (Exception e) {
handleDataError(e);
} finally {
isHandling.set(false);
if (taskQueue.size() > 0) {
taskToTotalQueue(null);
}
}
}
}