apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 10920: avoid deadlocks by avoiding locks on the index on step

Browse Source
This commit is contained in:
Chiradeep Vittal 2011-08-01 15:30:22 -07:00
parent f48efae77c
commit b4b87b1de8
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1140,6 +1140,8 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG
Set<Long> affectedVms = new HashSet<Long>();
for (SecurityGroupWorkVO work : unfinished) {
affectedVms.add(work.getInstanceId());
work.setStep(Step.Error);
_workDao.update(work.getId(), work);
}
scheduleRulesetUpdateToHosts(affectedVms, false, null);
} else {

3
server/src/com/cloud/network/security/dao/SecurityGroupWorkDao.java
View File

@ -41,6 +41,9 @@ public interface SecurityGroupWorkDao extends GenericDao<SecurityGroupWorkVO, Lo
List<SecurityGroupWorkVO> findUnfinishedWork(Date timeBefore);
List<SecurityGroupWorkVO> findAndCleanupUnfinishedWork(Date timeBefore);
List<SecurityGroupWorkVO> findScheduledWork();

19
server/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java
View File

@ -210,13 +210,24 @@ public class SecurityGroupWorkDaoImpl extends GenericDaoBase<SecurityGroupWorkVO
List<SecurityGroupWorkVO> result = listIncludingRemovedBy(sc);
SecurityGroupWorkVO work = createForUpdate();
work.setStep(Step.Error);
update(work, sc);
return result;
}
@Override
public List<SecurityGroupWorkVO> findAndCleanupUnfinishedWork(Date timeBefore) {
final SearchCriteria<SecurityGroupWorkVO> sc = CleanupSearch.create();
sc.setParameters("taken", timeBefore);
sc.setParameters("step", Step.Processing);
List<SecurityGroupWorkVO> result = listIncludingRemovedBy(sc);
SecurityGroupWorkVO work = createForUpdate();
work.setStep(Step.Error);
update(work, sc);
return result;
}
@Override
public List<SecurityGroupWorkVO> findScheduledWork() {
final SearchCriteria<SecurityGroupWorkVO> sc = UntakenWorkSearch.create();