tolerate

apache · Sep 13, 2024 · 50475ca · 50475ca
1 parent 5f02f3e
commit 50475ca
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...e/src/main/java/org/apache/celeborn/server/common/service/config/FsConfigServiceImpl.java b/...e/src/main/java/org/apache/celeborn/server/common/service/config/FsConfigServiceImpl.java
@@ -20,6 +20,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -80,9 +81,10 @@ public synchronized void refreshCache() throws IOException {
   }
 
   private Map<String, String> getConfigs(Map<String, Object> configMap) {
-    return ((Map<String, Object>) configMap.get(CONF_CONFIG))
-        .entrySet().stream()
-            .collect(Collectors.toMap(Map.Entry::getKey, config -> config.getValue().toString()));
+    Map<String, Object> configs = (Map<String, Object>) configMap.get(CONF_CONFIG);
+    if (configs == null) return Collections.emptyMap();
+    return configs.entrySet().stream()
+        .collect(Collectors.toMap(Map.Entry::getKey, config -> config.getValue().toString()));
   }
 
   private File getConfigFile(Map<String, String> env) throws IOException {

diff --git a/service/src/test/resources/dynamicConfig_2.yaml b/service/src/test/resources/dynamicConfig_2.yaml
@@ -18,3 +18,9 @@
    config:
      celeborn.test.int.only: 100
 
+-  tenantId: tenant_id
+   level: TENANT
+   config:
+   users:
+     - name: Jerry
+       config: