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 config not applied when starting livy interactive console issue #5996

Merged
merged 1 commit into from
Oct 26, 2021
Merged

Fix config not applied when starting livy interactive console issue #5996

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
34 changes: 19 additions & 15 deletions ...tlin/com/microsoft/azure/hdinsight/spark/console/SparkScalaLivyConsoleRunConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,28 +147,32 @@ open class SparkScalaLivyConsoleRunConfiguration(project: Project,
.referJars(*batchSubmitModel.referenceJars.map { url -> transformToGen2Uri(url) }.toTypedArray())
.referFiles(*batchSubmitModel.referenceFiles.map { url -> transformToGen2Uri(url) }.toTypedArray())

if (batchSubmitModel.jobUploadStorageModel.storageAccountType == SparkSubmitStorageType.BLOB) {
try {
try {
val jobConfig = batchSubmitModel.jobConfigs.map { SimpleImmutableEntry(it[0], it[1]) }.toMutableList()

if (batchSubmitModel.jobUploadStorageModel.storageAccountType == SparkSubmitStorageType.BLOB) {
val fsRoot = WasbUri.parse(batchSubmitModel.jobUploadStorageModel.uploadPath)
val storageKey = batchSubmitModel.jobUploadStorageModel.storageKey
val updatedStorageConfig = batchSubmitModel.jobConfigs.map { SimpleImmutableEntry(it[0], it[1]) }.toMutableList().apply {
val jobWithStorageConfig = jobConfig.apply {
// We need the following config to fix issue https://github.com/microsoft/azure-tools-for-java/issues/5002
add(SimpleImmutableEntry("spark.hadoop." + fsRoot.hadoopBlobFsPropertyKey, storageKey))
add(SimpleImmutableEntry("spark.hadoop." + fsRoot.keyProviderPropertyKey, fsRoot.defaultKeyProviderPropertyValue))
}
session.createParameters.conf(updatedStorageConfig)
} catch (error: UnknownFormatConversionException) {
val errorHint = "Azure blob storage uploading path is not in correct format"
log().warn(String.format("%s. Uploading Path: %s. Error message: %s. Stacktrace:\n%s",
errorHint, batchSubmitModel.jobUploadStorageModel.uploadPath, error.message,
ExceptionUtils.getStackTrace(error)))
throw RuntimeConfigurationError(errorHint)
} catch (error: Exception) {
val errorHint = "Failed to update config for linked Azure Blob storage"
log().warn(String.format("%s. Error message: %s. Stacktrace:\n%s",
errorHint, error.message, ExceptionUtils.getStackTrace(error)))
throw RuntimeConfigurationError(errorHint)
session.createParameters.conf(jobWithStorageConfig)
} else {
session.createParameters.conf(jobConfig)
}
} catch (error: UnknownFormatConversionException) {
val errorHint = "Azure blob storage uploading path is not in correct format"
log().warn(String.format("%s. Uploading Path: %s. Error message: %s. Stacktrace:\n%s",
errorHint, batchSubmitModel.jobUploadStorageModel.uploadPath, error.message,
ExceptionUtils.getStackTrace(error)))
throw RuntimeConfigurationError(errorHint)
} catch (error: Exception) {
val errorHint = "Failed to update config for linked Azure Blob storage"
log().warn(String.format("%s. Error message: %s. Stacktrace:\n%s",
errorHint, error.message, ExceptionUtils.getStackTrace(error)))
throw RuntimeConfigurationError(errorHint)
}

batchSubmitModel.artifactPath.ifPresent {
Expand Down