Skip to content

[SPARK-49290] Remove commons-lang3 dependency from spark-operator-api #61

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

Closed
dongjoon-hyun wants to merge 1 commit into from
Closed

[SPARK-49290] Remove commons-lang3 dependency from spark-operator-api #61

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
1 change: 0 additions & 1 deletion spark-operator-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ dependencies {
annotationProcessor("io.fabric8:crd-generator-apt:$fabric8Version")

// utils
implementation("org.apache.commons:commons-lang3:$commonsLang3Version")
implementation("commons-io:commons-io:$commonsIOVersion")
implementation("org.projectlombok:lombok:$lombokVersion")
annotationProcessor("org.projectlombok:lombok:$lombokVersion")
Expand Down
3 changes: 1 addition & 2 deletions spark-operator-api/src/main/java/org/apache/spark/k8s/operator/status/ApplicationStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.apache.commons.lang3.StringUtils;

import org.apache.spark.k8s.operator.spec.ResourceRetainPolicy;
import org.apache.spark.k8s.operator.spec.RestartConfig;
Expand Down Expand Up @@ -109,7 +108,7 @@ public ApplicationStatus terminateOrRestart(
if (currentAttemptSummary.getAttemptInfo().getId() >= restartConfig.getMaxRestartAttempts()) {
String stateMessage =
String.format(EXCEED_MAX_RETRY_ATTEMPT_MESSAGE, restartConfig.getMaxRestartAttempts());
if (StringUtils.isNotEmpty(stateMessageOverride)) {
if (stateMessageOverride != null && !stateMessageOverride.isEmpty()) {
stateMessage += stateMessageOverride;
}
// max number of restart attempt reached
Expand Down
4 changes: 2 additions & 2 deletions spark-operator-api/src/main/java/org/apache/spark/k8s/operator/utils/ModelUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.api.model.PodBuilder;
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
import org.apache.commons.lang3.StringUtils;

import org.apache.spark.k8s.operator.SparkApplication;
import org.apache.spark.k8s.operator.spec.ApplicationSpec;
Expand Down Expand Up @@ -67,7 +66,8 @@ public static List<ContainerStatus> findDriverMainContainerStatus(
return containerStatusList;
}
Map<String, String> sparkConf = appSpec.getSparkConf();
if (sparkConf == null || StringUtils.isEmpty(sparkConf.get(DRIVER_SPARK_CONTAINER_PROP_KEY))) {
Copy link
Member Author

@dongjoon-hyun dongjoon-hyun Aug 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since sparkConf == null is always false logically, I removed this.

String key = sparkConf.get(DRIVER_SPARK_CONTAINER_PROP_KEY);
if (key == null || key.isEmpty()) {
return containerStatusList;
}
String mainContainerName = sparkConf.get(DRIVER_SPARK_CONTAINER_PROP_KEY);
Expand Down