You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2007/01/02 23:38:42 UTC
svn commit: r491951 -
/incubator/ode/trunk/bpel-scheduler-quartz/src/main/java/org/apache/ode/bpel/scheduler/quartz/JobStoreJTA.java
Author: mriou
Date: Tue Jan 2 14:38:41 2007
New Revision: 491951
URL: http://svn.apache.org/viewvc?view=rev&rev=491951
Log:
Quartz job must be locked, otherwise we're getting deadlocks (at least in sql server).
Modified:
incubator/ode/trunk/bpel-scheduler-quartz/src/main/java/org/apache/ode/bpel/scheduler/quartz/JobStoreJTA.java
Modified: incubator/ode/trunk/bpel-scheduler-quartz/src/main/java/org/apache/ode/bpel/scheduler/quartz/JobStoreJTA.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-scheduler-quartz/src/main/java/org/apache/ode/bpel/scheduler/quartz/JobStoreJTA.java?view=diff&rev=491951&r1=491950&r2=491951
==============================================================================
--- incubator/ode/trunk/bpel-scheduler-quartz/src/main/java/org/apache/ode/bpel/scheduler/quartz/JobStoreJTA.java (original)
+++ incubator/ode/trunk/bpel-scheduler-quartz/src/main/java/org/apache/ode/bpel/scheduler/quartz/JobStoreJTA.java Tue Jan 2 14:38:41 2007
@@ -105,7 +105,7 @@
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
transOwner = true;
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
recoverJobs(conn);
commitConnection(conn);
@@ -131,7 +131,7 @@
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
transOwner = true;
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
cleanVolatileTriggerAndJobs(conn);
@@ -175,7 +175,7 @@
if (isLockOnInsert()) {
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
transOwner = true;
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
}
if (newJob.isVolatile() && !newTrigger.isVolatile()) {
@@ -218,7 +218,7 @@
if (isLockOnInsert() || replaceExisting) {
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
transOwner = true;
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
}
storeJob(conn, ctxt, newJob, replaceExisting);
@@ -256,7 +256,7 @@
try {
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
transOwner = true;
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
return removeJob(conn, ctxt, jobName, groupName, true);
} finally {
@@ -732,7 +732,7 @@
try {
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
transOwner = true;
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
pauseTrigger(conn, ctxt, triggerName, groupName);
} finally {
@@ -757,7 +757,7 @@
try {
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
transOwner = true;
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
pauseTriggerGroup(conn, ctxt, groupName);
} finally {
@@ -782,7 +782,7 @@
try {
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
transOwner = true;
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
Trigger[] triggers = getTriggersForJob(conn, ctxt, jobName, groupName);
for (int j = 0; j < triggers.length; j++) {
@@ -810,7 +810,7 @@
try {
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
transOwner = true;
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
String[] jobNames = getJobNames(conn, ctxt, groupName);
@@ -849,7 +849,7 @@
try {
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
transOwner = true;
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
resumeTrigger(conn, ctxt, triggerName, groupName);
} finally {
@@ -879,7 +879,7 @@
try {
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
transOwner = true;
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
resumeTriggerGroup(conn, ctxt, groupName);
} finally {
@@ -910,7 +910,7 @@
try {
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
transOwner = true;
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
Trigger[] triggers = getTriggersForJob(conn, ctxt, jobName, groupName);
for (int j = 0; j < triggers.length; j++) {
@@ -944,7 +944,7 @@
try {
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
transOwner = true;
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
String[] jobNames = getJobNames(conn, ctxt, groupName);
@@ -983,7 +983,7 @@
try {
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
transOwner = true;
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
pauseAll(conn, ctxt);
} finally {
@@ -1012,7 +1012,7 @@
try {
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
transOwner = true;
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
resumeAll(conn, ctxt);
} finally {
@@ -1043,7 +1043,7 @@
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
transOwner = true;
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
Trigger trigger = acquireNextTrigger(conn, ctxt, noLaterThan);
@@ -1079,7 +1079,7 @@
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
transOwner = true;
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
releaseAcquiredTrigger(conn, ctxt, trigger);
commitConnection(conn);
@@ -1114,7 +1114,7 @@
try {
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
transOwner = true;
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
TriggerFiredBundle tfb = null;
JobPersistenceException err = null;
@@ -1161,7 +1161,7 @@
try {
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
transOwner = true;
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
triggeredJobComplete(conn, ctxt, trigger, jobDetail, triggerInstCode);
@@ -1227,7 +1227,7 @@
if (failedRecords.size() > 0) {
getLockHandler().obtainLock(conn, LOCK_TRIGGER_ACCESS);
- // getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
+ getLockHandler().obtainLock(conn, LOCK_JOB_ACCESS);
transOwner = true;
clusterRecover(conn, failedRecords);