Skip to content

#743: Remove testing properties for hyperdrive executor #773

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
merged 2 commits into from
Jan 12, 2023
Merged

#743: Remove testing properties for hyperdrive executor #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8a0f75
#743: Remove testing properties for hyperdrive executor
jozefbakus Jan 12, 2023
645540f
#743: PR FIX
jozefbakus Jan 12, 2023
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
4 changes: 1 addition & 3 deletions src/main/scala/za/co/absa/hyperdrive/trigger/configuration/application/SchedulerConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,5 @@ class Sensors(
class Executors(
@NotNull
@Name("thread.pool.size")
val threadPoolSize: Int,
@DefaultValue(Array("true"))
val enableHyperdriveExecutor: Boolean
val threadPoolSize: Int
)
9 changes: 1 addition & 8 deletions src/main/scala/za/co/absa/hyperdrive/trigger/scheduler/executors/Executors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,7 @@ class Executors @Inject() (
jobInstance match {
case Some(ji) =>
ji.jobParameters match {
case hyperdrive: SparkInstanceParameters
if hyperdrive.jobType == JobTypes.Hyperdrive && useHyperExecutor(hyperdrive) =>
case hyperdrive: SparkInstanceParameters if hyperdrive.jobType == JobTypes.Hyperdrive =>
HyperdriveExecutor
.execute(ji, hyperdrive, updateJob, sparkClusterService, hyperdriveOffsetComparisonService)
case spark: SparkInstanceParameters => SparkExecutor.execute(ji, spark, updateJob, sparkClusterService)
Expand All @@ -136,12 +135,6 @@ class Executors @Inject() (
fut
}

private def useHyperExecutor(parameters: SparkInstanceParameters) = {
schedulerConfig.executors.enableHyperdriveExecutor &&
parameters.jobType == JobTypes.Hyperdrive &&
parameters.appArguments.contains("useHyperdriveExecutor=true")
}

private def updateJob(jobInstance: JobInstance): Future[Unit] = {
logger.info(
s"Job updated. ID = ${jobInstance.id} STATUS = ${jobInstance.jobStatus} EXECUTOR_ID = ${jobInstance.executorJobId}"
Expand Down
2 changes: 1 addition & 1 deletion ...t/scala/za/co/absa/hyperdrive/trigger/configuration/application/TestSchedulerConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ object TestSchedulerConfig {
autostart,
lagThreshold,
new Sensors(sensorsThreadPoolSize, sensorsChangedSensorsChunkQuerySize),
new Executors(executorsThreadPoolSize, true)
new Executors(executorsThreadPoolSize)
)
}