Introduce JobsObserver interface and place both JobStats and error notification behind that interface #436
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package org.apache.mesos.chronos.notification | ||
|
|
||
| import java.util.logging.Logger | ||
|
|
||
| import akka.actor.ActorRef | ||
| import com.google.inject.Inject | ||
| import org.apache.mesos.chronos.scheduler.jobs._ | ||
| import org.joda.time.{DateTimeZone, DateTime} | ||
|
|
||
| class JobNotificationObserver @Inject()(val notificationClients: List[ActorRef] = List(), | ||
| val clusterName: Option[String] = None) { | ||
| private[this] val log = Logger.getLogger(getClass.getName) | ||
| val clusterPrefix = clusterName.map(name => s"[$name]").getOrElse("") | ||
|
|
||
| def asObserver: JobsObserver.Observer = { | ||
| case JobRemoved(job) => sendNotification(job, "%s [Chronos] Your job '%s' was deleted!".format(clusterPrefix, job.name), None) | ||
| case JobDisabled(job, cause) => sendNotification( | ||
| job, | ||
| "%s [Chronos] job '%s' disabled".format(clusterPrefix, job.name), | ||
| Some(cause)) | ||
|
|
||
| case JobRetriesExhausted(job, taskStatus, attempts) => | ||
| val msg = "\n'%s'. Retries attempted: %d.\nTask id: %s\n" | ||
| .format(DateTime.now(DateTimeZone.UTC), job.retries, taskStatus.getTaskId.getValue) | ||
| sendNotification(job, "%s [Chronos] job '%s' failed!".format(clusterPrefix, job.name), | ||
| Some(TaskUtils.appendSchedulerMessage(msg, taskStatus))) | ||
| } | ||
|
|
||
| def sendNotification(job: BaseJob, subject: String, message: Option[String] = None) { | ||
| for (client <- notificationClients) { | ||
| val subowners = job.owner.split("\\s*,\\s*") | ||
| for (subowner <- subowners) { | ||
| log.info("Sending mail notification to:%s for job %s using client: %s".format(subowner, job.name, client)) | ||
| client !(job, subowner, subject, message) | ||
| } | ||
| } | ||
|
|
||
| log.info(subject) | ||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,9 +6,10 @@ import java.util.logging.{Level, Logger} | |
|
|
||
| import akka.actor.{ActorRef, ActorSystem, Props} | ||
| import akka.util.Timeout | ||
| import org.apache.mesos.chronos.notification.{JobNotificationObserver, MailClient, RavenClient, SlackClient} | ||
| import org.apache.mesos.chronos.scheduler.graph.JobGraph | ||
| import org.apache.mesos.chronos.scheduler.jobs.stats.JobStats | ||
| import org.apache.mesos.chronos.scheduler.jobs.{JobsObserver, JobMetrics, JobScheduler, TaskManager} | ||
| import org.apache.mesos.chronos.scheduler.mesos.{MesosDriverFactory, MesosJobFramework, MesosTaskBuilder} | ||
| import org.apache.mesos.chronos.scheduler.state.PersistenceStore | ||
| import com.google.common.util.concurrent.{ListeningScheduledExecutorService, MoreExecutors, ThreadFactoryBuilder} | ||
|
|
@@ -90,9 +91,8 @@ class MainModule(val config: SchedulerConfiguration with HttpConf) | |
| mesosSchedulerDriver: MesosDriverFactory, | ||
| curator: CuratorFramework, | ||
| leaderLatch: LeaderLatch, | ||
| jobsObserver: JobsObserver.Observer, | ||
| metrics: JobMetrics): JobScheduler = { | ||
| new JobScheduler( | ||
| scheduleHorizon = Seconds.seconds(config.scheduleHorizonSeconds()).toPeriod, | ||
| taskManager = taskManager, | ||
|
|
@@ -102,12 +102,17 @@ class MainModule(val config: SchedulerConfiguration with HttpConf) | |
| curator = curator, | ||
| leaderLatch = leaderLatch, | ||
| leaderPath = config.zooKeeperCandidatePath, | ||
| jobsObserver = jobsObserver, | ||
| failureRetryDelay = config.failureRetryDelayMs(), | ||
| disableAfterFailures = config.disableAfterFailures(), | ||
| jobMetrics = metrics) | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. Where is this method (provideJobsObservers) called? There was a problem hiding this comment. it is Guice @provides annotated factory method, if I understand Guice correctly. So whenever JobsObserver instance is needed a singleton instance is provided. https://github.com/google/guice/wiki/ProvidesMethods |
||
| @Singleton | ||
| @Provides | ||
| def provideJobsObservers(jobStats: JobStats, notificationClients: List[ActorRef]): JobsObserver.Observer = { | ||
| val notifier = new JobNotificationObserver(notificationClients, config.clusterName.get) | ||
| JobsObserver.composite(List(notifier.asObserver, jobStats.asObserver)) | ||
| } | ||
|
|
||
| @Singleton | ||
|
|
@@ -136,8 +141,7 @@ class MainModule(val config: SchedulerConfiguration with HttpConf) | |
| for { | ||
| webhookUrl <- config.slackWebhookUrl.get if !config.slackWebhookUrl.isEmpty | ||
| } yield { | ||
| create(classOf[SlackClient], webhookUrl)} | ||
| ).flatten | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's evaluate clusterPrefix inside JobRetriesExhausted (only where it is used)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is also used in JobRemoved case
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, makes sense