Skip to content

Commit 006d271

Browse files
authored
#743: Remove testing properties for hyperdrive executor (#773)
* #743: Remove testing properties for hyperdrive executor
1 parent 1a00be1 commit 006d271

File tree

3 files changed

+3
-12
lines changed

3 files changed

+3
-12
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,5 @@ class Sensors(
5757
class Executors(
5858
@NotNull
5959
@Name("thread.pool.size")
60-
val threadPoolSize: Int,
61-
@DefaultValue(Array("true"))
62-
val enableHyperdriveExecutor: Boolean
60+
val threadPoolSize: Int
6361
)

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@ class Executors @Inject() (
115115
jobInstance match {
116116
case Some(ji) =>
117117
ji.jobParameters match {
118-
case hyperdrive: SparkInstanceParameters
119-
if hyperdrive.jobType == JobTypes.Hyperdrive && useHyperExecutor(hyperdrive) =>
118+
case hyperdrive: SparkInstanceParameters if hyperdrive.jobType == JobTypes.Hyperdrive =>
120119
HyperdriveExecutor
121120
.execute(ji, hyperdrive, updateJob, sparkClusterService, hyperdriveOffsetComparisonService)
122121
case spark: SparkInstanceParameters => SparkExecutor.execute(ji, spark, updateJob, sparkClusterService)
@@ -136,12 +135,6 @@ class Executors @Inject() (
136135
fut
137136
}
138137

139-
private def useHyperExecutor(parameters: SparkInstanceParameters) = {
140-
schedulerConfig.executors.enableHyperdriveExecutor &&
141-
parameters.jobType == JobTypes.Hyperdrive &&
142-
parameters.appArguments.contains("useHyperdriveExecutor=true")
143-
}
144-
145138
private def updateJob(jobInstance: JobInstance): Future[Unit] = {
146139
logger.info(
147140
s"Job updated. ID = ${jobInstance.id} STATUS = ${jobInstance.jobStatus} EXECUTOR_ID = ${jobInstance.executorJobId}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ object TestSchedulerConfig {
3333
autostart,
3434
lagThreshold,
3535
new Sensors(sensorsThreadPoolSize, sensorsChangedSensorsChunkQuerySize),
36-
new Executors(executorsThreadPoolSize, true)
36+
new Executors(executorsThreadPoolSize)
3737
)
3838
}

0 commit comments

Comments
 (0)