diff --git a/src/main/scala/org/apache/mesos/chronos/scheduler/api/DependentJobResource.scala b/src/main/scala/org/apache/mesos/chronos/scheduler/api/DependentJobResource.scala index 627a444f0..2695b2c57 100644 --- a/src/main/scala/org/apache/mesos/chronos/scheduler/api/DependentJobResource.scala +++ b/src/main/scala/org/apache/mesos/chronos/scheduler/api/DependentJobResource.scala @@ -74,7 +74,8 @@ class DependentJobResource @Inject()( jobScheduler.updateJob(oldJob, newJob) log.info("Job parent: [ %s ], name: %s, command: %s".format(newJob.parents.mkString(","), newJob.name, newJob.command)) - log.info("Replaced job: '%s', oldJob: '%s', newJob: '%s'".format( + log.info("Replaced job: '%s'".format(newJob.name)) + log.fine("Replaced job: '%s', oldJob: '%s', newJob: '%s'".format( newJob.name, new String(JobUtils.toBytes(oldJob), Charsets.UTF_8), new String(JobUtils.toBytes(newJob), Charsets.UTF_8))) diff --git a/src/main/scala/org/apache/mesos/chronos/scheduler/api/Iso8601JobResource.scala b/src/main/scala/org/apache/mesos/chronos/scheduler/api/Iso8601JobResource.scala index bad89a9e1..648b98a11 100644 --- a/src/main/scala/org/apache/mesos/chronos/scheduler/api/Iso8601JobResource.scala +++ b/src/main/scala/org/apache/mesos/chronos/scheduler/api/Iso8601JobResource.scala @@ -71,8 +71,8 @@ class Iso8601JobResource @Inject()( } jobScheduler.updateJob(oldJob, newJob) - - log.info("Replaced job: '%s', oldJob: '%s', newJob: '%s'".format( + log.info("Replaced job: '%s'".format(newJob.name)) + log.fine("Replaced job: '%s', oldJob: '%s', newJob: '%s'".format( newJob.name, new String(JobUtils.toBytes(oldJob), Charsets.UTF_8), new String(JobUtils.toBytes(newJob), Charsets.UTF_8))) diff --git a/src/main/scala/org/apache/mesos/chronos/scheduler/jobs/JobsObserver.scala b/src/main/scala/org/apache/mesos/chronos/scheduler/jobs/JobsObserver.scala index 04f76cf6c..fa4077b09 100644 --- a/src/main/scala/org/apache/mesos/chronos/scheduler/jobs/JobsObserver.scala +++ b/src/main/scala/org/apache/mesos/chronos/scheduler/jobs/JobsObserver.scala @@ -24,7 +24,7 @@ object JobsObserver { def composite(observers: List[Observer]): Observer = { case event => observers.foreach(observer => observer.lift.apply(event).orElse { - log.info(s"$observer does not handle $event") + log.fine(s"$observer does not handle $event") Some(Unit) }) } diff --git a/src/main/scala/org/apache/mesos/chronos/scheduler/mesos/MesosJobFramework.scala b/src/main/scala/org/apache/mesos/chronos/scheduler/mesos/MesosJobFramework.scala index d357ea576..b8a11c997 100644 --- a/src/main/scala/org/apache/mesos/chronos/scheduler/mesos/MesosJobFramework.scala +++ b/src/main/scala/org/apache/mesos/chronos/scheduler/mesos/MesosJobFramework.scala @@ -2,20 +2,18 @@ package org.apache.mesos.chronos.scheduler.mesos import java.util.logging.Logger -import org.apache.mesos.chronos.scheduler.config.SchedulerConfiguration -import org.apache.mesos.chronos.scheduler.jobs._ -import org.apache.mesos.chronos.scheduler.jobs.constraints.Constraint -import org.apache.mesos.chronos.utils.JobDeserializer import com.google.inject.Inject import mesosphere.mesos.util.FrameworkIdUtil import org.apache.mesos.Protos._ +import org.apache.mesos.chronos.scheduler.config.SchedulerConfiguration +import org.apache.mesos.chronos.scheduler.jobs._ +import org.apache.mesos.chronos.utils.JobDeserializer import org.apache.mesos.{Protos, Scheduler, SchedulerDriver} import org.joda.time.DateTime import scala.annotation.tailrec import scala.collection.JavaConverters._ import scala.collection.mutable -import scala.collection.mutable.{Buffer, HashMap, HashSet} /** * Provides the interface to chronos. Receives callbacks from chronos when resources are offered, declined etc. @@ -175,7 +173,9 @@ class MesosJobFramework @Inject()( val mesosTasks = subTasks.map(task => { taskBuilder.getMesosTaskInfoBuilder(task._1, task._2, task._3).setSlaveId(task._3.getSlaveId).build() }) - log.info("Launching tasks from offer: " + offer + " with tasks: " + mesosTasks) + log.info("Launching tasks from offer with id: " + offer.getId + "with url info: " + offer.getUrl + + "for slave id: " + offer.getSlaveId) + log.fine("Launching tasks from offer: " + offer + " with tasks: " + mesosTasks) val status: Protos.Status = mesosDriver.get().launchTasks( List(offer.getId).asJava, mesosTasks.asJava diff --git a/src/main/scala/org/apache/mesos/chronos/scheduler/state/MesosStatePersistenceStore.scala b/src/main/scala/org/apache/mesos/chronos/scheduler/state/MesosStatePersistenceStore.scala index 4d0317a5f..cd8e50d3b 100644 --- a/src/main/scala/org/apache/mesos/chronos/scheduler/state/MesosStatePersistenceStore.scala +++ b/src/main/scala/org/apache/mesos/chronos/scheduler/state/MesosStatePersistenceStore.scala @@ -60,7 +60,9 @@ class MesosStatePersistenceStore @Inject()(val zk: CuratorFramework, } def persistJob(job: BaseJob): Boolean = { - log.info("Persisting job '%s' with data '%s'" format(job.name, job.toString)) + log.info("Persisting job: '%s' with description: '%s' , docker container info: '%s', job arguments as: " + + "and task info data as: '%s'" format(job.name, job.description, job.container, job.arguments, job.taskInfoData)) + log.fine("Persisting job '%s' with data '%s'" format(job.name, job.toString)) persistData(jobName(job.name), JobUtils.toBytes(job)) }