[Enhancement] Support empty cluster_snapshot.yaml config file (backport

#54416) (#54444) Co-authored-by: xiangguangyxg <[email protected]>
StarRocks · Dec 27, 2024 · 2ee6ed9 · 2ee6ed9
1 parent 6e830b4
commit 2ee6ed9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/conf/cluster_snapshot.yaml b/conf/cluster_snapshot.yaml
@@ -1,3 +1,5 @@
+--- # cluster_snapshot.yaml
+
 # do not include leader fe
 #frontends:
 #  - host: 172.26.92.1

diff --git a/fe/fe-core/src/main/java/com/starrocks/StarRocksFE.java b/fe/fe-core/src/main/java/com/starrocks/StarRocksFE.java
@@ -180,10 +180,10 @@ public static void start(String starRocksDir, String pidDir, String[] args) {
 
             addShutdownHook();
 
-            LOG.info("FE started successfully");
-
             RestoreClusterSnapshotMgr.finishRestoring();
 
+            LOG.info("FE started successfully");
+
             while (!stopped) {
                 Thread.sleep(2000);
             }

diff --git a/fe/fe-core/src/main/java/com/starrocks/lake/snapshot/ClusterSnapshotConfig.java b/fe/fe-core/src/main/java/com/starrocks/lake/snapshot/ClusterSnapshotConfig.java
@@ -241,6 +241,10 @@ public static ClusterSnapshotConfig load(String clusterSnapshotYamlFile) {
             ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory());
             ClusterSnapshotConfig config = objectMapper.readValue(new File(clusterSnapshotYamlFile),
                     ClusterSnapshotConfig.class);
+            if (config == null) {
+                // Empty config file
+                config = new ClusterSnapshotConfig();
+            }
             return config;
         } catch (Exception e) {
             LOG.warn("Failed to load cluster snapshot config {} ", clusterSnapshotYamlFile, e);

diff --git a/fe/fe-core/src/test/resources/conf/cluster_snapshot.yaml b/fe/fe-core/src/test/resources/conf/cluster_snapshot.yaml
@@ -1,3 +1,5 @@
+--- # cluster_snapshot.yaml
+
 # do not include leader fe
 frontends:
   - host: 172.26.92.1