fix conflict and rollback configuration

apache · Sep 13, 2024 · 3ac3d05 · 3ac3d05
1 parent 2f6f41c
commit 3ac3d05
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/amoro-ams/src/main/java/org/apache/amoro/server/AmoroManagementConf.java b/amoro-ams/src/main/java/org/apache/amoro/server/AmoroManagementConf.java
@@ -305,7 +305,7 @@ public class AmoroManagementConf {
   public static final ConfigOption<Long> DB_CONNECT_MAX_WAIT_MILLIS =
       ConfigOptions.key("database.connection-pool-max-wait-millis")
           .longType()
-          .defaultValue(-1L)
+          .defaultValue(1000L)
           .withDescription("Max wait time before getting a connection timeout.");
 
   public static final ConfigOption<Long> OPTIMIZER_HB_TIMEOUT =

diff --git a/amoro-ams/src/main/java/org/apache/amoro/server/table/TableRuntime.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/TableRuntime.java
@@ -199,7 +199,7 @@ public void planFailed() {
     } catch (Exception e) {
       OptimizingStatus originalStatus = optimizingStatus;
       updateOptimizingStatus(OptimizingStatus.PENDING);
-      LOG.error(
+      LOG.warn(
           "Persistent database failed, only the optimizing state in the memory was changed.", e);
       tableHandler.handleTableChanged(this, originalStatus);
     }