You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by va...@apache.org on 2017/11/14 23:20:11 UTC
spark git commit: [SPARK-22519][YARN] Remove unnecessary
stagingDirPath null check in ApplicationMaster.cleanupStagingDir()
Repository: spark
Updated Branches:
refs/heads/master 0ffa7c488 -> eaff295a2
[SPARK-22519][YARN] Remove unnecessary stagingDirPath null check in ApplicationMaster.cleanupStagingDir()
## What changes were proposed in this pull request?
Removed the unnecessary stagingDirPath null check in ApplicationMaster.cleanupStagingDir().
## How was this patch tested?
I verified with the existing test cases.
Author: Devaraj K <de...@apache.org>
Closes #19749 from devaraj-kavali/SPARK-22519.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/eaff295a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/eaff295a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/eaff295a
Branch: refs/heads/master
Commit: eaff295a232217c4424f2885303f9a127dea0422
Parents: 0ffa7c4
Author: Devaraj K <de...@apache.org>
Authored: Tue Nov 14 15:20:03 2017 -0800
Committer: Marcelo Vanzin <va...@cloudera.com>
Committed: Tue Nov 14 15:20:03 2017 -0800
----------------------------------------------------------------------
.../scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/eaff295a/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
----------------------------------------------------------------------
diff --git a/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala b/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
index 244d912..ca0aa0e 100644
--- a/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
+++ b/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
@@ -608,10 +608,6 @@ private[spark] class ApplicationMaster(args: ApplicationMasterArguments) extends
val preserveFiles = sparkConf.get(PRESERVE_STAGING_FILES)
if (!preserveFiles) {
stagingDirPath = new Path(System.getenv("SPARK_YARN_STAGING_DIR"))
- if (stagingDirPath == null) {
- logError("Staging directory is null")
- return
- }
logInfo("Deleting staging directory " + stagingDirPath)
val fs = stagingDirPath.getFileSystem(yarnConf)
fs.delete(stagingDirPath, true)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org