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

[inner-950] adjust the sequence of locks (cherry pick)

Browse Source
This commit is contained in:
wenyh1
2023-02-08 15:55:49 +08:00
parent 9f975b57f3
commit 66a324f4f8
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/actiontech/dble/server/ServerConnection.java
View File

@@ -327,8 +327,6 @@ public class ServerConnection extends FrontendConnection {
String schema = rrs.getSchema();
String table = rrs.getTable();
try {
//lock self meta
DbleServer.getInstance().getTmManager().addMetaLock(schema, table, rrs.getSrcStatement());
if (DbleServer.getInstance().isUseZK()) {
String nodeName = StringUtil.getFullName(schema, table);
String ddlPath = KVPathUtil.getDDLPath();
@@ -343,11 +341,12 @@ public class ServerConnection extends FrontendConnection {
} else if (DbleServer.getInstance().isUseGeneralCluster()) {
DbleServer.getInstance().getTmManager().notifyClusterDDL(schema, table, rrs.getStatement());
}
//lock self meta
DbleServer.getInstance().getTmManager().addMetaLock(schema, table, rrs.getSrcStatement());
} catch (SQLNonTransientException e) {
throw e;
} catch (Exception e) {
DbleServer.getInstance().getTmManager().removeMetaLock(schema, table);
throw new SQLNonTransientException(e.toString() + ",sql:" + rrs.getStatement());
throw new SQLNonTransientException(e.getMessage() + ",sql:" + rrs.getStatement());
}
}