apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7859: Host tags are not getting removed in cloud.host_tags table when a Host is deleted from CS.

Browse Source
This commit is contained in:
Sanjay Tripathi 2014-11-07 16:55:50 +05:30
parent 7c5bc4ae7e
commit 330bd2748e
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/schema/src/com/cloud/host/dao/HostTagsDao.java
View File

@ -29,4 +29,6 @@ public interface HostTagsDao extends GenericDao<HostTagVO, Long> {
List<String> getDistinctImplicitHostTags(List<Long> hostIds, String[] implicitHostTags); List<String> getDistinctImplicitHostTags(List<Long> hostIds, String[] implicitHostTags);
void deleteTags(long hostId);
} }

10
engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java
View File

@ -71,6 +71,16 @@ public class HostTagsDaoImpl extends GenericDaoBase<HostTagVO, Long> implements
return customSearch(sc, null); return customSearch(sc, null);
} }
@Override
public void deleteTags(long hostId) {
TransactionLegacy txn = TransactionLegacy.currentTxn();
txn.start();
SearchCriteria<HostTagVO> sc = HostSearch.create();
sc.setParameters("hostId", hostId);
expunge(sc);
txn.commit();
}
@Override @Override
public void persist(long hostId, List<String> hostTags) { public void persist(long hostId, List<String> hostTags) {
TransactionLegacy txn = TransactionLegacy.currentTxn(); TransactionLegacy txn = TransactionLegacy.currentTxn();

3
server/src/com/cloud/resource/ResourceManagerImpl.java
View File

@ -850,6 +850,9 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
// if host is GPU enabled, delete GPU entries // if host is GPU enabled, delete GPU entries
_hostGpuGroupsDao.deleteGpuEntries(hostId); _hostGpuGroupsDao.deleteGpuEntries(hostId);
// delete host tags
_hostTagsDao.deleteTags(hostId);
host.setGuid(null); host.setGuid(null);
Long clusterId = host.getClusterId(); Long clusterId = host.getClusterId();
host.setClusterId(null); host.setClusterId(null);