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

Follower don't forward non-query statement to master repeatedly (#5160)

Browse Source 
Co-authored-by: lanhuajian <lanhuajian@sankuai.com>
This commit is contained in:
924060929
2020-12-29 10:29:26 +08:00
committed by GitHub
parent 5e1a80bb22
commit cd865c95e0
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe/fe-core/src/main/java/org/apache/doris/http/action/SystemAction.java
View File

@ -89,7 +89,7 @@ public class SystemAction extends WebBaseAction {
// forward to master
String showProcStmt = "SHOW PROC \"" + procPath + "\"";
MasterOpExecutor masterOpExecutor = new MasterOpExecutor(new OriginStatement(showProcStmt, 0),
ConnectContext.get(), RedirectStatus.FORWARD_NO_SYNC);
ConnectContext.get(), RedirectStatus.FORWARD_NO_SYNC, true);
try {
masterOpExecutor.execute();
} catch (Exception e) {

2
fe/fe-core/src/main/java/org/apache/doris/http/rest/ShowProcAction.java
View File

@ -79,7 +79,7 @@ public class ShowProcAction extends RestBaseAction {
context.setQualifiedUser(ConnectContext.get().getQualifiedUser());
context.setRemoteIP(ConnectContext.get().getRemoteIP());
MasterOpExecutor masterOpExecutor = new MasterOpExecutor(new OriginStatement(showProcStmt, 0), context,
RedirectStatus.FORWARD_NO_SYNC);
RedirectStatus.FORWARD_NO_SYNC, true);
LOG.debug("need to transfer to Master. stmt: {}", context.getStmtId());
try {

2
fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SystemController.java
View File

@ -104,7 +104,7 @@ public class SystemController extends BaseController {
String showProcStmt = "SHOW PROC \"" + procPath + "\"";
MasterOpExecutor masterOpExecutor = new MasterOpExecutor(new OriginStatement(showProcStmt, 0),
ConnectContext.get(), RedirectStatus.FORWARD_NO_SYNC);
ConnectContext.get(), RedirectStatus.FORWARD_NO_SYNC, true);
try {
masterOpExecutor.execute();
} catch (Exception e) {

8
fe/fe-core/src/main/java/org/apache/doris/qe/MasterOpExecutor.java
View File

@ -43,7 +43,9 @@ public class MasterOpExecutor {
// the total time of thrift connectTime add readTime and writeTime
private int thriftTimeoutMs;
public MasterOpExecutor(OriginStatement originStmt, ConnectContext ctx, RedirectStatus status) {
private boolean shouldNotRetry;
public MasterOpExecutor(OriginStatement originStmt, ConnectContext ctx, RedirectStatus status, boolean isQuery) {
this.originStmt = originStmt;
this.ctx = ctx;
if (status.isNeedToWaitJournalSync()) {
@ -52,6 +54,8 @@ public class MasterOpExecutor {
this.waitTimeoutMs = 0;
}
this.thriftTimeoutMs = ctx.getSessionVariable().getQueryTimeoutS() * 1000;
// if isQuery=false, we shouldn't retry twice when catch exception because of Idempotency
this.shouldNotRetry = !isQuery;
}
public void execute() throws Exception {
@ -110,7 +114,7 @@ public class MasterOpExecutor {
if (!ok) {
throw e;
}
if (e.getType() == TTransportException.TIMED_OUT) {
if (shouldNotRetry || e.getType() == TTransportException.TIMED_OUT) {
throw e;
} else {
LOG.warn("Forward statement "+ ctx.getStmtId() +" to Master " + thriftAddress + " twice", e);

3
fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
View File

@ -385,7 +385,8 @@ public class StmtExecutor {
}
private void forwardToMaster() throws Exception {
masterOpExecutor = new MasterOpExecutor(originStmt, context, redirectStatus);
boolean isQuery = parsedStmt instanceof QueryStmt;
masterOpExecutor = new MasterOpExecutor(originStmt, context, redirectStatus, isQuery);
LOG.debug("need to transfer to Master. stmt: {}", context.getStmtId());
masterOpExecutor.execute();
}