This is an automated email from the ASF dual-hosted git repository.
gurwls223 pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new f7a94093a67 [SPARK-39879][SQL][TESTS] Reduce local-cluster maximum
memory size in `BroadcastJoinSuite*` and `HiveSparkSubmitSuite`
f7a94093a67 is described below
commit f7a94093a67956b94eaf99bdbb29c4351736d110
Author: yangjie01 <yangji...@baidu.com>
AuthorDate: Wed Jul 27 09:26:47 2022 +0900
[SPARK-39879][SQL][TESTS] Reduce local-cluster maximum memory size in
`BroadcastJoinSuite*` and `HiveSparkSubmitSuite`
### What changes were proposed in this pull request?
This pr change `local-cluster[2, 1, 1024]` in `BroadcastJoinSuite*` and
`HiveSparkSubmitSuite` to `local-cluster[2, 1, 512]` to reduce test maximum
memory usage.
### Why are the changes needed?
Reduce the maximum memory usage of test cases.
### Does this PR introduce _any_ user-facing change?
No, test-only.
### How was this patch tested?
Should monitor CI
Closes #37298 from LuciferYang/reduce-local-cluster-memory.
Authored-by: yangjie01 <yangji...@baidu.com>
Signed-off-by: Hyukjin Kwon <gurwls...@apache.org>
(cherry picked from commit 01d41e7de418d0a40db7b16ddd0d8546f0794d17)
Signed-off-by: Hyukjin Kwon <gurwls...@apache.org>
---
.../sql/execution/joins/BroadcastJoinSuite.scala | 4 +-
.../spark/sql/hive/HiveSparkSubmitSuite.scala | 43 +++++++++++++++-------
2 files changed, 32 insertions(+), 15 deletions(-)
diff --git
a/sql/core/src/test/scala/org/apache/spark/sql/execution/joins/BroadcastJoinSuite.scala
b/sql/core/src/test/scala/org/apache/spark/sql/execution/joins/BroadcastJoinSuite.scala
index ef0a596f211..a7fe4d1c792 100644
---
a/sql/core/src/test/scala/org/apache/spark/sql/execution/joins/BroadcastJoinSuite.scala
+++
b/sql/core/src/test/scala/org/apache/spark/sql/execution/joins/BroadcastJoinSuite.scala
@@ -20,6 +20,7 @@ package org.apache.spark.sql.execution.joins
import scala.reflect.ClassTag
import org.apache.spark.AccumulatorSuite
+import org.apache.spark.internal.config.EXECUTOR_MEMORY
import org.apache.spark.sql.{Dataset, QueryTest, Row, SparkSession}
import org.apache.spark.sql.catalyst.expressions.{BitwiseAnd, BitwiseOr, Cast,
Literal, ShiftLeft}
import org.apache.spark.sql.catalyst.plans.logical.BROADCAST
@@ -51,7 +52,8 @@ abstract class BroadcastJoinSuiteBase extends QueryTest with
SQLTestUtils
override def beforeAll(): Unit = {
super.beforeAll()
spark = SparkSession.builder()
- .master("local-cluster[2,1,1024]")
+ .master("local-cluster[2,1,512]")
+ .config(EXECUTOR_MEMORY.key, "512m")
.appName("testing")
.getOrCreate()
}
diff --git
a/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala
b/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala
index f9ea4e31487..b2ee82db390 100644
---
a/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala
+++
b/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala
@@ -28,6 +28,7 @@ import org.scalatest.Assertions._
import org.apache.spark._
import org.apache.spark.internal.Logging
+import org.apache.spark.internal.config.EXECUTOR_MEMORY
import org.apache.spark.internal.config.UI.UI_ENABLED
import org.apache.spark.sql.{QueryTest, Row, SparkSession}
import org.apache.spark.sql.catalyst.{FunctionIdentifier, TableIdentifier}
@@ -66,7 +67,8 @@ class HiveSparkSubmitSuite
val args = Seq(
"--class", TemporaryHiveUDFTest.getClass.getName.stripSuffix("$"),
"--name", "TemporaryHiveUDFTest",
- "--master", "local-cluster[2,1,1024]",
+ "--master", "local-cluster[2,1,512]",
+ "--conf", s"${EXECUTOR_MEMORY.key}=512m",
"--conf", "spark.ui.enabled=false",
"--conf", "spark.master.rest.enabled=false",
"--driver-java-options", "-Dderby.system.durability=test",
@@ -83,7 +85,8 @@ class HiveSparkSubmitSuite
val args = Seq(
"--class", PermanentHiveUDFTest1.getClass.getName.stripSuffix("$"),
"--name", "PermanentHiveUDFTest1",
- "--master", "local-cluster[2,1,1024]",
+ "--master", "local-cluster[2,1,512]",
+ "--conf", s"${EXECUTOR_MEMORY.key}=512m",
"--conf", "spark.ui.enabled=false",
"--conf", "spark.master.rest.enabled=false",
"--driver-java-options", "-Dderby.system.durability=test",
@@ -100,7 +103,8 @@ class HiveSparkSubmitSuite
val args = Seq(
"--class", PermanentHiveUDFTest2.getClass.getName.stripSuffix("$"),
"--name", "PermanentHiveUDFTest2",
- "--master", "local-cluster[2,1,1024]",
+ "--master", "local-cluster[2,1,512]",
+ "--conf", s"${EXECUTOR_MEMORY.key}=512m",
"--conf", "spark.ui.enabled=false",
"--conf", "spark.master.rest.enabled=false",
"--driver-java-options", "-Dderby.system.durability=test",
@@ -119,7 +123,8 @@ class HiveSparkSubmitSuite
val args = Seq(
"--class", SparkSubmitClassLoaderTest.getClass.getName.stripSuffix("$"),
"--name", "SparkSubmitClassLoaderTest",
- "--master", "local-cluster[2,1,1024]",
+ "--master", "local-cluster[2,1,512]",
+ "--conf", s"${EXECUTOR_MEMORY.key}=512m",
"--conf", "spark.ui.enabled=false",
"--conf", "spark.master.rest.enabled=false",
"--driver-java-options", "-Dderby.system.durability=test",
@@ -134,7 +139,8 @@ class HiveSparkSubmitSuite
val args = Seq(
"--class", SparkSQLConfTest.getClass.getName.stripSuffix("$"),
"--name", "SparkSQLConfTest",
- "--master", "local-cluster[2,1,1024]",
+ "--master", "local-cluster[2,1,512]",
+ "--conf", s"${EXECUTOR_MEMORY.key}=512m",
"--conf", "spark.ui.enabled=false",
"--conf", "spark.master.rest.enabled=false",
"--conf", "spark.sql.hive.metastore.version=0.12",
@@ -172,7 +178,8 @@ class HiveSparkSubmitSuite
val args = Seq(
"--class", SPARK_9757.getClass.getName.stripSuffix("$"),
"--name", "SparkSQLConfTest",
- "--master", "local-cluster[2,1,1024]",
+ "--master", "local-cluster[2,1,512]",
+ "--conf", s"${EXECUTOR_MEMORY.key}=512m",
"--conf", "spark.ui.enabled=false",
"--conf", "spark.master.rest.enabled=false",
"--driver-java-options", "-Dderby.system.durability=test",
@@ -185,7 +192,8 @@ class HiveSparkSubmitSuite
val args = Seq(
"--class", SPARK_11009.getClass.getName.stripSuffix("$"),
"--name", "SparkSQLConfTest",
- "--master", "local-cluster[2,1,1024]",
+ "--master", "local-cluster[2,1,512]",
+ "--conf", s"${EXECUTOR_MEMORY.key}=512m",
"--conf", "spark.ui.enabled=false",
"--conf", "spark.master.rest.enabled=false",
"--driver-java-options", "-Dderby.system.durability=test",
@@ -198,7 +206,8 @@ class HiveSparkSubmitSuite
val args = Seq(
"--class", SPARK_14244.getClass.getName.stripSuffix("$"),
"--name", "SparkSQLConfTest",
- "--master", "local-cluster[2,1,1024]",
+ "--master", "local-cluster[2,1,512]",
+ "--conf", s"${EXECUTOR_MEMORY.key}=512m",
"--conf", "spark.ui.enabled=false",
"--conf", "spark.master.rest.enabled=false",
"--driver-java-options", "-Dderby.system.durability=test",
@@ -211,7 +220,8 @@ class HiveSparkSubmitSuite
val args = Seq(
"--class", SetWarehouseLocationTest.getClass.getName.stripSuffix("$"),
"--name", "SetSparkWarehouseLocationTest",
- "--master", "local-cluster[2,1,1024]",
+ "--master", "local-cluster[2,1,512]",
+ "--conf", s"${EXECUTOR_MEMORY.key}=512m",
"--conf", "spark.ui.enabled=false",
"--conf", "spark.master.rest.enabled=false",
"--driver-java-options", "-Dderby.system.durability=test",
@@ -248,7 +258,8 @@ class HiveSparkSubmitSuite
val args = Seq(
"--class", SetWarehouseLocationTest.getClass.getName.stripSuffix("$"),
"--name", "SetHiveWarehouseLocationTest",
- "--master", "local-cluster[2,1,1024]",
+ "--master", "local-cluster[2,1,512]",
+ "--conf", s"${EXECUTOR_MEMORY.key}=512m",
"--conf", "spark.ui.enabled=false",
"--conf", "spark.master.rest.enabled=false",
"--conf", s"spark.sql.test.expectedWarehouseDir=$hiveWarehouseLocation",
@@ -306,7 +317,8 @@ class HiveSparkSubmitSuite
val args = Seq(
"--class", SPARK_18360.getClass.getName.stripSuffix("$"),
"--name", "SPARK-18360",
- "--master", "local-cluster[2,1,1024]",
+ "--master", "local-cluster[2,1,512]",
+ "--conf", s"${EXECUTOR_MEMORY.key}=512m",
"--conf", "spark.ui.enabled=false",
"--conf", "spark.master.rest.enabled=false",
"--driver-java-options", "-Dderby.system.durability=test",
@@ -320,7 +332,8 @@ class HiveSparkSubmitSuite
val argsForCreateTable = Seq(
"--class", SPARK_18989_CREATE_TABLE.getClass.getName.stripSuffix("$"),
"--name", "SPARK-18947",
- "--master", "local-cluster[2,1,1024]",
+ "--master", "local-cluster[2,1,512]",
+ "--conf", s"${EXECUTOR_MEMORY.key}=512m",
"--conf", "spark.ui.enabled=false",
"--conf", "spark.master.rest.enabled=false",
"--jars", HiveTestJars.getHiveContribJar().getCanonicalPath,
@@ -330,7 +343,8 @@ class HiveSparkSubmitSuite
val argsForShowTables = Seq(
"--class", SPARK_18989_DESC_TABLE.getClass.getName.stripSuffix("$"),
"--name", "SPARK-18947",
- "--master", "local-cluster[2,1,1024]",
+ "--master", "local-cluster[2,1,512]",
+ "--conf", s"${EXECUTOR_MEMORY.key}=512m",
"--conf", "spark.ui.enabled=false",
"--conf", "spark.master.rest.enabled=false",
unusedJar.toString)
@@ -351,7 +365,8 @@ class HiveSparkSubmitSuite
val args = Seq(
"--class", SPARK_34772.getClass.getName.stripSuffix("$"),
"--name", "SPARK-34772",
- "--master", "local-cluster[2,1,1024]",
+ "--master", "local-cluster[2,1,512]",
+ "--conf", s"${EXECUTOR_MEMORY.key}=512m",
"--conf", s"${LEGACY_TIME_PARSER_POLICY.key}=LEGACY",
"--conf", s"${HiveUtils.HIVE_METASTORE_VERSION.key}=1.2.1",
"--conf", s"${HiveUtils.HIVE_METASTORE_JARS.key}=maven",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
