etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix transaction rollback in security group listener, which cause state machine update failed

This commit is contained in:
Edison Su 2011-03-04 10:57:41 -05:00
parent 5d3052c05f
commit 8eaa53f282
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
View File

@ -325,12 +325,15 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG
}
for (Long vmId: affectedVms) {
Transaction txn = Transaction.currentTxn();
txn.start();
VmRulesetLogVO log = null;
SecurityGroupWorkVO work = null;
UserVm vm = null;
Transaction txn = null;
try {
txn = Transaction.currentTxn();
txn.start();
vm = _userVMDao.acquireInLockTable(vmId);
if (vm == null) {
s_logger.warn("Failed to acquire lock on vm id " + vmId);
@ -359,8 +362,10 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG
if (vm != null) {
_userVMDao.releaseFromLockTable(vmId);
}
if (txn != null)
txn.commit();
}
txn.commit();
_executorPool.schedule(new WorkerThread(), delayMs, TimeUnit.MILLISECONDS);