Merge pull request #1449 from HubSpot/improve_status_logging

Improve status logging
HubSpot · Mar 9, 2017 · 52dab48 · 52dab48
2 parents e0139cd + 1cfa97d
commit 52dab48
Show file tree

Hide file tree

Showing 4 changed files with 268 additions and 241 deletions.
diff --git a/SingularityService/src/main/java/com/hubspot/singularity/SingularityMainModule.java b/SingularityService/src/main/java/com/hubspot/singularity/SingularityMainModule.java
@@ -23,6 +23,7 @@
 import com.amazonaws.services.s3.AmazonS3Client;
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.Timer;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
@@ -105,6 +106,8 @@ public class SingularityMainModule implements Module {
 
   public static final String LOST_TASKS_METER = "singularity.lost.tasks.meter";
 
+  public static final String STATUS_UPDATE_DELTA_TIMER = "singularity.status.update.delta.timer";
+
   private final SingularityConfiguration configuration;
 
   public SingularityMainModule(final SingularityConfiguration configuration) {
@@ -357,4 +360,11 @@ public Optional<HttpServletRequest> providesUrl(Provider<HttpServletRequest> req
   public Meter providesLostTasksMeter(MetricRegistry registry) {
     return registry.meter("com.hubspot.singularity.lostTasks");
   }
+
+  @Provides
+  @Singleton
+  @Named(STATUS_UPDATE_DELTA_TIMER)
+  public Timer providesStatusUpdateDeltaMeter(MetricRegistry registry) {
+    return registry.timer("com.hubspot.singularity.statusUpdateDelta");
+  }
 }
diff --git a/...ularityService/src/main/java/com/hubspot/singularity/config/SingularityConfiguration.java b/...ularityService/src/main/java/com/hubspot/singularity/config/SingularityConfiguration.java
@@ -1258,4 +1258,5 @@ public SingularityConfiguration setAllowBounceToSameHost(boolean allowBounceToSa
     this.allowBounceToSameHost = allowBounceToSameHost;
     return this;
   }
+
 }
diff --git a/SingularityService/src/main/java/com/hubspot/singularity/mesos/SingularityDriver.java b/SingularityService/src/main/java/com/hubspot/singularity/mesos/SingularityDriver.java
@@ -74,9 +74,9 @@ public class SingularityDriver {
         .setPrincipal(configuration.getCredentialPrincipal().get())
         .setSecret(configuration.getCredentialSecret().get())
         .build();
-      this.driver = new MesosSchedulerDriver(scheduler, frameworkInfo, configuration.getMaster(), false, credential);
+      this.driver = new MesosSchedulerDriver(scheduler, frameworkInfo, configuration.getMaster(), !singularityConfiguration.isProcessStatusUpdatesInSeparateThread(), credential);
     } else {
-      this.driver = new MesosSchedulerDriver(scheduler, frameworkInfo, configuration.getMaster(), false);
+      this.driver = new MesosSchedulerDriver(scheduler, frameworkInfo, configuration.getMaster(), !singularityConfiguration.isProcessStatusUpdatesInSeparateThread());
     }
   }