Skip to content

Add saveDiagnostics application property #841

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

Merged
kevinwallimann merged 4 commits into from
Mar 8, 2024
Merged

Add saveDiagnostics application property #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44d0e3b
Add saveDiagnostics application property
kevinwallimann Mar 6, 2024
ea38489
Fix format
kevinwallimann Mar 6, 2024
5af95cd
PR fix
kevinwallimann Mar 6, 2024
3b28f14
Merge branch 'develop' into feature/840-diagnostics-switch
kevinwallimann Mar 6, 2024
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: 1 addition & 0 deletions src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ kafkaSource.properties.sasl.jaas.config=
spark.submitApi=yarn
sparkYarnSink.hadoopResourceManagerUrlBase=http://localhost:8088
sparkYarnSink.userUsedToKillJob=
sparkYarnSink.saveDiagnostics=false
sparkYarnSink.master=yarn
sparkYarnSink.submitTimeout=160000
sparkYarnSink.filesToDeploy=
Expand Down
3 changes: 3 additions & 0 deletions src/main/scala/za/co/absa/hyperdrive/trigger/configuration/application/SparkConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ class SparkConfig(
@DefaultValue(Array("Unknown"))
@Name("sparkYarnSink.userUsedToKillJob")
val userUsedToKillJob: String,
@DefaultValue(Array("false"))
@Name("sparkYarnSink.saveDiagnostics")
val saveDiagnostics: Boolean,
@DefaultValue(Array("10"))
@Name("spark.submit.thread.pool.size")
val sparkSubmitThreadPoolSize: Int
Expand Down
7 changes: 4 additions & 3 deletions src/main/scala/za/co/absa/hyperdrive/trigger/scheduler/executors/spark/SparkExecutor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,11 @@ object SparkExecutor {
private def getUpdatedJobInstance(
jobInstance: JobInstance,
app: App
): JobInstance = {
)(implicit sparkConfig: SparkConfig): JobInstance = {
val diagnostics = app.diagnostics match {
case "" => None
case _ => Some(app.diagnostics)
case "" => None
case _ if sparkConfig.saveDiagnostics => Some(app.diagnostics)
case _ => None
}

jobInstance.copy(
Expand Down
3 changes: 3 additions & 0 deletions ...cala/za/co/absa/hyperdrive/trigger/configuration/application/DefaultTestSparkConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ case class DefaultTestSparkConfig(
filesToDeploy: Seq[String] = Seq(),
additionalConfs: Map[String, String] = Map(),
userUsedToKillJob: String = "Unknown",
saveDiagnostics: Boolean = false,
sparkSubmitThreadPoolSize: Int = 10,
clusterId: String = "j-2AXXXXXXGAPLF"
) {
Expand All @@ -35,6 +36,7 @@ case class DefaultTestSparkConfig(
null,
hadoopResourceManagerUrlBase,
userUsedToKillJob,
saveDiagnostics,
sparkSubmitThreadPoolSize
)

Expand All @@ -45,6 +47,7 @@ case class DefaultTestSparkConfig(
new SparkEmrSinkConfig(clusterId, filesToDeploy.mkString(","), toProperties(additionalConfs)),
hadoopResourceManagerUrlBase,
userUsedToKillJob,
saveDiagnostics,
sparkSubmitThreadPoolSize
)

Expand Down