Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[KYLIN-5462]Limit the initial size of spark executor #2090

Open
wants to merge 1 commit into
base: kylin4
Choose a base branch
from
Open

[KYLIN-5462]Limit the initial size of spark executor #2090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ...park-engine/src/main/java/org/apache/kylin/engine/spark/application/SparkApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,14 @@ private void autoSetSparkConf(SparkConf sparkConf) throws Exception {
helper.setConf(SparkConfHelper.COUNT_DISTICT, hasCountDistinct().toString());
helper.generateSparkConf();
helper.applySparkConf(sparkConf);
helper.setConf(SparkConfHelper.COUNT_DISTICT, hasCountDistinct().toString());
if (Boolean.valueOf(configOverride.getOrDefault("spark.dynamicAllocation.enabled", "false"))) {
int maxExecutors = Integer.valueOf(configOverride.getOrDefault("spark.dynamicAllocation.maxExecutors",
String.valueOf(Integer.MAX_VALUE)));
helper.setConf(SparkConfHelper.MAX_EXECUTORS, String.valueOf(maxExecutors));
} else {
helper.setConf(SparkConfHelper.MAX_EXECUTORS, String.valueOf(Integer.MAX_VALUE));
}
}

protected String chooseContentSize(Path shareDir) throws IOException {
Expand Down
2 changes: 2 additions & 0 deletions ...ylin-spark-engine/src/main/scala/org/apache/kylin/engine/spark/utils/SparkConfHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ public class SparkConfHelper {
public static final String DRIVER_OVERHEAD = "spark.driver.memoryOverhead";
public static final String DRIVER_CORES = "spark.driver.cores";
public static final String COUNT_DISTICT = "count_distinct";
public static final String MAX_EXECUTORS = "spark.dynamicAllocation.maxExecutors";


private static final List<SparkConfRule> EXECUTOR_RULES = ImmutableList.of(new ExecutorMemoryRule(),
new ExecutorCoreRule(), new ExecutorOverheadRule(), new ExecutorInstancesRule(),
Expand Down
3 changes: 2 additions & 1 deletion ...-project/kylin-spark-engine/src/main/scala/org/apache/spark/conf/rule/SparkConfRule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ class ExecutorInstancesRule extends SparkConfRule {

val needInstance = Math.max(calculateExecutorInsByLayoutSize.toLong, requiredCores.toInt / executorCore)
val instance = Math.min(needInstance, queueAvailableInstance)
val executorInstance = Math.max(instance.toLong, baseExecutorInstances.toLong).toString
val dynamicMaxExecutors = helper.getConf(SparkConfHelper.MAX_EXECUTORS)
val executorInstance = Math.min(Math.max(instance.toLong, baseExecutorInstances.toLong), dynamicMaxExecutors.toLong).toString
logInfo(s"Current queueAvailableInstance is $queueAvailableInstance, " +
s"needInstance is $needInstance, instance is $instance")
helper.setConf(SparkConfHelper.EXECUTOR_INSTANCES, executorInstance)
Expand Down