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

CLOUDSTACK-8603: Random list VM failures at scale (more than 1000 VMs) when VM has resource tags There is no 'removed' field on the resource_tags table. So 'id' based search may return a record or null in case record is deleted. Added a check for null or empty in search resource tags based on 'id'. 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

This closes #551

(cherry picked from commit 5d9f851deb)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Koushik Das 2015-07-01 23:17:46 +05:30 committed by Rohit Yadav
parent 2777caddbb
commit 7eac6310bc
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java
View File

@ -149,20 +149,24 @@ public class ResourceTagJoinDaoImpl extends GenericDaoBase<ResourceTagJoinVO, Lo
public ResourceTagJoinVO searchById(Long id) {
SearchCriteria<ResourceTagJoinVO> sc = tagIdSearch.create();
sc.setParameters("id", id);
List<ResourceTagJoinVO> vms = searchIncludingRemoved(sc, null, null, false);
assert vms != null && vms.size() == 1 : "No tag found for tag id " + id;
return vms.get(0);
List<ResourceTagJoinVO> tags = searchIncludingRemoved(sc, null, null, false);
if (tags != null && tags.size() > 0) {
return tags.get(0);
} else {
return null;
}
}
@Override
public ResourceTagJoinVO newResourceTagView(ResourceTag vr) {
SearchCriteria<ResourceTagJoinVO> sc = tagIdSearch.create();
sc.setParameters("id", vr.getId());
List<ResourceTagJoinVO> vms = searchIncludingRemoved(sc, null, null, false);
assert vms != null && vms.size() == 1 : "No tag found for tag id " + vr.getId();
return vms.get(0);
List<ResourceTagJoinVO> tags = searchIncludingRemoved(sc, null, null, false);
if (tags != null && tags.size() > 0) {
return tags.get(0);
} else {
return null;
}
}
}