Skip to content

Commit f71e4af

Browse files
Add saveDiagnostics application property (#841)
* Add saveDiagnostics application property * Fix format * PR fix
1 parent 64b9b2c commit f71e4af

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

src/main/resources/application.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ kafkaSource.properties.sasl.jaas.config=
100100
spark.submitApi=yarn
101101
sparkYarnSink.hadoopResourceManagerUrlBase=http://localhost:8088
102102
sparkYarnSink.userUsedToKillJob=
103+
sparkYarnSink.saveDiagnostics=false
103104
sparkYarnSink.master=yarn
104105
sparkYarnSink.submitTimeout=160000
105106
sparkYarnSink.filesToDeploy=

src/main/scala/za/co/absa/hyperdrive/trigger/configuration/application/SparkConfig.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ class SparkConfig(
4242
@DefaultValue(Array("Unknown"))
4343
@Name("sparkYarnSink.userUsedToKillJob")
4444
val userUsedToKillJob: String,
45+
@DefaultValue(Array("false"))
46+
@Name("sparkYarnSink.saveDiagnostics")
47+
val saveDiagnostics: Boolean,
4548
@DefaultValue(Array("10"))
4649
@Name("spark.submit.thread.pool.size")
4750
val sparkSubmitThreadPoolSize: Int

src/main/scala/za/co/absa/hyperdrive/trigger/scheduler/executors/spark/SparkExecutor.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,11 @@ object SparkExecutor {
7272
private def getUpdatedJobInstance(
7373
jobInstance: JobInstance,
7474
app: App
75-
): JobInstance = {
75+
)(implicit sparkConfig: SparkConfig): JobInstance = {
7676
val diagnostics = app.diagnostics match {
77-
case "" => None
78-
case _ => Some(app.diagnostics)
77+
case "" => None
78+
case _ if sparkConfig.saveDiagnostics => Some(app.diagnostics)
79+
case _ => None
7980
}
8081

8182
jobInstance.copy(

src/test/scala/za/co/absa/hyperdrive/trigger/configuration/application/DefaultTestSparkConfig.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ case class DefaultTestSparkConfig(
2525
filesToDeploy: Seq[String] = Seq(),
2626
additionalConfs: Map[String, String] = Map(),
2727
userUsedToKillJob: String = "Unknown",
28+
saveDiagnostics: Boolean = false,
2829
sparkSubmitThreadPoolSize: Int = 10,
2930
clusterId: String = "j-2AXXXXXXGAPLF"
3031
) {
@@ -35,6 +36,7 @@ case class DefaultTestSparkConfig(
3536
null,
3637
hadoopResourceManagerUrlBase,
3738
userUsedToKillJob,
39+
saveDiagnostics,
3840
sparkSubmitThreadPoolSize
3941
)
4042

@@ -45,6 +47,7 @@ case class DefaultTestSparkConfig(
4547
new SparkEmrSinkConfig(clusterId, filesToDeploy.mkString(","), toProperties(additionalConfs)),
4648
hadoopResourceManagerUrlBase,
4749
userUsedToKillJob,
50+
saveDiagnostics,
4851
sparkSubmitThreadPoolSize
4952
)
5053

0 commit comments

Comments
 (0)