This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new af3e53014d0 branch-3.0: [fix](log) fix http stream exception log
#51432 (#51457)
af3e53014d0 is described below
commit af3e53014d0a248195c60baf24f8858ec480ef11
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Jun 4 16:03:43 2025 +0800
branch-3.0: [fix](log) fix http stream exception log #51432 (#51457)
Cherry-picked from #51432
Co-authored-by: meiyi <[email protected]>
---
.../src/main/java/org/apache/doris/service/FrontendServiceImpl.java | 4 ++--
.../apache/doris/tablefunction/GroupCommitTableValuedFunction.java | 2 +-
regression-test/suites/insert_p0/insert_group_commit_into.groovy | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
index 9140b033f5e..a20037e541d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
@@ -2196,7 +2196,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
httpStreamParams.setParams(coord.getStreamLoadPlan());
} catch (UserException e) {
LOG.warn("exec sql error", e);
- throw new UserException("exec sql error" + e);
+ throw e;
} catch (Throwable e) {
LOG.warn("exec sql error catch unknown result.", e);
throw new UserException("exec sql error catch unknown result." +
e);
@@ -2271,7 +2271,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
result.setWaitInternalGroupCommitFinish(Config.wait_internal_group_commit_finish);
} catch (UserException e) {
LOG.warn("exec sql error", e);
- throw new UserException("exec sql error" + e);
+ throw e;
} catch (Throwable e) {
LOG.warn("exec sql error catch unknown result.", e);
throw new UserException("exec sql error catch unknown result." +
e);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/tablefunction/GroupCommitTableValuedFunction.java
b/fe/fe-core/src/main/java/org/apache/doris/tablefunction/GroupCommitTableValuedFunction.java
index a387902e94a..60336d91b97 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/tablefunction/GroupCommitTableValuedFunction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/tablefunction/GroupCommitTableValuedFunction.java
@@ -24,8 +24,8 @@ import org.apache.doris.catalog.Column;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.OlapTable;
import org.apache.doris.catalog.Table;
-import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.Config;
+import org.apache.doris.nereids.exceptions.AnalysisException;
import org.apache.doris.planner.GroupCommitPlanner;
import org.apache.doris.planner.GroupCommitScanNode;
import org.apache.doris.planner.PlanNodeId;
diff --git a/regression-test/suites/insert_p0/insert_group_commit_into.groovy
b/regression-test/suites/insert_p0/insert_group_commit_into.groovy
index f84f352702b..a64d66f7f87 100644
--- a/regression-test/suites/insert_p0/insert_group_commit_into.groovy
+++ b/regression-test/suites/insert_p0/insert_group_commit_into.groovy
@@ -66,7 +66,7 @@ suite("insert_group_commit_into") {
} catch (Exception e) {
logger.warn("group_commit_insert failed, retry: " + retry + ",
error: " + e.getMessage())
retry++
- if (e.getMessage().contains("is blocked on schema change") &&
retry < 20) {
+ if ((e.getMessage().contains("is blocked on schema change") ||
e.getMessage().contains("can not get a block queue")) && retry < 20) {
sleep(1500)
continue
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
