diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java index 062f83443f..ec28d53d90 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java @@ -744,6 +744,27 @@ public class StmtExecutor { } } else { context.getState().setIsQuery(true); + if (isForwardToMaster()) { + // some times the follower's meta data is out of date. + // so we need forward the query to master until the meta data is sync with master + if (context.getCommand() == MysqlCommand.COM_STMT_PREPARE) { + throw new UserException("Forward master command is not supported for prepare statement"); + } + if (isProxy) { + // This is already a stmt forwarded from other FE. + // If we goes here, means we can't find a valid Master FE(some error happens). + // To avoid endless forward, throw exception here. + throw new NereidsException(new UserException("The statement has been forwarded to master FE(" + + Env.getCurrentEnv().getSelfNode().getHost() + ") and failed to execute" + + " because Master FE is not ready. You may need to check FE's status")); + } + redirectStatus = RedirectStatus.NO_FORWARD; + forwardToMaster(); + if (masterOpExecutor != null && masterOpExecutor.getQueryId() != null) { + context.setQueryId(masterOpExecutor.getQueryId()); + } + return; + } // create plan // Query following createting table would throw table not exist error. // For example. diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/preprocess/SelectHintTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/preprocess/SelectHintTest.java index f548a499ca..62965ac27b 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/nereids/preprocess/SelectHintTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/nereids/preprocess/SelectHintTest.java @@ -47,6 +47,12 @@ public class SelectHintTest { return ctx; } }; + new MockUp() { + @Mock + public boolean isMaster() { + return true; + } + }; } @Test