From bbd8d7def149e787a33ed0decf332d33c593e93c Mon Sep 17 00:00:00 2001
From: Sean Owen <sowen@cloudera.com>
Date: Sat, 20 May 2017 15:27:13 +0100
Subject: [PATCH] [SPARK-20806][DEPLOY] Launcher: redundant check for Spark lib
dir
## What changes were proposed in this pull request?
Remove redundant check for libdir in CommandBuilderUtils
## How was this patch tested?
Existing tests
Author: Sean Owen <sowen@cloudera.com>
Closes #18032 from srowen/SPARK-20806.
---
.../apache/spark/launcher/CommandBuilderUtils.java | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/launcher/src/main/java/org/apache/spark/launcher/CommandBuilderUtils.java b/launcher/src/main/java/org/apache/spark/launcher/CommandBuilderUtils.java
index e14c8aa47d..47d2f8ef4e 100644
--- a/launcher/src/main/java/org/apache/spark/launcher/CommandBuilderUtils.java
+++ b/launcher/src/main/java/org/apache/spark/launcher/CommandBuilderUtils.java
@@ -335,22 +335,17 @@ class CommandBuilderUtils {
*/
static String findJarsDir(String sparkHome, String scalaVersion, boolean failIfNotFound) {
// TODO: change to the correct directory once the assembly build is changed.
- File libdir;
- if (new File(sparkHome, "jars").isDirectory()) {
- libdir = new File(sparkHome, "jars");
- checkState(!failIfNotFound || libdir.isDirectory(),
- "Library directory '%s' does not exist.",
- libdir.getAbsolutePath());
- } else {
+ File libdir = new File(sparkHome, "jars");
+ if (!libdir.isDirectory()) {
libdir = new File(sparkHome, String.format("assembly/target/scala-%s/jars", scalaVersion));
if (!libdir.isDirectory()) {
checkState(!failIfNotFound,
"Library directory '%s' does not exist; make sure Spark is built.",
libdir.getAbsolutePath());
- libdir = null;
+ return null;
}
}
- return libdir != null ? libdir.getAbsolutePath() : null;
+ return libdir.getAbsolutePath();
}
}
--
GitLab