You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2013/09/18 21:23:31 UTC
git commit: Revert "ODE-942: fixing a scheduler bug. Thanks Waruna
for the patch."
Updated Branches:
refs/heads/master d548cc041 -> 5a80925cb
Revert "ODE-942: fixing a scheduler bug. Thanks Waruna for the patch."
This reverts commit ed5f024d4ba697b559476bd31589a2b604e3cce7.
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/5a80925c
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/5a80925c
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/5a80925c
Branch: refs/heads/master
Commit: 5a80925cbdbb7c666a5efb0449072e7305bc25d2
Parents: d548cc0
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Wed Sep 18 21:23:00 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Wed Sep 18 21:23:00 2013 +0200
----------------------------------------------------------------------
.../ode/scheduler/simple/SimpleScheduler.java | 45 ++------------------
1 file changed, 4 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/5a80925c/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java
----------------------------------------------------------------------
diff --git a/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java b/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java
index e10a84d..a56b86e 100644
--- a/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java
+++ b/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java
@@ -379,12 +379,12 @@ public class SimpleScheduler implements Scheduler, TaskRunner {
boolean nearfuture = !immediate && when.getTime() <= ctime + _nearFutureInterval;
try {
if (immediate) {
- // Immediate scheduling means we put it in the DB for safe keeping.
+ // Immediate scheduling means we put it in the DB for safe keeping
+ _db.insertJob(job, _nodeId, true);
+
// And add it to our todo list .
if (_outstandingJobs.size() < _todoLimit) {
- saveAndAddTodoOnCommit(job, _nodeId, true);
- } else {
- saveTodoOnCommit(job, _nodeId, true);
+ addTodoOnCommit(job);
}
if (__log.isDebugEnabled()) {
__log.debug("scheduled immediate job: " + job.jobId);
@@ -644,43 +644,6 @@ public class SimpleScheduler implements Scheduler, TaskRunner {
_exec.submit(new RunJob(job, _polledRunnableProcessor));
}
- private void saveAndAddTodoOnCommit(final Job job, final String nodeId, final boolean loaded) {
- registerSynchronizer(new Synchronizer() {
- public void afterCompletion(boolean success) {
- if (success) {
- try {
- _db.insertJob(job, nodeId, loaded);
- } catch (DatabaseException dbe) {
- __log.error("Could not save job on commit. Will add it to in-mem queue anyway.", dbe);
- throw new ContextException(dbe.getMessage(), dbe);
- }
- enqueue(job);
- }
- }
-
- public void beforeCompletion() {
- }
- });
- }
-
- private void saveTodoOnCommit(final Job job, final String nodeId, final boolean loaded) {
- registerSynchronizer(new Synchronizer() {
- public void afterCompletion(boolean success) {
- if (success) {
- try {
- _db.insertJob(job, nodeId, loaded);
- } catch (DatabaseException dbe) {
- __log.error("Could not save job on commit.", dbe);
- throw new ContextException(dbe.getMessage(), dbe);
- }
- }
- }
-
- public void beforeCompletion() {
- }
- });
- }
-
private void addTodoOnCommit(final Job job) {
registerSynchronizer(new Synchronizer() {
public void afterCompletion(boolean success) {