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

Fix IDEA203 regression of Spark failure debug in local #4998

Merged
merged 1 commit into from
Mar 9, 2021
Merged

Fix IDEA203 regression of Spark failure debug in local #4998

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
12 changes: 7 additions & 5 deletions ...r-intellij/src/com/microsoft/azure/hdinsight/spark/run/SparkFailureTaskRunProfileState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@ import com.intellij.execution.DefaultExecutionResult
import com.intellij.execution.ExecutionException
import com.intellij.execution.ExecutionResult
import com.intellij.execution.Executor
import com.intellij.execution.ShortenCommandLine.MANIFEST
import com.intellij.execution.configurations.GeneralCommandLine
import com.intellij.execution.configurations.JavaParameters
import com.intellij.execution.process.KillableColoredProcessHandler
import com.intellij.execution.process.ProcessAdapter
import com.intellij.execution.process.ProcessEvent
import com.intellij.execution.runners.ProgramRunner
import com.intellij.execution.util.JavaParametersUtil
import com.intellij.util.PathUtil
import com.intellij.openapi.util.io.FileUtil
import com.microsoft.azure.hdinsight.spark.common.SparkFailureTaskDebugConfigurableModel
import com.microsoft.azure.hdinsight.spark.ui.SparkJobLogConsoleView
import com.microsoft.azuretools.telemetrywrapper.ErrorType
Expand Down Expand Up @@ -118,18 +119,18 @@ open class SparkFailureTaskRunProfileState(val name: String,

JavaParametersUtil.configureConfiguration(params, settingsConfigModel)

// Put failure context runtime at beginning, after JDK6, the classpath support <dir>/*
params.classPath.addAllFiles(File(FileUtil.toCanonicalPath(settingsConfigModel.workingDirectory), "runtime").listFiles())

// The dependent spark-tools.jar is already in the Maven project lib/ directory
JavaParametersUtil.configureProject(project, params, JavaParameters.JDK_AND_CLASSES_AND_TESTS, null)

// Additional VM parameters
additionalVmParameters.forEach { params.vmParametersList.add(it) }

// Put failure context runtime at beginning, after JDK6, the classpath support <dir>/*
params.classPath.addFirst("${PathUtil.getCanonicalPath(settingsConfigModel.workingDirectory)}/runtime/*")

// Prepare log4j.properties file
settingsConfigModel.log4jProperties?.also { log4jProp ->
val log4jPropertiesFile = File("${PathUtil.getCanonicalPath(settingsConfigModel.workingDirectory)}/conf/log4j.properties")
val log4jPropertiesFile = File("${FileUtil.toCanonicalPath(settingsConfigModel.workingDirectory)}/conf/log4j.properties")
.apply {
parentFile.mkdir()
writeText(log4jProp)
Expand All @@ -140,6 +141,7 @@ open class SparkFailureTaskRunProfileState(val name: String,

// Helper Main class
params.mainClass = settingsConfigModel.runClass
params.setShortenCommandLine(MANIFEST, null)

return params.toCommandLine()
}
Expand Down