You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by md...@apache.org on 2016/04/08 19:02:52 UTC
[1/4] usergrid git commit: Add OnlyOnceJob fix to 9f45130
Repository: usergrid
Updated Branches:
refs/heads/release-2.1.1 4326b105e -> e0a995243
Add OnlyOnceJob fix to 9f45130
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/55271ce9
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/55271ce9
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/55271ce9
Branch: refs/heads/release-2.1.1
Commit: 55271ce9347bd4f35224a2c31494b23fa371ae67
Parents: 9f45130
Author: Mike Dunker <md...@apigee.com>
Authored: Thu Apr 7 15:33:43 2016 -0700
Committer: Mike Dunker <md...@apigee.com>
Committed: Thu Apr 7 15:33:43 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/usergrid/batch/job/OnlyOnceJob.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/55271ce9/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java b/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
index f857d05..afbddc3 100644
--- a/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
+++ b/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
@@ -19,7 +19,7 @@ package org.apache.usergrid.batch.job;
import java.util.concurrent.TimeUnit;
-import org.elasticsearch.common.inject.Inject;
+import com.google.inject.Injector;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.apache.usergrid.batch.Job;
@@ -28,6 +28,8 @@ import org.apache.usergrid.locking.Lock;
import org.apache.usergrid.locking.LockManager;
import org.apache.usergrid.persistence.EntityManagerFactory;
+import javax.annotation.PostConstruct;
+
/**
* Simple abstract job class that performs additional locking to ensure that the job is only executing once. This can be
@@ -38,12 +40,14 @@ import org.apache.usergrid.persistence.EntityManagerFactory;
@Component("OnlyOnceJob")
public abstract class OnlyOnceJob implements Job {
- @Inject
private LockManager lockManager;
@Autowired
private EntityManagerFactory emf;
+ @Autowired
+ private Injector injector;
+
/**
*
@@ -51,6 +55,10 @@ public abstract class OnlyOnceJob implements Job {
public OnlyOnceJob() {
}
+ @PostConstruct
+ public void initLockManager() throws Exception {
+ this.lockManager = injector.getInstance(LockManager.class);
+ }
/*
* (non-Javadoc)
[2/4] usergrid git commit: Added one-time job logging.
Posted by md...@apache.org.
Added one-time job logging.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/021fcba6
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/021fcba6
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/021fcba6
Branch: refs/heads/release-2.1.1
Commit: 021fcba68c013414261f3e123d7ec6db8dc938fe
Parents: 55271ce
Author: Mike Dunker <md...@apigee.com>
Authored: Thu Apr 7 16:52:13 2016 -0700
Committer: Mike Dunker <md...@apigee.com>
Committed: Thu Apr 7 16:52:13 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/usergrid/batch/job/OnlyOnceJob.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/021fcba6/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java b/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
index afbddc3..6d927b9 100644
--- a/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
+++ b/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
@@ -27,6 +27,8 @@ import org.apache.usergrid.batch.JobExecution;
import org.apache.usergrid.locking.Lock;
import org.apache.usergrid.locking.LockManager;
import org.apache.usergrid.persistence.EntityManagerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.annotation.PostConstruct;
@@ -40,6 +42,8 @@ import javax.annotation.PostConstruct;
@Component("OnlyOnceJob")
public abstract class OnlyOnceJob implements Job {
+ private static final Logger logger = LoggerFactory.getLogger(OnlyOnceJob.class);
+
private LockManager lockManager;
@Autowired
@@ -58,6 +62,11 @@ public abstract class OnlyOnceJob implements Job {
@PostConstruct
public void initLockManager() throws Exception {
this.lockManager = injector.getInstance(LockManager.class);
+ if (lockManager != null) {
+ logger.info("LockManager injection successful");
+ } else {
+ logger.error("LockManager injection unsuccessful");
+ }
}
/*
@@ -68,6 +77,7 @@ public abstract class OnlyOnceJob implements Job {
@Override
public void execute( JobExecution execution ) throws Exception {
+ logger.info("Executing one-time job, LockManager is {}" lockManager == null ? "null" : "not null");
String lockId = execution.getJobId().toString();
Lock lock = lockManager.createLock( emf.getManagementAppId(), String.format( "/jobs/%s", lockId ) );
[3/4] usergrid git commit: fix typo
Posted by md...@apache.org.
fix typo
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/b8557287
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/b8557287
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/b8557287
Branch: refs/heads/release-2.1.1
Commit: b855728750023e795e4e737d698d1fd94d6b9282
Parents: 021fcba
Author: Mike Dunker <md...@apigee.com>
Authored: Thu Apr 7 17:03:55 2016 -0700
Committer: Mike Dunker <md...@apigee.com>
Committed: Thu Apr 7 17:03:55 2016 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/b8557287/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java b/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
index 6d927b9..ac56c7b 100644
--- a/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
+++ b/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
@@ -77,7 +77,7 @@ public abstract class OnlyOnceJob implements Job {
@Override
public void execute( JobExecution execution ) throws Exception {
- logger.info("Executing one-time job, LockManager is {}" lockManager == null ? "null" : "not null");
+ logger.info("Executing one-time job, LockManager is {}", lockManager == null ? "null" : "not null");
String lockId = execution.getJobId().toString();
Lock lock = lockManager.createLock( emf.getManagementAppId(), String.format( "/jobs/%s", lockId ) );
[4/4] usergrid git commit: Merge branch '9f45130_lock_mgr_fix' into
release-2.1.1
Posted by md...@apache.org.
Merge branch '9f45130_lock_mgr_fix' into release-2.1.1
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/e0a99524
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/e0a99524
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/e0a99524
Branch: refs/heads/release-2.1.1
Commit: e0a995243a9edd7e7efd81922ffe36be1f14ea5b
Parents: 4326b10 b855728
Author: Mike Dunker <md...@apigee.com>
Authored: Fri Apr 8 08:55:16 2016 -0700
Committer: Mike Dunker <md...@apigee.com>
Committed: Fri Apr 8 08:55:16 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/usergrid/batch/job/OnlyOnceJob.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/e0a99524/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
index 82e856d,ac56c7b..9b1fb05
--- a/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
+++ b/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java
@@@ -58,9 -62,13 +62,13 @@@ public abstract class OnlyOnceJob imple
@PostConstruct
public void initLockManager() throws Exception {
this.lockManager = injector.getInstance(LockManager.class);
- if (lockManager != null) {
++ if (this.lockManager != null) {
+ logger.info("LockManager injection successful");
+ } else {
+ logger.error("LockManager injection unsuccessful");
+ }
}
-
/*
* (non-Javadoc)
*