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

[fix](fe) Add/remove frontends after updating BEBJE (#26313)

Browse Source 
To ensure exception safety, adding or removing frontends in memory
should execute after removing the electable nodes (might throw
exceptions)
This commit is contained in:
walter
2023-11-03 14:33:06 +08:00
committed by GitHub
parent 74fd5da420
commit a4637e4462
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
View File

@ -2678,16 +2678,20 @@ public class Env {
throw new DdlException("frontend name already exists " + nodeName + ". Try again");
}
fe = new Frontend(role, nodeName, host, editLogPort);
LOG.info("add frontend: {}", fe);
frontends.put(nodeName, fe);
BDBHA bdbha = (BDBHA) haProtocol;
bdbha.removeConflictNodeIfExist(host, editLogPort);
int targetFollowerCount = getFollowerCount() + 1;
if (role == FrontendNodeType.FOLLOWER || role == FrontendNodeType.REPLICA) {
helperNodes.add(new HostInfo(host, editLogPort));
bdbha.addUnReadyElectableNode(nodeName, getFollowerCount());
bdbha.addUnReadyElectableNode(nodeName, targetFollowerCount);
}
bdbha.removeConflictNodeIfExist(host, editLogPort);
// Only add frontend after removing the conflict nodes, to ensure the exception safety.
fe = new Frontend(role, nodeName, host, editLogPort);
frontends.put(nodeName, fe);
LOG.info("add frontend: {}", fe);
editLog.logAddFrontend(fe);
} finally {
unlock();
@ -2748,17 +2752,21 @@ public class Env {
.getHostPortInAccessibleFormat(host, port) + "]");
}
LOG.info("remove frontend: {}", fe);
frontends.remove(fe.getNodeName());
removedFrontends.add(fe.getNodeName());
int targetFollowerCount = getFollowerCount() - 1;
if (fe.getRole() == FrontendNodeType.FOLLOWER || fe.getRole() == FrontendNodeType.REPLICA) {
haProtocol.removeElectableNode(fe.getNodeName());
removeHelperNode(host, port);
BDBHA ha = (BDBHA) haProtocol;
ha.removeUnReadyElectableNode(fe.getNodeName(), getFollowerCount());
ha.removeUnReadyElectableNode(fe.getNodeName(), targetFollowerCount);
}
LOG.info("remove frontend: {}", fe);
// Only remove frontend after removing the electable node success, to ensure the
// exception safety.
frontends.remove(fe.getNodeName());
removedFrontends.add(fe.getNodeName());
editLog.logRemoveFrontend(fe);
} finally {
unlock();