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:22:29 UTC
git commit: Revert "ODE-943: fixing a scheduler bug. Thanks Waruna
for the patch."
Updated Branches:
refs/heads/ode-1.3.6.x f726c2e8d -> ffccd41af
Revert "ODE-943: fixing a scheduler bug. Thanks Waruna for the patch."
This reverts commit 8cb723667d4221cef2bcbe818d03c635294132a1.
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/ffccd41a
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/ffccd41a
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/ffccd41a
Branch: refs/heads/ode-1.3.6.x
Commit: ffccd41af8fce424e4e914536a86ebcaeb4a2836
Parents: f726c2e
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Wed Sep 18 21:18:23 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Wed Sep 18 21:18:23 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/ffccd41a/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 7b7c7c2..7438f9f 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);
}
__log.debug("scheduled immediate job: " + job.jobId);
} else if (nearfuture) {
@@ -621,43 +621,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) {