CLOUDSTACK-8425: Job framework: Same internal job can execute simultaneously

koushik-das · koushik-das · commit 6dfb8ab03ed0 · 2015-04-29T11:15:59.000+05:30
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.
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
@@ -116,9 +116,9 @@ public List<SyncQueueItemVO> getNextQueueItems(int maxItems) {
                 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;
     }
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
@@ -554,7 +554,6 @@ protected void runInContext() {
                         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 {
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
@@ -160,7 +160,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
                                 itemVO.setLastProcessTime(dt);
                                 _syncQueueItemDao.update(item.getId(), itemVO);
 
-                                resultList.add(item);
+                                resultList.add(itemVO);
                             }
                         }
                     }

Original file line number	Diff line number	Diff line change
`@@ -116,9 +116,9 @@ public List<SyncQueueItemVO> getNextQueueItems(int maxItems) {`
`116`	`116`	`l.add(item);`
`117`	`117`	`}`
`118`	`118`	`} catch (SQLException e) {`
`119`		`- s_logger.error("Unexpected sql excetpion, ", e);`
	`119`	`+ s_logger.error("Unexpected sql exception, ", e);`
`120`	`120`	`} catch (Throwable e) {`
`121`		`- s_logger.error("Unexpected excetpion, ", e);`
	`121`	`+ s_logger.error("Unexpected exception, ", e);`
`122`	`122`	`}`
`123`	`123`	`return l;`
`124`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -554,7 +554,6 @@ protected void runInContext() {`
`554`	`554`	`if (job.getSyncSource() != null) {`
`555`	`555`	`// here check queue item one more time to double make sure that queue item is removed in case of any uncaught exception`
`556`	`556`	`_queueMgr.purgeItem(job.getSyncSource().getId());`
`557`		`- checkQueue(job.getSyncSource().getQueueId());`
`558`	`557`	`}`
`559`	`558`
`560`	`559`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {`
`160`	`160`	`itemVO.setLastProcessTime(dt);`
`161`	`161`	`_syncQueueItemDao.update(item.getId(), itemVO);`
`162`	`162`
`163`		`- resultList.add(item);`
	`163`	`+ resultList.add(itemVO);`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`	`}`