You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ko...@apache.org on 2015/04/29 07:46:35 UTC
git commit: updated refs/heads/master to 6dfb8ab
Repository: cloudstack
Updated Branches:
refs/heads/master 0b8355920 -> 6dfb8ab03
CLOUDSTACK-8425: Job framework: Same internal job can execute simultaneously
The same internal job was simultaneously getting executed by 2 worked threads.
The fix is to ensure that job gets scheduled for execution from a single place.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6dfb8ab0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6dfb8ab0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6dfb8ab0
Branch: refs/heads/master
Commit: 6dfb8ab03ed05747941a89b4079ff23d25f4d8fd
Parents: 0b83559
Author: Koushik Das <ko...@apache.org>
Authored: Wed Apr 29 11:10:48 2015 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Wed Apr 29 11:15:59 2015 +0530
----------------------------------------------------------------------
.../cloudstack/framework/jobs/dao/SyncQueueItemDaoImpl.java | 4 ++--
.../cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java | 1 -
.../cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6dfb8ab0/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/SyncQueueItemDaoImpl.java
----------------------------------------------------------------------
diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/SyncQueueItemDaoImpl.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/SyncQueueItemDaoImpl.java
index 167d9f5..29c3f1b 100644
--- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/SyncQueueItemDaoImpl.java
+++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/SyncQueueItemDaoImpl.java
@@ -116,9 +116,9 @@ public class SyncQueueItemDaoImpl extends GenericDaoBase<SyncQueueItemVO, Long>
l.add(item);
}
} catch (SQLException e) {
- s_logger.error("Unexpected sql excetpion, ", e);
+ s_logger.error("Unexpected sql exception, ", e);
} catch (Throwable e) {
- s_logger.error("Unexpected excetpion, ", e);
+ s_logger.error("Unexpected exception, ", e);
}
return l;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6dfb8ab0/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
----------------------------------------------------------------------
diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
index 6d20445..10a10b2 100644
--- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
+++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
@@ -554,7 +554,6 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
if (job.getSyncSource() != null) {
// here check queue item one more time to double make sure that queue item is removed in case of any uncaught exception
_queueMgr.purgeItem(job.getSyncSource().getId());
- checkQueue(job.getSyncSource().getQueueId());
}
try {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6dfb8ab0/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java
index 6535163..c17c581 100644
--- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java
+++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java
@@ -160,7 +160,7 @@ public class SyncQueueManagerImpl extends ManagerBase implements SyncQueueManage
itemVO.setLastProcessTime(dt);
_syncQueueItemDao.update(item.getId(), itemVO);
- resultList.add(item);
+ resultList.add(itemVO);
}
}
}