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 6ee0bfa166f [Fix](Group commit) Fix group commit forward fault (#38228)
6ee0bfa166f is described below

commit 6ee0bfa166f34fb9d69705d7267ff5e1dc438dee
Author: abmdocrt <yukang.lian2...@gmail.com>
AuthorDate: Tue Jul 23 10:47:14 2024 +0800

    [Fix](Group commit) Fix group commit forward fault (#38228)
    
    ## Proposed changes
    
    <!--Describe your changes.-->
    
    When client connect to observer and do group commit, observer will
    forward to master. The forward parameter `GroupCommitInfo` maybe null,
    which leads to an exception.
---
 .../src/main/java/org/apache/doris/service/FrontendServiceImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 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 548e9302cb2..4688c9927ca 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
@@ -1034,7 +1034,7 @@ public class FrontendServiceImpl implements 
FrontendService.Iface {
             result.setPacket("".getBytes());
             return result;
         }
-        if (params.getGroupCommitInfo().isGetGroupCommitLoadBeId()) {
+        if (params.getGroupCommitInfo() != null && 
params.getGroupCommitInfo().isGetGroupCommitLoadBeId()) {
             final TGroupCommitInfo info = params.getGroupCommitInfo();
             final TMasterOpResult result = new TMasterOpResult();
             try {
@@ -1047,7 +1047,7 @@ public class FrontendServiceImpl implements 
FrontendService.Iface {
             result.setPacket("".getBytes());
             return result;
         }
-        if (params.getGroupCommitInfo().isUpdateLoadData()) {
+        if (params.getGroupCommitInfo() != null && 
params.getGroupCommitInfo().isUpdateLoadData()) {
             final TGroupCommitInfo info = params.getGroupCommitInfo();
             final TMasterOpResult result = new TMasterOpResult();
             Env.getCurrentEnv().getGroupCommitManager()


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org

Reply via email to