You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/03/30 21:58:09 UTC
[05/50] incubator-usergrid git commit: Fix for changes that broke the
JobSchedulerService by changing the way that MetricsFactory is instantiated.
Fix for changes that broke the JobSchedulerService by changing the way that MetricsFactory is instantiated.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c298a457
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c298a457
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c298a457
Branch: refs/heads/two-dot-o-dev
Commit: c298a457f93b2e1cd11827835a11aa9aa697cc8f
Parents: 54ce892
Author: Dave Johnson <dm...@apigee.com>
Authored: Thu Mar 5 13:02:50 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Thu Mar 5 13:02:50 2015 -0500
----------------------------------------------------------------------
.../batch/service/JobSchedulerService.java | 28 +++++++++++++++-----
.../main/resources/usergrid-core-context.xml | 3 ++-
2 files changed, 24 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c298a457/stack/core/src/main/java/org/apache/usergrid/batch/service/JobSchedulerService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/batch/service/JobSchedulerService.java b/stack/core/src/main/java/org/apache/usergrid/batch/service/JobSchedulerService.java
index 5d57ab7..dfd852d 100644
--- a/stack/core/src/main/java/org/apache/usergrid/batch/service/JobSchedulerService.java
+++ b/stack/core/src/main/java/org/apache/usergrid/batch/service/JobSchedulerService.java
@@ -25,6 +25,8 @@ import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
+import com.google.inject.Injector;
+import org.apache.usergrid.corepersistence.CpSetup;
import org.apache.usergrid.persistence.core.metrics.MetricsFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -75,6 +77,8 @@ public class JobSchedulerService extends AbstractScheduledService {
private Counter successCounter;
private Counter failCounter;
+ private Injector injector;
+
//TODO Add meters for throughput of start and stop
@@ -86,6 +90,13 @@ public class JobSchedulerService extends AbstractScheduledService {
@Override
protected void runOneIteration() throws Exception {
+ MetricsFactory metricsFactory = injector.getInstance( MetricsFactory.class );
+
+ jobTimer = metricsFactory.getTimer( JobSchedulerService.class, "job_execution_timer" );
+ runCounter = metricsFactory.getCounter( JobSchedulerService.class, "running_workers" );
+ successCounter = metricsFactory.getCounter( JobSchedulerService.class, "successful_jobs" );
+ failCounter = metricsFactory.getCounter( JobSchedulerService.class, "failed_jobs" );
+
try {
LOG.info( "Running one check iteration ..." );
List<JobDescriptor> activeJobs;
@@ -338,12 +349,13 @@ public class JobSchedulerService extends AbstractScheduledService {
/**
* Set the metrics factory
*/
- public void setMetricsFactory( MetricsFactory metricsFactory ) {
- jobTimer = metricsFactory.getTimer( JobSchedulerService.class, "job_execution_timer" );
- runCounter = metricsFactory.getCounter( JobSchedulerService.class, "running_workers" );
- successCounter = metricsFactory.getCounter( JobSchedulerService.class, "successful_jobs" );
- failCounter = metricsFactory.getCounter( JobSchedulerService.class, "failed_jobs" );
- }
+// public void setMetricsFactory( MetricsFactory metricsFactory ) {
+//
+// jobTimer = metricsFactory.getTimer( JobSchedulerService.class, "job_execution_timer" );
+// runCounter = metricsFactory.getCounter( JobSchedulerService.class, "running_workers" );
+// successCounter = metricsFactory.getCounter( JobSchedulerService.class, "successful_jobs" );
+// failCounter = metricsFactory.getCounter( JobSchedulerService.class, "failed_jobs" );
+// }
/*
@@ -404,6 +416,10 @@ public class JobSchedulerService extends AbstractScheduledService {
return jobListener;
}
+ public void setInjector(Injector injector) {
+ this.injector = injector;
+ }
+
/**
* Simple factory for labeling job worker threads for easier debugging
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c298a457/stack/core/src/main/resources/usergrid-core-context.xml
----------------------------------------------------------------------
diff --git a/stack/core/src/main/resources/usergrid-core-context.xml b/stack/core/src/main/resources/usergrid-core-context.xml
index c8ce0d8..bb5d114 100644
--- a/stack/core/src/main/resources/usergrid-core-context.xml
+++ b/stack/core/src/main/resources/usergrid-core-context.xml
@@ -188,6 +188,7 @@
<property name="workerSize" value="${usergrid.scheduler.job.workers}" />
<property name="interval" value="${usergrid.scheduler.job.interval}" />
<property name="maxFailCount" value="${usergrid.scheduler.job.maxfail}" />
+ <property name="injector" ref="injector" />
</bean>
<bean id="schedulerService" class="org.apache.usergrid.batch.service.SchedulerServiceImpl">
@@ -196,7 +197,7 @@
</bean>
<bean id="jobFactory" class="org.apache.usergrid.batch.UsergridJobFactory" />
-
+
<context:component-scan base-package="org.apache.usergrid.batch.job" />
<context:annotation-config />