mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-05-05 05:50:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3347 from actiontech/02-1371

Browse Source 
fix heartbeat timeout inner 1371 （cherry pick）
This commit is contained in:
ylinzhu
2022-08-18 15:50:25 +08:00
committed by lin
parent c4572df371
commit cc609c5f95
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/actiontech/dble/backend/datasource/PhysicalDbInstance.java
+17 -8
View File
@@ -54,6 +54,7 @@ public abstract class PhysicalDbInstance implements ReadTimeStatusInstance {
private final LongAdder writeCount = new LongAdder();
private final AtomicBoolean isInitial = new AtomicBoolean(false);
private AtomicBoolean initHeartbeat = new AtomicBoolean(false);
// connection pool
private ConnectionPool connectionPool;
@@ -364,15 +365,20 @@ public abstract class PhysicalDbInstance implements ReadTimeStatusInstance {
}
heartbeat.start();
heartbeat.setScheduledFuture(Scheduler.getInstance().getScheduledExecutor().scheduleAtFixedRate(() -> {
if (DbleServer.getInstance().getConfig().isFullyConfigured()) {
if (TimeUtil.currentTimeMillis() < heartbeatRecoveryTime) {
return;
}
if (initHeartbeat.compareAndSet(false, true)) {
heartbeat.heartbeat();
}
}, 0L, config.getPoolConfig().getHeartbeatPeriodMillis(), TimeUnit.MILLISECONDS));
heartbeat.setScheduledFuture(Scheduler.getInstance().getScheduledExecutor().scheduleAtFixedRate(() -> {
if (DbleServer.getInstance().getConfig().isFullyConfigured()) {
if (TimeUtil.currentTimeMillis() < heartbeatRecoveryTime) {
return;
}
heartbeat.heartbeat();
}
}, 0L, config.getPoolConfig().getHeartbeatPeriodMillis(), TimeUnit.MILLISECONDS));
} else {
LOGGER.warn("init dbInstance[{}] heartbeat, but it has been initialized, skip initialization.", heartbeat.getSource().getName());
}
}
public void start(String reason) {
@@ -396,6 +402,9 @@ public abstract class PhysicalDbInstance implements ReadTimeStatusInstance {
public void stop(String reason, boolean closeFront, boolean isStopHeartbeat) {
if (isStopHeartbeat) {
heartbeat.stop(reason);
if (!heartbeat.isStop()) {
initHeartbeat.set(false);
}
}
if (dbGroupConfig.getRwSplitMode() != RW_SPLIT_OFF || dbGroup.getWriteDbInstance() == this) {
LOGGER.info("stop connection pool of physical db instance[{}], due to {}", this.dbGroup.getGroupName() + "." + name, reason);