Merge branch 'apache:dev' into dev

apache · May 27, 2024 · 27449c3 · 27449c3
2 parents 55e855f + 5c1ba5f
commit 27449c3
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 12 deletions.
diff --git a/...console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java b/...console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java
@@ -42,6 +42,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.Data;
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.Serializable;
 import java.net.URI;
@@ -52,6 +53,7 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+@Slf4j
 @Data
 @TableName("t_flink_cluster")
 public class FlinkCluster implements Serializable {
@@ -152,8 +154,8 @@ public URI getRemoteURI() {
           this.address,
           RequestConfig.custom().setConnectTimeout(2000, TimeUnit.MILLISECONDS).build());
       return new URI(address);
-    } catch (Exception ignored) {
-      //
+    } catch (Exception e) {
+      log.error("FlinkCluster getRemoteURI error", e);
     }
     return null;
   }

diff --git a/...rc/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java b/...rc/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java
@@ -712,7 +712,7 @@ private DependencyInfo getMergedDependencyInfo(Application application) {
               });
       return dependencyInfo.merge(mvnArtifacts, jarLibs);
     } catch (Exception e) {
-      log.warn("Merge team dependency failed.", e);
+      log.error("Merge team dependency failed.", e);
       return dependencyInfo;
     }
   }

diff --git a/...ice/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java b/...ice/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
@@ -347,7 +347,7 @@ public List<Map<String, Object>> listConf(Project project) {
       }
       return confList;
     } catch (Exception e) {
-      log.info(e.getMessage());
+      log.error("List project conf failed", e);
     }
     return null;
   }

diff --git a/...ce/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java b/...ce/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java
@@ -389,7 +389,13 @@ private FlinkConnector getConnectorResource(List<File> jars, List<String> factor
           try {
             connectorResource.setClassName(factoryClassName);
             connectorResource.setFactoryIdentifier(factory.factoryIdentifier());
-          } catch (Exception ignored) {
+          } catch (Exception e) {
+            log.error(
+                "Failed to set class name or factory identifier for connector resource. Class name: "
+                    + factoryClassName
+                    + ", Factory identifier: "
+                    + factory.factoryIdentifier(),
+                e);
           }
 
           try {
@@ -398,8 +404,8 @@ private FlinkConnector getConnectorResource(List<File> jars, List<String> factor
                 .requiredOptions()
                 .forEach(x -> requiredOptions.put(x.key(), getOptionDefaultValue(x)));
             connectorResource.setRequiredOptions(requiredOptions);
-          } catch (Exception ignored) {
-
+          } catch (Exception e) {
+            log.error("Failed to set required options for connector resource. " + e);
           }
 
           try {
@@ -408,7 +414,8 @@ private FlinkConnector getConnectorResource(List<File> jars, List<String> factor
                 .optionalOptions()
                 .forEach(x -> optionalOptions.put(x.key(), getOptionDefaultValue(x)));
             connectorResource.setOptionalOptions(optionalOptions);
-          } catch (Exception ignored) {
+          } catch (Exception e) {
+            log.error("Fail to set optional options for connector resource. " + e);
           }
           return connectorResource;
         }

diff --git a/...e/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java b/...e/src/main/java/org/apache/streampark/console/core/service/impl/SavePointServiceImpl.java
@@ -399,7 +399,7 @@ private Optional<Integer> tryGetChkNumRetainedFromDynamicProps(String dynamicPro
       log.warn(
           "This value of dynamicProperties key: state.checkpoints.num-retained is invalid, must be greater than 0");
     } catch (NumberFormatException e) {
-      log.warn(
+      log.error(
           "This value of dynamicProperties key: state.checkpoints.num-retained invalid, must be number");
     }
     return Optional.empty();
@@ -428,7 +428,7 @@ private int getChkNumRetainedFromFlinkEnv(
           "The value of key: state.checkpoints.num-retained in flink-conf.yaml is invalid, must be greater than 0, default value: {} will be used",
           MAX_RETAINED_CHECKPOINTS.defaultValue());
     } catch (NumberFormatException e) {
-      log.warn(
+      log.error(
           "The value of key: state.checkpoints.num-retained in flink-conf.yaml is invalid, must be number, flink env: {}, default value: {} will be used",
           flinkEnv.getFlinkHome(),
           flinkConfNumRetained);

diff --git a/...ice/src/main/java/org/apache/streampark/console/core/service/impl/SettingServiceImpl.java b/...ice/src/main/java/org/apache/streampark/console/core/service/impl/SettingServiceImpl.java
@@ -191,7 +191,7 @@ public SenderEmail getSenderEmail() {
       }
       return senderEmail;
     } catch (Exception e) {
-      log.warn("Fault Alert Email is not set.");
+      log.error("Fault Alert Email is not set.");
     }
     return null;
   }

diff --git a/...src/main/java/org/apache/streampark/console/core/service/impl/SqlCompleteServiceImpl.java b/...src/main/java/org/apache/streampark/console/core/service/impl/SqlCompleteServiceImpl.java
@@ -145,7 +145,7 @@ public SqlCompleteFstTree() {
         }
         scanner.close();
       } catch (Exception e) {
-        log.info("Error while FstTree ini that: {}", e.getMessage());
+        log.error("Error while FstTree ini that: {}", e.getMessage());
       }
     }