From 18dc89cf7908e000a545acf4aa161c242c415dd5 Mon Sep 17 00:00:00 2001 From: wenningd Date: Mon, 28 Feb 2022 08:37:24 -0800 Subject: [PATCH] [HUDI-3450] Avoid passing empty string spark master to hudi cli (#4844) Co-authored-by: Wenning Ding --- .../org/apache/hudi/cli/utils/SparkUtil.java | 4 ++- .../hudi/cli/testutils/SparkUtilTest.java | 35 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 hudi-cli/src/test/java/org/apache/hudi/cli/testutils/SparkUtilTest.java diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/utils/SparkUtil.java b/hudi-cli/src/main/java/org/apache/hudi/cli/utils/SparkUtil.java index 45e048755..ae99b0b82 100644 --- a/hudi-cli/src/main/java/org/apache/hudi/cli/utils/SparkUtil.java +++ b/hudi-cli/src/main/java/org/apache/hudi/cli/utils/SparkUtil.java @@ -79,7 +79,9 @@ public class SparkUtil { if (properties.getProperty(HoodieCliSparkConfig.CLI_SPARK_MASTER) != null) { sparkMasterNode = properties.getProperty(HoodieCliSparkConfig.CLI_SPARK_MASTER); } - sparkMasterNode = sparkMaster.orElse(sparkMasterNode); + if (sparkMaster.isPresent() && !sparkMaster.get().trim().isEmpty()) { + sparkMasterNode = sparkMaster.orElse(sparkMasterNode); + } sparkConf.setMaster(sparkMasterNode); // Configure driver diff --git a/hudi-cli/src/test/java/org/apache/hudi/cli/testutils/SparkUtilTest.java b/hudi-cli/src/test/java/org/apache/hudi/cli/testutils/SparkUtilTest.java new file mode 100644 index 000000000..496643829 --- /dev/null +++ b/hudi-cli/src/test/java/org/apache/hudi/cli/testutils/SparkUtilTest.java @@ -0,0 +1,35 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hudi.cli.testutils; + +import org.apache.hudi.common.util.Option; +import org.apache.hudi.cli.utils.SparkUtil; +import org.apache.spark.SparkConf; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class SparkUtilTest { + @Test + public void testGetDefaultSparkConf() { + SparkConf sparkConf = SparkUtil.getDefaultConf("test-spark-app", Option.of("")); + assertEquals(SparkUtil.DEFAULT_SPARK_MASTER, sparkConf.get("spark.master")); + } +}