Handle null string config (#3597)

4paradigm · Nov 16, 2023 · d4f7c82 · d4f7c82
1 parent dc61777
commit d4f7c82
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/...skmanager/src/main/java/com/_4paradigm/openmldb/taskmanager/config/TaskManagerConfig.java b/...skmanager/src/main/java/com/_4paradigm/openmldb/taskmanager/config/TaskManagerConfig.java
@@ -291,7 +291,7 @@ private void init() throws ConfigException {
             props.setProperty("", "");
         }
 
-        if (getZkCluster().isEmpty()) {
+        if (isEmpty(getZkCluster())) {
             throw new ConfigException("zookeeper.cluster", "should not be empty");
         }
 
@@ -343,12 +343,12 @@ private void init() throws ConfigException {
             props.setProperty("spark.yarn.jars", "");
         }
 
-        if (isYarn() && !getSparkYarnJars().isEmpty() && getSparkYarnJars().startsWith("file://")) {
+        if (isYarn() && !isEmpty(getSparkYarnJars()) && getSparkYarnJars().startsWith("file://")) {
             throw new ConfigException("spark.yarn.jars", "should not use local filesystem for yarn mode");
         }
 
 
-        if (props.getProperty("spark.home", "").isEmpty()) {
+        if (isEmpty(props.getProperty("spark.home", ""))) {
             if (System.getenv("SPARK_HOME") == null) {
                 throw new ConfigException("spark.home", "should set config 'spark.home' or environment variable 'SPARK_HOME'");
             } else {
@@ -423,10 +423,10 @@ private void init() throws ConfigException {
             props.setProperty("spark.default.conf", "");
         }
 
-        if (!getSparkDefaultConf().isEmpty()) {
+        if (!isEmpty(getSparkDefaultConf())) {
             String[] defaultSparkConfs = getSparkDefaultConf().split(";");
             for (String sparkConfMap : defaultSparkConfs) {
-                if (!sparkConfMap.isEmpty()) {
+                if (!isEmpty(sparkConfMap)) {
                     String[] kv = sparkConfMap.split("=");
                     if (kv.length < 2) {
                         throw new ConfigException("spark.default.conf", String.format("error format of %s", sparkConfMap));
@@ -441,7 +441,7 @@ private void init() throws ConfigException {
             props.setProperty("spark.eventLog.dir", "");
         }
 
-        if (!getSparkEventlogDir().isEmpty() && isYarn()) {
+        if (!isEmpty(getSparkEventlogDir()) && isYarn()) {
             if (getSparkEventlogDir().startsWith("file://")) {
                 throw new ConfigException("spark.eventLog.dir", "should not use local filesystem for yarn mode");
             }
@@ -460,7 +460,7 @@ private void init() throws ConfigException {
             props.setProperty("offline.data.prefix", "file:///tmp/openmldb_offline_storage/");
         }
 
-        if (getOfflineDataPrefix().isEmpty()) {
+        if (isEmpty(getOfflineDataPrefix())) {
             throw new ConfigException("offline.data.prefix", "should not be null");
         } else {
             if (isYarn() || isK8s()) {
@@ -470,11 +470,11 @@ private void init() throws ConfigException {
             }
         }
 
-        if (props.getProperty("batchjob.jar.path", "").isEmpty()) {
+        if (isEmpty(props.getProperty("batchjob.jar.path", ""))) {
             props.setProperty("batchjob.jar.path", BatchJobUtil.findLocalBatchJobJar());
         }
 
-        if (isYarn() && getHadoopConfDir().isEmpty()) {
+        if (isYarn() && isEmpty(getHadoopConfDir())) {
             if (System.getenv("HADOOP_CONF_DIR") == null) {
                 throw new ConfigException("hadoop.conf.dir", "should set config 'hadoop.conf.dir' or environment variable 'HADOOP_CONF_DIR'");
             } else {
@@ -532,7 +532,5 @@ public static boolean isEmpty(String s) {
         return s == null || s.isEmpty();
     }
 
-
-
 }