(amoro) branch 0.7.x updated: [AMORO-3110] Extract error message in optimizers (#3130)

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jinsongzhou pushed a commit to branch 0.7.x
in repository https://gitbox.apache.org/repos/asf/amoro.git


The following commit(s) were added to refs/heads/0.7.x by this push:
     new 3974b1ea0 [AMORO-3110] Extract error message in optimizers (#3130)
3974b1ea0 is described below

commit 3974b1ea022fef5c7553dade0c8194c4f86b0008
Author: Xavier Bai <xu...@apache.org>
AuthorDate: Mon Aug 26 13:30:08 2024 +0800

    [AMORO-3110] Extract error message in optimizers (#3130)
    
    extract error message in optimizers
    
    (cherry picked from commit 5adbfbf6fbbc89ae3f85274b3417c02242aa4ebb)
    Signed-off-by: zhoujinsong <zh...@163.com>
---
 .../java/org/apache/amoro/optimizer/common/OptimizerExecutor.java    | 3 ++-
 .../org/apache/amoro/optimizer/flink/FlinkOptimizerExecutor.java     | 5 +++--
 .../org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java b/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java
index 3e797f800..197be5f8f 100644
--- a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java
+++ b/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java
@@ -36,6 +36,7 @@ import java.nio.ByteBuffer;
 public class OptimizerExecutor extends AbstractOptimizerOperator {
 
   private static final Logger LOG = LoggerFactory.getLogger(OptimizerExecutor.class);
+  protected static final int ERROR_MESSAGE_MAX_LENGTH = 4000;
 
   private final int threadId;
 
@@ -166,7 +167,7 @@ public class OptimizerExecutor extends AbstractOptimizerOperator {
           System.currentTimeMillis() - startTime,
           t);
       OptimizingTaskResult errorResult = new OptimizingTaskResult(task.getTaskId(), threadId);
-      errorResult.setErrorMessage(ExceptionUtil.getErrorMessage(t, 4000));
+      errorResult.setErrorMessage(ExceptionUtil.getErrorMessage(t, ERROR_MESSAGE_MAX_LENGTH));
       return errorResult;
     }
   }
diff --git a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizerExecutor.java b/amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizerExecutor.java
index 5a1213606..824a73b59 100644
--- a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizerExecutor.java
+++ b/amoro-ams/amoro-ams-optimizer/amoro-optimizer-flink/src/main/java/org/apache/amoro/optimizer/flink/FlinkOptimizerExecutor.java
@@ -72,10 +72,11 @@ public class FlinkOptimizerExecutor extends OptimizerExecutor {
     // add optimizer flink runtime info, including application_id, tm_id
     StringBuilder sb = new StringBuilder();
     if (!Strings.isNullOrEmpty(result.getErrorMessage())) {
-      if (runtimeContext != null && runtimeContext.size() > 0) {
+      if (runtimeContext != null && !runtimeContext.isEmpty()) {
         runtimeContext.forEach((k, v) -> sb.append(k).append("=").append(v).append("\n"));
       }
-      result.setErrorMessage(sb.toString() + result.getErrorMessage());
+      result.setErrorMessage(
+          (sb + result.getErrorMessage()).substring(0, ERROR_MESSAGE_MAX_LENGTH));
     }
     return result;
   }
diff --git a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java b/amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java
index b1cae14ad..7cdcd2522 100644
--- a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java
+++ b/amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java
@@ -74,7 +74,7 @@ public class SparkOptimizerExecutor extends OptimizerExecutor {
           (System.currentTimeMillis() - startTime),
           r);
       result = new OptimizingTaskResult(task.getTaskId(), threadId);
-      result.setErrorMessage(ExceptionUtil.getErrorMessage(r, 4000));
+      result.setErrorMessage(ExceptionUtil.getErrorMessage(r, ERROR_MESSAGE_MAX_LENGTH));
       return result;
     }
   }