Merge branch 'hotfix_1.10_4.0.x_35548' into 1.10_release_4.0.x

Author: gituser

hbase/hbase-sink/src/main/java/com/dtstack/flink/sql/sink/hbase/HbaseOutputFormat.java

@@ -19,6 +19,7 @@
 
 package com.dtstack.flink.sql.sink.hbase;
 
+import com.dtstack.flink.sql.exception.ExceptionTrace;
 import com.dtstack.flink.sql.factory.DTThreadFactory;
 import com.dtstack.flink.sql.outputformat.AbstractDtRichOutputFormat;
 import com.google.common.collect.Maps;
@@ -233,10 +234,10 @@ protected synchronized void dealBatchOperation(List<Row> records) {
         } finally {
             // 判断数据是否插入成功
             for (int i = 0; i < results.length; i++) {
-                if (results[i] != null) {
+                if (results[i] instanceof Exception) {
                     if (outDirtyRecords.getCount() % DIRTY_PRINT_FREQUENCY == 0) {
                         LOG.error("Get dirty data: {}", records.get(i).toString());
-                        LOG.error("Error cause: " + results[i]);
+                        LOG.error("Error cause: " + ExceptionTrace.traceOriginalCause((Exception) results[i]));
                     }
                     // 脏数据记录
                     outDirtyRecords.inc();
@@ -262,8 +263,8 @@ protected void dealInsert(Row record) {
             table.put(put);
         } catch (Exception e) {
             if (outDirtyRecords.getCount() % DIRTY_PRINT_FREQUENCY == 0 || LOG.isDebugEnabled()) {
-                LOG.error("record insert failed ..{}", record.toString());
-                LOG.error("", e);
+                LOG.error("Get dirty data: {}", record.toString());
+                LOG.error("Error cause: " + ExceptionTrace.traceOriginalCause(e));
             }
             outDirtyRecords.inc();
         }