diff --git a/core/src/com/cloud/ha/dao/HighAvailabilityDaoImpl.java b/core/src/com/cloud/ha/dao/HighAvailabilityDaoImpl.java index 9d5e5c85773..db9000a82a1 100644 --- a/core/src/com/cloud/ha/dao/HighAvailabilityDaoImpl.java +++ b/core/src/com/cloud/ha/dao/HighAvailabilityDaoImpl.java @@ -128,7 +128,7 @@ public class HighAvailabilityDaoImpl extends GenericDaoBase implem final SearchCriteria sc = CleanupSearch.create(); sc.setParameters("time", time); sc.setParameters("step", HighAvailabilityManager.Step.Done, HighAvailabilityManager.Step.Cancelled); - delete(sc); + expunge(sc); } @Override @@ -161,7 +161,7 @@ public class HighAvailabilityDaoImpl extends GenericDaoBase implem SearchCriteria sc = PreviousWorkSearch.create(); sc.setParameters("instance", instanceId); sc.setParameters("type", type); - return delete(sc) > 0; + return expunge(sc) > 0; } @Override diff --git a/core/src/com/cloud/host/dao/DetailsDaoImpl.java b/core/src/com/cloud/host/dao/DetailsDaoImpl.java index 6bd554b683d..25392c2d320 100644 --- a/core/src/com/cloud/host/dao/DetailsDaoImpl.java +++ b/core/src/com/cloud/host/dao/DetailsDaoImpl.java @@ -73,7 +73,7 @@ public class DetailsDaoImpl extends GenericDaoBase implements De txn.start(); SearchCriteria sc = HostSearch.create(); sc.setParameters("hostId", hostId); - delete(sc); + expunge(sc); for (Map.Entry detail : details.entrySet()) { DetailVO vo = new DetailVO(hostId, detail.getKey(), detail.getValue()); diff --git a/core/src/com/cloud/host/dao/HostDaoImpl.java b/core/src/com/cloud/host/dao/HostDaoImpl.java index a58178f9c36..f858cdd0ef4 100644 --- a/core/src/com/cloud/host/dao/HostDaoImpl.java +++ b/core/src/com/cloud/host/dao/HostDaoImpl.java @@ -206,7 +206,7 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao sc.setParameters("status", (Object[])statuses); sc.setParameters("pod", podId); - List rs = searchAll(sc, null); + List rs = searchIncludingRemoved(sc, null); if (rs.size() == 0) { return 0; } diff --git a/core/src/com/cloud/maid/dao/StackMaidDaoImpl.java b/core/src/com/cloud/maid/dao/StackMaidDaoImpl.java index e57afb51724..9841b3ce85d 100644 --- a/core/src/com/cloud/maid/dao/StackMaidDaoImpl.java +++ b/core/src/com/cloud/maid/dao/StackMaidDaoImpl.java @@ -60,7 +60,7 @@ public class StackMaidDaoImpl extends GenericDaoBase implemen Filter filter = new Filter(StackMaidVO.class, "seq", false, 0L, (long)1); List l = listBy(sc, filter); if(l != null && l.size() > 0) { - delete(l.get(0).getId()); + expunge(l.get(0).getId()); return l.get(0); } @@ -72,7 +72,7 @@ public class StackMaidDaoImpl extends GenericDaoBase implemen SearchCriteria sc = clearSearch.create(); sc.setParameters("msid", msid); - delete(sc); + expunge(sc); } @DB diff --git a/core/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java b/core/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java index f82dbbb7c17..890f5cca4f0 100644 --- a/core/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java +++ b/core/src/com/cloud/network/dao/LoadBalancerVMMapDaoImpl.java @@ -34,7 +34,7 @@ public class LoadBalancerVMMapDaoImpl extends GenericDaoBase sc = createSearchCriteria(); sc.addAnd("loadBalancerId", SearchCriteria.Op.EQ, loadBalancerId); - delete(sc); + expunge(sc); } @Override @@ -46,7 +46,7 @@ public class LoadBalancerVMMapDaoImpl extends GenericDaoBase sc = SecurityGroupIdSearch.create(); sc.setParameters("securityGroupId", securityGroupId); - delete(sc); + expunge(sc); } } diff --git a/core/src/com/cloud/network/security/dao/IngressRuleDaoImpl.java b/core/src/com/cloud/network/security/dao/IngressRuleDaoImpl.java index 825630c1e43..d2fcf4b147c 100644 --- a/core/src/com/cloud/network/security/dao/IngressRuleDaoImpl.java +++ b/core/src/com/cloud/network/security/dao/IngressRuleDaoImpl.java @@ -79,7 +79,7 @@ public class IngressRuleDaoImpl extends GenericDaoBase impl public int deleteByNetworkGroup(long networkGroupId) { SearchCriteria sc = networkGroupIdSearch.create(); sc.setParameters("networkGroupId", networkGroupId); - return delete(sc); + return expunge(sc); } @Override @@ -135,7 +135,7 @@ public class IngressRuleDaoImpl extends GenericDaoBase impl sc.setParameters("endPort", endPort); sc.setParameters("allowedNetworkId", allowedGroupId); - return delete(sc); + return expunge(sc); } @@ -148,7 +148,7 @@ public class IngressRuleDaoImpl extends GenericDaoBase impl sc.setParameters("endPort", endPort); sc.setParameters("cidr", cidr); - return delete(sc); + return expunge(sc); } @Override diff --git a/core/src/com/cloud/network/security/dao/NetworkGroupRulesDaoImpl.java b/core/src/com/cloud/network/security/dao/NetworkGroupRulesDaoImpl.java index 391771571a3..464cb5e31b6 100644 --- a/core/src/com/cloud/network/security/dao/NetworkGroupRulesDaoImpl.java +++ b/core/src/com/cloud/network/security/dao/NetworkGroupRulesDaoImpl.java @@ -36,7 +36,7 @@ public class NetworkGroupRulesDaoImpl extends GenericDaoBase listNetworkGroupRules() { Filter searchFilter = new Filter(NetworkGroupRulesVO.class, "id", true, null, null); - return listAllActive(searchFilter); + return listAll(searchFilter); } @Override diff --git a/core/src/com/cloud/network/security/dao/NetworkGroupVMMapDaoImpl.java b/core/src/com/cloud/network/security/dao/NetworkGroupVMMapDaoImpl.java index fd985e134c8..6a4f4ddf2b4 100644 --- a/core/src/com/cloud/network/security/dao/NetworkGroupVMMapDaoImpl.java +++ b/core/src/com/cloud/network/security/dao/NetworkGroupVMMapDaoImpl.java @@ -107,7 +107,7 @@ public class NetworkGroupVMMapDaoImpl extends GenericDaoBase sc = ListByVmId.create(); sc.setParameters("instanceId", instanceId); - return super.delete(sc); + return super.expunge(sc); } @Override @@ -122,7 +122,7 @@ public class NetworkGroupVMMapDaoImpl extends GenericDaoBase listVmIdsByNetworkGroup(long networkGroupId) { SearchCriteria sc = ListVmIdByNetworkGroup.create(); sc.setParameters("networkGroupId", networkGroupId); - return searchAll(sc, null); + return searchIncludingRemoved(sc, null); } @Override diff --git a/core/src/com/cloud/network/security/dao/NetworkGroupWorkDaoImpl.java b/core/src/com/cloud/network/security/dao/NetworkGroupWorkDaoImpl.java index 34f219d132a..1e9f0b0b96e 100644 --- a/core/src/com/cloud/network/security/dao/NetworkGroupWorkDaoImpl.java +++ b/core/src/com/cloud/network/security/dao/NetworkGroupWorkDaoImpl.java @@ -187,7 +187,7 @@ public class NetworkGroupWorkDaoImpl extends GenericDaoBase sc = UniqueNameSearch.create(); sc.setParameters("name", name); - List vos = searchAll(sc, null, null, false); + List vos = searchIncludingRemoved(sc, null, null, false); if (vos.size() == 0) { return null; } diff --git a/core/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java b/core/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java index 76811aa0eec..120d95cc743 100644 --- a/core/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java +++ b/core/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java @@ -69,15 +69,15 @@ public class DiskOfferingDaoImpl extends GenericDaoBase im } @Override - public List searchAll(SearchCriteria sc, final Filter filter, final Boolean lock, final boolean cache) { + public List searchIncludingRemoved(SearchCriteria sc, final Filter filter, final Boolean lock, final boolean cache) { sc.addAnd(_typeAttr, Op.EQ, Type.Disk); - return super.searchAll(sc, filter, lock, cache); + return super.searchIncludingRemoved(sc, filter, lock, cache); } @Override - public List searchAll(SearchCriteria sc, final Filter filter) { + public List searchIncludingRemoved(SearchCriteria sc, final Filter filter) { sc.addAnd(_typeAttr, Op.EQ, Type.Disk); - return super.searchAll(sc, filter); + return super.searchIncludingRemoved(sc, filter); } @Override diff --git a/core/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java b/core/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java index f3b076619bb..fca0636b289 100644 --- a/core/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java +++ b/core/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java @@ -92,7 +92,7 @@ public class LaunchPermissionDaoImpl extends GenericDaoBase sc = TemplateIdSearch.create(); sc.setParameters("templateId", templateId); - delete(sc); + expunge(sc); } @Override diff --git a/core/src/com/cloud/storage/dao/SnapshotDaoImpl.java b/core/src/com/cloud/storage/dao/SnapshotDaoImpl.java index 4ca3e303b7d..da7157c90d9 100644 --- a/core/src/com/cloud/storage/dao/SnapshotDaoImpl.java +++ b/core/src/com/cloud/storage/dao/SnapshotDaoImpl.java @@ -76,7 +76,7 @@ public class SnapshotDaoImpl extends GenericDaoBase implements SearchCriteria sc = lastSnapSearch.create(); sc.setParameters("volumeId", volumeId); sc.setParameters("snapId", snapId); - List prevSnapshots = searchAll(sc, null); + List prevSnapshots = searchIncludingRemoved(sc, null); if(prevSnapshots != null && prevSnapshots.size() > 0 && prevSnapshots.get(0) != null) { return prevSnapshots.get(0); } diff --git a/core/src/com/cloud/storage/dao/SnapshotPolicyRefDaoImpl.java b/core/src/com/cloud/storage/dao/SnapshotPolicyRefDaoImpl.java index f1d50aafde5..bdcba8df61a 100644 --- a/core/src/com/cloud/storage/dao/SnapshotPolicyRefDaoImpl.java +++ b/core/src/com/cloud/storage/dao/SnapshotPolicyRefDaoImpl.java @@ -63,7 +63,7 @@ public class SnapshotPolicyRefDaoImpl extends GenericDaoBase sc = snapPolicy.create(); sc.setParameters("snapshotId", snapshotId); sc.setParameters("policyId", policyId); - return delete(sc); + return expunge(sc); } @Override diff --git a/core/src/com/cloud/storage/dao/StoragePoolDaoImpl.java b/core/src/com/cloud/storage/dao/StoragePoolDaoImpl.java index 456019f6874..12a1c8cc799 100644 --- a/core/src/com/cloud/storage/dao/StoragePoolDaoImpl.java +++ b/core/src/com/cloud/storage/dao/StoragePoolDaoImpl.java @@ -375,7 +375,7 @@ public class StoragePoolDaoImpl extends GenericDaoBase imp sc.setParameters("status", (Object[])statuses); sc.setParameters("pool", primaryStorageId); - List rs = searchAll(sc, null); + List rs = searchIncludingRemoved(sc, null); if (rs.size() == 0) { return 0; } diff --git a/core/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java b/core/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java index a063a212e0e..520ecbab3a2 100644 --- a/core/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java +++ b/core/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java @@ -48,7 +48,7 @@ public class StoragePoolDetailsDaoImpl extends GenericDaoBase entry : details.entrySet()) { StoragePoolDetailVO detail = new StoragePoolDetailVO(poolId, entry.getKey(), entry.getValue()); persist(detail); diff --git a/core/src/com/cloud/storage/dao/VolumeDaoImpl.java b/core/src/com/cloud/storage/dao/VolumeDaoImpl.java index faf319367f8..5af77d46cea 100755 --- a/core/src/com/cloud/storage/dao/VolumeDaoImpl.java +++ b/core/src/com/cloud/storage/dao/VolumeDaoImpl.java @@ -71,7 +71,7 @@ public class VolumeDaoImpl extends GenericDaoBase implements Vol SearchCriteria sc = RemovedButNotDestroyedSearch.create(); sc.setParameters("destroyed", false); - return searchAll(sc, null, null, false); + return searchIncludingRemoved(sc, null, null, false); } @Override @DB @@ -224,7 +224,7 @@ public class VolumeDaoImpl extends GenericDaoBase implements Vol sc.setParameters("template", templateId); sc.setParameters("pool", poolId); - List results = searchAll(sc, null); + List results = searchIncludingRemoved(sc, null); assert results.size() > 0 : "How can this return a size of " + results.size(); return results.get(0) > 0; @@ -234,7 +234,7 @@ public class VolumeDaoImpl extends GenericDaoBase implements Vol public void deleteVolumesByInstance(long instanceId) { SearchCriteria sc = InstanceIdSearch.create(); sc.setParameters("instanceId", instanceId); - delete(sc); + expunge(sc); } @Override @@ -359,7 +359,7 @@ public class VolumeDaoImpl extends GenericDaoBase implements Vol public Pair getCountAndTotalByPool(long poolId) { SearchCriteria sc = TotalSizeByPoolSearch.create(); sc.setParameters("poolId", poolId); - List results = searchAll(sc, null); + List results = searchIncludingRemoved(sc, null); SumCount sumCount = results.get(0); return new Pair(sumCount.count, sumCount.sum); } diff --git a/core/src/com/cloud/user/dao/AccountDaoImpl.java b/core/src/com/cloud/user/dao/AccountDaoImpl.java index 603ea80fe59..b21096104b5 100644 --- a/core/src/com/cloud/user/dao/AccountDaoImpl.java +++ b/core/src/com/cloud/user/dao/AccountDaoImpl.java @@ -74,7 +74,7 @@ public class AccountDaoImpl extends GenericDaoBase implements A SearchCriteria sc = CleanupSearch.create(); sc.setParameters("cleanup", true); - return searchAll(sc, null, null, false); + return searchIncludingRemoved(sc, null, null, false); } public Pair findUserAccountByApiKey(String apiKey) { diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java index 1668906a671..915f95ba7ab 100755 --- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -1634,7 +1634,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory { String cluster = startup.getCluster(); if (pod != null && dataCenter != null && pod.equalsIgnoreCase("default") && dataCenter.equalsIgnoreCase("default")) { - List pods = _podDao.listAll(); + List pods = _podDao.listAllIncludingRemoved(); for (HostPodVO hpv : pods) { if (checkCIDR(type, hpv, startup.getPrivateIpAddress(), startup.getPrivateNetmask())) { pod = hpv.getName(); diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java b/server/src/com/cloud/alert/AlertManagerImpl.java index e7b4222777d..2a96a0360bf 100644 --- a/server/src/com/cloud/alert/AlertManagerImpl.java +++ b/server/src/com/cloud/alert/AlertManagerImpl.java @@ -338,7 +338,7 @@ public class AlertManagerImpl implements AlertManager { List hosts = _hostDao.search(sc, null); // prep the service offerings - List offerings = _offeringsDao.listAll(); + List offerings = _offeringsDao.listAllIncludingRemoved(); Map offeringsMap = new HashMap(); for (ServiceOfferingVO offering : offerings) { offeringsMap.put(offering.getId(), offering); @@ -394,7 +394,7 @@ public class AlertManagerImpl implements AlertManager { } // Calculate storage pool capacity - List storagePools = _storagePoolDao.listAllActive(); + List storagePools = _storagePoolDao.listAll(); for (StoragePoolVO pool : storagePools) { long disk = 0l; Pair sizes = _volumeDao.getCountAndTotalByPool(pool.getId()); @@ -410,7 +410,7 @@ public class AlertManagerImpl implements AlertManager { } // Calculate new Public IP capacity - List datacenters = _dcDao.listAll(); + List datacenters = _dcDao.listAllIncludingRemoved(); for (DataCenterVO datacenter : datacenters) { long dcId = datacenter.getId(); @@ -422,7 +422,7 @@ public class AlertManagerImpl implements AlertManager { } // Calculate new Private IP capacity - List pods = _podDao.listAll(); + List pods = _podDao.listAllIncludingRemoved(); for (HostPodVO pod : pods) { long podId = pod.getId(); long dcId = pod.getDataCenterId(); @@ -465,7 +465,7 @@ public class AlertManagerImpl implements AlertManager { } try { - List capacityList = _capacityDao.listAll(); + List capacityList = _capacityDao.listAllIncludingRemoved(); Map> capacityDcTypeMap = new HashMap>(); for (CapacityVO capacity : capacityList) { diff --git a/server/src/com/cloud/async/AsyncJobManagerImpl.java b/server/src/com/cloud/async/AsyncJobManagerImpl.java index a0abb2628e3..7882f0cced0 100644 --- a/server/src/com/cloud/async/AsyncJobManagerImpl.java +++ b/server/src/com/cloud/async/AsyncJobManagerImpl.java @@ -476,7 +476,7 @@ public class AsyncJobManagerImpl implements AsyncJobManager { List l = _jobDao.getExpiredJobs(cutTime, 100); if(l != null && l.size() > 0) { for(AsyncJobVO job : l) { - _jobDao.delete(job.getId()); + _jobDao.expunge(job.getId()); } } diff --git a/server/src/com/cloud/async/SyncQueueManagerImpl.java b/server/src/com/cloud/async/SyncQueueManagerImpl.java index 9a87cb39f68..8479507339a 100644 --- a/server/src/com/cloud/async/SyncQueueManagerImpl.java +++ b/server/src/com/cloud/async/SyncQueueManagerImpl.java @@ -186,7 +186,7 @@ public class SyncQueueManagerImpl implements SyncQueueManager { if(itemVO != null) { SyncQueueVO queueVO = _syncQueueDao.lock(itemVO.getQueueId(), true); - _syncQueueItemDao.delete(itemVO.getId()); + _syncQueueItemDao.expunge(itemVO.getId()); queueVO.setLastProcessTime(null); queueVO.setLastUpdated(DateUtil.currentGMTTime()); diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 4c7554f5544..16cb9712fed 100644 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -358,7 +358,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager { HostPodVO pod = _podDao.findById(podId); DataCenterVO zone = _zoneDao.findById(pod.getDataCenterId()); - _podDao.delete(podId); + _podDao.expunge(podId); // Delete private IP addresses in the pod _privateIpAddressDao.deleteIpAddressByPod(podId); @@ -660,7 +660,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager { DataCenterVO zone = _zoneDao.findById(zoneId); - _zoneDao.delete(zoneId); + _zoneDao.expunge(zoneId); // Delete vNet _zoneDao.deleteVnet(zoneId); @@ -1076,7 +1076,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager { } // Make sure there aren't any account VLANs in this zone - List accountVlanMaps = _accountVlanMapDao.listAll(); + List accountVlanMaps = _accountVlanMapDao.listAllIncludingRemoved(); for (AccountVlanMapVO accountVlanMap : accountVlanMaps) { VlanVO vlan = _vlanDao.findById(accountVlanMap.getVlanDbId()); if (vlan.getDataCenterId() == zone.getId()) { @@ -1171,12 +1171,12 @@ public class ConfigurationManagerImpl implements ConfigurationManager { if (accountId != null && vlanType.equals(VlanType.VirtualNetwork)){ if(!savePublicIPRangeForAccount(startIP, endIP, zoneId, vlan.getId(), accountId, _accountDao.findById(accountId).getDomainId())){ deletePublicIPRange(vlan.getId()); - _vlanDao.delete(vlan.getId()); + _vlanDao.expunge(vlan.getId()); throw new InternalErrorException("Failed to save IP range. Please contact Cloud Support."); //It can be Direct IP or Public IP. } }else if (!savePublicIPRange(startIP, endIP, zoneId, vlan.getId())) { deletePublicIPRange(vlan.getId()); - _vlanDao.delete(vlan.getId()); + _vlanDao.expunge(vlan.getId()); throw new InternalErrorException("Failed to save IP range. Please contact Cloud Support."); //It can be Direct IP or Public IP. } @@ -1240,7 +1240,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager { } // Delete the VLAN - boolean success = _vlanDao.delete(vlanDbId); + boolean success = _vlanDao.expunge(vlanDbId); if (success) { String[] ipRange = vlan.getIpRange().split("\\-"); diff --git a/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java b/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java index 8b0858d6e1b..5646bb16f18 100644 --- a/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java +++ b/server/src/com/cloud/consoleproxy/AgentBasedStandaloneConsoleProxyManager.java @@ -48,7 +48,7 @@ AgentBasedConsoleProxyManager { if(host != null) { HostVO allocatedHost = null; /*Is there a consoleproxy agent running on the same machine?*/ - List hosts = _hostDao.listAll(); + List hosts = _hostDao.listAllIncludingRemoved(); for (HostVO hv : hosts) { if (hv.getType() == Host.Type.ConsoleProxy && hv.getPublicIpAddress().equalsIgnoreCase(host.getPublicIpAddress())) { allocatedHost = hv; diff --git a/server/src/com/cloud/maid/StackMaidManagerImpl.java b/server/src/com/cloud/maid/StackMaidManagerImpl.java index 3c68a86ecab..073244dcd32 100644 --- a/server/src/com/cloud/maid/StackMaidManagerImpl.java +++ b/server/src/com/cloud/maid/StackMaidManagerImpl.java @@ -52,7 +52,7 @@ public class StackMaidManagerImpl implements StackMaidManager { private void cleanupLeftovers(List l) { for(StackMaidVO maid : l) { StackMaid.doCleanup(maid); - _maidDao.delete(maid.getId()); + _maidDao.expunge(maid.getId()); } } diff --git a/server/src/com/cloud/migration/Db20to21MigrationUtil.java b/server/src/com/cloud/migration/Db20to21MigrationUtil.java index 90e950dc9e8..4da58efbe2c 100644 --- a/server/src/com/cloud/migration/Db20to21MigrationUtil.java +++ b/server/src/com/cloud/migration/Db20to21MigrationUtil.java @@ -126,7 +126,7 @@ public class Db20to21MigrationUtil { sb.done(); SearchCriteria sc = sb.create(); - List results = _dcDao.searchAll(sc, (Filter)null); + List results = _dcDao.searchIncludingRemoved(sc, (Filter)null); if(results.size() > 0) { System.out.println("We've found following zones are deployed in your database"); for(DcPod cols : results) { @@ -153,7 +153,7 @@ public class Db20to21MigrationUtil { SearchCriteria sc = sb.create(); sc.setParameters("zoneId", zoneId); - List pods = _podDao.searchAll(sc, null, false, false); + List pods = _podDao.searchIncludingRemoved(sc, null, false, false); if(pods.size() > 0) { for(HostPodVO pod : pods) { System.out.println("Migrating pod " + pod.getName() + " in zone " + zoneName + "..."); @@ -202,7 +202,7 @@ public class Db20to21MigrationUtil { sc.setParameters("type", Host.Type.Routing); // join cluster for hosts in pod - List hostsInPod = _hostDao.searchAll(sc, null, false, false); + List hostsInPod = _hostDao.searchIncludingRemoved(sc, null, false, false); if(hostsInPod.size() > 0) { if(cluster == null) { cluster = new ClusterVO(zoneId, podId, String.valueOf(podId)); @@ -228,7 +228,7 @@ public class Db20to21MigrationUtil { scPool.setParameters("pod", podId); scPool.setParameters("poolType", StoragePoolType.NetworkFilesystem.toString(), StoragePoolType.IscsiLUN.toString()); - List sPoolsInPod = _spDao.searchAll(scPool, null, false, false); + List sPoolsInPod = _spDao.searchIncludingRemoved(scPool, null, false, false); if(sPoolsInPod.size() > 0) { if(cluster == null) { cluster = new ClusterVO(zoneId, podId, String.valueOf(podId)); @@ -265,7 +265,7 @@ public class Db20to21MigrationUtil { System.out.println("Migrating domains..."); // we shouldn't have too many domains in the system, use a very dumb way to setup domain path - List domains = _domainDao.listAll(); + List domains = _domainDao.listAllIncludingRemoved(); for(DomainVO domain : domains) { StringBuilder path = new StringBuilder(); composeDomainPath(domain, path); @@ -284,7 +284,7 @@ public class Db20to21MigrationUtil { long seq = getServiceOfferingStartSequence(); - List oldServiceOfferings = _serviceOffering20Dao.listAll(); + List oldServiceOfferings = _serviceOffering20Dao.listAllIncludingRemoved(); for(ServiceOffering20VO so20 : oldServiceOfferings) { ServiceOffering21VO so21 = new ServiceOffering21VO(so20.getName(), so20.getCpu(), so20.getRamSize(), so20.getSpeed(), so20.getRateMbps(), so20.getMulticastRateMbps(), so20.getOfferHA(), so20.getDisplayText(), so20.getGuestIpType(), @@ -435,7 +435,7 @@ public class Db20to21MigrationUtil { private void migrateDiskOfferings() { System.out.println("Migrating disk offering..."); - List oldDiskOfferings = _diskOffering20Dao.listAll(); + List oldDiskOfferings = _diskOffering20Dao.listAllIncludingRemoved(); long maxDiskOfferingId = _domRServiceOfferingId; maxDiskOfferingId += 100; @@ -460,7 +460,7 @@ public class Db20to21MigrationUtil { System.out.println("Fixup NULL disk_offering_id references in volumes table ..."); SearchCriteria scDiskOffering = _diskOffering21Dao.createSearchCriteria(); - List offeringList = _diskOffering21Dao.searchAll(scDiskOffering, + List offeringList = _diskOffering21Dao.searchIncludingRemoved(scDiskOffering, new Filter(DiskOffering21VO.class, "diskSize", true, null, null), false, false); for(DiskOffering21VO offering : offeringList) { @@ -472,7 +472,7 @@ public class Db20to21MigrationUtil { sb.done(); SearchCriteria sc = sb.create(); - List volumes = _volumeDao.searchAll(sc, null, false, false); + List volumes = _volumeDao.searchIncludingRemoved(sc, null, false, false); if(volumes.size() > 0) { for(VolumeVO vol : volumes) { @@ -558,7 +558,7 @@ public class Db20to21MigrationUtil { SearchCriteria sc = sb.create(); sc.setParameters("zoneId", zoneId); - List proxies =_consoleProxyDao.searchAll(sc, null, false, false); + List proxies =_consoleProxyDao.searchIncludingRemoved(sc, null, false, false); for(ConsoleProxyVO proxy : proxies) { String[] macAddresses = _dcDao.getNextAvailableMacAddressPair(zoneId, (1L << 31)); String guestMacAddress = macAddresses[0]; @@ -585,7 +585,7 @@ public class Db20to21MigrationUtil { SearchCriteria sc2 = sb2.create(); sc2.setParameters("zoneId", zoneId); - List secStorageVms =_secStorageVmDao.searchAll(sc2, null, false, false); + List secStorageVms =_secStorageVmDao.searchIncludingRemoved(sc2, null, false, false); for(SecondaryStorageVmVO secStorageVm : secStorageVms) { String[] macAddresses = _dcDao.getNextAvailableMacAddressPair(zoneId, (1L << 31)); String guestMacAddress = macAddresses[0]; @@ -612,7 +612,7 @@ public class Db20to21MigrationUtil { SearchCriteria sc3 = sb3.create(); sc3.setParameters("zoneId", zoneId); - List domRs = _routerDao.searchAll(sc3, null, false, false); + List domRs = _routerDao.searchIncludingRemoved(sc3, null, false, false); for(DomainRouterVO router : domRs) { if(router.getState() == State.Running || router.getState() == State.Starting) { router.setState(State.Stopping); @@ -633,7 +633,7 @@ public class Db20to21MigrationUtil { SearchCriteria sc = sb.create(); sc.setParameters("zoneId", zoneId); sc.setParameters("podId", podId); - List vmInstances = _vmInstanceDao.searchAll(sc, null, false, false); + List vmInstances = _vmInstanceDao.searchIncludingRemoved(sc, null, false, false); List podHosts = getHostsInPod(zoneId, podId); for(VMInstanceVO vm : vmInstances) { if(vm.getHostId() != null) { @@ -660,13 +660,13 @@ public class Db20to21MigrationUtil { sc.setParameters("podId", podId); sc.setParameters("type", Host.Type.Routing.toString()); - return _hostDao.searchAll(sc, null, false, false); + return _hostDao.searchIncludingRemoved(sc, null, false, false); } private void migrateVolumDeviceIds() { System.out.println("Migrating device_id for volumes, this may take a while, please wait..."); SearchCriteria sc = _vmInstanceDao.createSearchCriteria(); - List vmInstances = _vmInstanceDao.searchAll(sc, null, false, false); + List vmInstances = _vmInstanceDao.searchIncludingRemoved(sc, null, false, false); long deviceId = 1; for(VMInstanceVO vm: vmInstances) { @@ -677,7 +677,7 @@ public class Db20to21MigrationUtil { SearchCriteria sc2 = sb.create(); sc2.setParameters("instanceId", vm.getId()); - List volumes = _volumeDao.searchAll(sc2, null, false, false); + List volumes = _volumeDao.searchIncludingRemoved(sc2, null, false, false); deviceId = 1; // reset for each VM iteration for(VolumeVO vol : volumes) { if(vol.getVolumeType() == VolumeType.ROOT) { @@ -707,7 +707,7 @@ public class Db20to21MigrationUtil { System.out.println("Migrating pool type for volumes..."); SearchCriteria sc = _volumeDao.createSearchCriteria(); - List volumes = _volumeDao.searchAll(sc, null, false, false); + List volumes = _volumeDao.searchIncludingRemoved(sc, null, false, false); for(VolumeVO vol : volumes) { if(vol.getPoolId() != null) { StoragePoolVO pool = _poolDao.findById(vol.getPoolId()); diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index fe898df0985..2c96fef5b8c 100644 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -459,7 +459,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager List vols = _storageMgr.create(account, router, rtrTemplate, dc, pod, _offering, null,0); if (vols == null){ _ipAddressDao.unassignIpAddress(guestIp); - _routerDao.delete(router.getId()); + _routerDao.expunge(router.getId()); if (s_logger.isDebugEnabled()) { s_logger.debug("Unable to create dhcp server in storage host or pool in pod " + pod.getName() + " (id:" + pod.getId() + ")"); } @@ -493,7 +493,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager txn.rollback(); if (router.getState() == State.Creating) { - _routerDao.delete(router.getId()); + _routerDao.expunge(router.getId()); } return null; } finally { @@ -635,7 +635,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager break; } - _routerDao.delete(router.getId()); + _routerDao.expunge(router.getId()); if (s_logger.isDebugEnabled()) { s_logger.debug("Unable to find storage host or pool in pod " + pod.first().getName() + " (id:" + pod.first().getId() + "), checking other pods"); } @@ -670,7 +670,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager txn.rollback(); if (router != null && router.getState() == State.Creating) { - _routerDao.delete(router.getId()); + _routerDao.expunge(router.getId()); } return null; } finally { diff --git a/server/src/com/cloud/network/security/NetworkGroupManagerImpl.java b/server/src/com/cloud/network/security/NetworkGroupManagerImpl.java index 82e4b0ab531..0ab316885c1 100644 --- a/server/src/com/cloud/network/security/NetworkGroupManagerImpl.java +++ b/server/src/com/cloud/network/security/NetworkGroupManagerImpl.java @@ -774,7 +774,7 @@ public class NetworkGroupManagerImpl implements NetworkGroupManager { txn.rollback(); throw new ResourceInUseException("Cannot delete group when there are ingress rules in this group"); } - _networkGroupDao.delete(groupId); + _networkGroupDao.expunge(groupId); txn.commit(); } diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 0426877579e..5ddb3d8794f 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -970,7 +970,7 @@ public class ManagementServerImpl implements ManagementServer { // All vm instances have been destroyed, delete the security group -> instance_id mappings SearchCriteria sc = _securityGroupVMMapDao.createSearchCriteria(); sc.addAnd("securityGroupId", SearchCriteria.Op.EQ, securityGroup.getId()); - _securityGroupVMMapDao.delete(sc); + _securityGroupVMMapDao.expunge(sc); // now clean the network rules and security groups themselves _networkRuleConfigDao.deleteBySecurityGroup(securityGroup.getId()); @@ -2847,12 +2847,12 @@ public class ManagementServerImpl implements ManagementServer { @Override public List listDataCenters() { - return _dcDao.listAllActive(); + return _dcDao.listAll(); } @Override public List listDataCentersBy(long accountId) { - List dcs = _dcDao.listAllActive(); + List dcs = _dcDao.listAll(); List routers = _routerDao.listBy(accountId); for (Iterator iter = dcs.iterator(); iter.hasNext();) { DataCenterVO dc = iter.next(); @@ -3647,7 +3647,7 @@ public class ManagementServerImpl implements ManagementServer { } else if (fwdings.size() == 1) { fwRule = fwdings.get(0); if (fwRule.getPrivateIpAddress().equalsIgnoreCase(privateIp) && fwRule.getPrivatePort().equals(privatePort)) { - _firewallRulesDao.delete(fwRule.getId()); + _firewallRulesDao.expunge(fwRule.getId()); } else { throw new InvalidParameterValueException("No such rule"); } @@ -3746,7 +3746,7 @@ public class ManagementServerImpl implements ManagementServer { if (!success) { throw new InternalErrorException("Failed to update router"); } - _firewallRulesDao.delete(fwRule.getId()); + _firewallRulesDao.expunge(fwRule.getId()); txn.commit(); return success; @@ -4483,7 +4483,7 @@ public class ManagementServerImpl implements ManagementServer { if (limitId == null) return false; - return _resourceLimitDao.delete(limitId); + return _resourceLimitDao.expunge(limitId); } @Override @@ -4516,7 +4516,7 @@ public class ManagementServerImpl implements ManagementServer { { //account belongs to admin //return all limits - limits = _resourceLimitDao.listAll(); + limits = _resourceLimitDao.listAllIncludingRemoved(); return limits; } } @@ -4525,7 +4525,7 @@ public class ManagementServerImpl implements ManagementServer { //return all the records for resource limits (bug:3778) if(accountId==1 && domainId==1) { - limits = _resourceLimitDao.listAll(); + limits = _resourceLimitDao.listAllIncludingRemoved(); return limits; } } @@ -4685,12 +4685,12 @@ public class ManagementServerImpl implements ManagementServer { @Override public List listAllServiceOfferings() { - return _offeringsDao.listAll(); + return _offeringsDao.listAllIncludingRemoved(); } @Override public List listAllActiveHosts() { - return _hostDao.listAllActive(); + return _hostDao.listAll(); } @Override @@ -5474,7 +5474,7 @@ public class ManagementServerImpl implements ManagementServer { @Override public List listAllActiveRouters() { - return _routerDao.listAllActive(); + return _routerDao.listAll(); } @Override @@ -5861,7 +5861,7 @@ public class ManagementServerImpl implements ManagementServer { @Override public List listAllActiveDiskTemplates() { - return _diskTemplateDao.listAllActive(); + return _diskTemplateDao.listAll(); } @Override @@ -6114,7 +6114,7 @@ public class ManagementServerImpl implements ManagementServer { @Override public List listAllTemplates() { - return _templateDao.listAll(); + return _templateDao.listAllIncludingRemoved(); } @Override @@ -7924,7 +7924,7 @@ public class ManagementServerImpl implements ManagementServer { List oldEvents = _eventDao.listOlderEvents(purgeTime); s_logger.debug("Found "+oldEvents.size()+" events to be purged"); for (EventVO event : oldEvents){ - _eventDao.delete(event.getId()); + _eventDao.expunge(event.getId()); } } catch (Exception e) { s_logger.error("Exception ", e); diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java index 668d4674171..d67bb146f1b 100644 --- a/server/src/com/cloud/server/StatsCollector.java +++ b/server/src/com/cloud/server/StatsCollector.java @@ -284,7 +284,7 @@ public class StatsCollector { ConcurrentHashMap storagePoolStats = new ConcurrentHashMap(); - List storagePools = _storagePoolDao.listAllActive(); + List storagePools = _storagePoolDao.listAll(); for (StoragePoolVO pool: storagePools) { GetStorageStatsCommand command = new GetStorageStatsCommand(pool.getUuid(), pool.getPoolType(), pool.getPath()); Answer answer = _storageManager.sendToPool(pool, command); @@ -377,7 +377,7 @@ public class StatsCollector { class VolumeCollector implements Runnable { public void run() { try { - List volumes = _volsDao.listAllActive(); + List volumes = _volsDao.listAll(); Map> commandsByPool = new HashMap>(); for (VolumeVO volume : volumes) { diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index c0db46eb496..d5e4e3bfc9a 100644 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -1417,7 +1417,7 @@ public class StorageManagerImpl implements StorageManager { } if (poolHosts.isEmpty()) { - _storagePoolDao.delete(pool.getId()); + _storagePoolDao.expunge(pool.getId()); pool = null; } else { createCapacityEntry(pool); @@ -1885,7 +1885,7 @@ public class StorageManagerImpl implements StorageManager { public void cleanupStorage(boolean recurring) { // Cleanup primary storage pools - List storagePools = _storagePoolDao.listAllActive(); + List storagePools = _storagePoolDao.listAll(); for (StoragePoolVO pool : storagePools) { try { if (recurring && pool.isLocal()) { diff --git a/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java b/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java index 86edc0eae68..2fb07a5a7e7 100644 --- a/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java +++ b/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java @@ -120,7 +120,7 @@ public class LocalStoragePoolAllocator extends FirstFitStoragePoolAllocator { SearchCriteria sc = VmsOnPoolSearch.create(); sc.setJoinParameters("volumeJoin", "poolId", pool.getId()); sc.setParameters("state", State.Expunging); - List vmsOnHost = _vmInstanceDao.searchAll(sc, null); + List vmsOnHost = _vmInstanceDao.searchIncludingRemoved(sc, null); if(s_logger.isDebugEnabled()) { s_logger.debug("Found " + vmsOnHost.size() + " VM instances are alloacated at host " + spHost.getHostId() + " with local storage pool " + pool.getName()); diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java index 582e0f58f9e..c1b09f88041 100644 --- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java +++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java @@ -307,7 +307,7 @@ public class DownloadMonitorImpl implements DownloadMonitor { List dcs = new ArrayList(); if (zoneId == null) { - dcs.addAll(_dcDao.listAll()); + dcs.addAll(_dcDao.listAllIncludingRemoved()); } else { dcs.add(_dcDao.findById(zoneId)); } diff --git a/server/src/com/cloud/storage/preallocatedlun/dao/PreallocatedLunDaoImpl.java b/server/src/com/cloud/storage/preallocatedlun/dao/PreallocatedLunDaoImpl.java index 79fce87a75e..4c79cac7d44 100644 --- a/server/src/com/cloud/storage/preallocatedlun/dao/PreallocatedLunDaoImpl.java +++ b/server/src/com/cloud/storage/preallocatedlun/dao/PreallocatedLunDaoImpl.java @@ -100,7 +100,7 @@ public class PreallocatedLunDaoImpl extends GenericDaoBase sc = DeleteSearch.create(); sc.setParameters("id", id); - return delete(sc) > 0; + return expunge(sc) > 0; } @Override @@ -184,7 +184,7 @@ public class PreallocatedLunDaoImpl extends GenericDaoBase sc = TotalSizeSearch.create(); sc.setParameters("target", targetIqn); - List results = searchAll(sc, null); + List results = searchIncludingRemoved(sc, null); if (results.size() == 0) { return 0; } @@ -197,7 +197,7 @@ public class PreallocatedLunDaoImpl extends GenericDaoBase sc = UsedSizeSearch.create(); sc.setParameters("target", targetIqn); - List results = searchAll(sc, null); + List results = searchIncludingRemoved(sc, null); if (results.size() == 0) { return 0; } @@ -209,7 +209,7 @@ public class PreallocatedLunDaoImpl extends GenericDaoBase findDistinctTagsForTarget(String targetIqn) { SearchCriteria sc = DetailsSearch.create(); sc.setJoinParameters("target", "targetiqn", targetIqn); - return _detailsDao.searchAll(sc, null); + return _detailsDao.searchIncludingRemoved(sc, null); } @Override @DB diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java b/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java index aecc77ccf92..6aa0138ae50 100644 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java @@ -271,7 +271,7 @@ public class SecondaryStorageDiscoverer extends DiscovererBase implements Discov _vmTemplateZoneDao.persist(vmTemplateZone); } - List allTemplates = _vmTemplateDao.listAllActive(); + List allTemplates = _vmTemplateDao.listAll(); for (VMTemplateVO vt: allTemplates){ if (vt.isCrossZones()){ tmpltZone = _vmTemplateZoneDao.findByZoneTemplate(dcId, vt.getId()); diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java index f516b16419c..029915bd5aa 100644 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java @@ -527,7 +527,7 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V return true; } boolean success = true; - List allZones = _dcDao.listAllActive(); + List allZones = _dcDao.listAll(); for (DataCenterVO zone: allZones){ success = success && generateFirewallConfigurationForZone( zone.getId()); } @@ -953,7 +953,7 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V try { checkPendingSecStorageVMs(); - List datacenters = _dcDao.listAll(); + List datacenters = _dcDao.listAllIncludingRemoved(); for (DataCenterVO dc: datacenters){ diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java index 4918cc346de..adc185bc0bb 100644 --- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java @@ -368,7 +368,7 @@ public class SnapshotManagerImpl implements SnapshotManager { // The snapshot was not successfully created createdSnapshot = _snapshotDao.findById(id); // delete from the snapshots table - _snapshotDao.delete(id); + _snapshotDao.expunge(id); } @@ -431,7 +431,7 @@ public class SnapshotManagerImpl implements SnapshotManager { if (answer.getResult()) { // The expected snapshot details on the primary is the same as it would be if this snapshot was never taken at all // Just delete the entry in the table - _snapshotDao.delete(id); + _snapshotDao.expunge(id); // Create an event saying the snapshot failed. ?? // An event is not generated when validatePreviousSnapshotBackup fails. So not generating it here too. } @@ -566,7 +566,7 @@ public class SnapshotManagerImpl implements SnapshotManager { long pprevSnapshotId = prevSnapshot.getPrevSnapshotId(); snapshot.setPrevSnapshotId(pprevSnapshotId); _snapshotDao.update(snapshot.getId(), snapshot); - _snapshotDao.delete(prevSnapshot.getId()); + _snapshotDao.expunge(prevSnapshot.getId()); EventVO event = new EventVO(); String eventParams = "id=" + prevSnapshot.getId() + "\nssName=" + prevSnapshot.getName(); @@ -695,7 +695,7 @@ public class SnapshotManagerImpl implements SnapshotManager { SnapshotScheduleVO snapshotSchedule = _snapshotScheduleDao.getCurrentSchedule(volumeId, policyId, true); if (snapshotSchedule != null) { // We should lock the row before deleting it as it is also being deleted by the scheduler. - _snapshotScheduleDao.delete(snapshotSchedule.getId()); + _snapshotScheduleDao.expunge(snapshotSchedule.getId()); } } } @@ -947,7 +947,7 @@ public class SnapshotManagerImpl implements SnapshotManager { if(isLastSnap){ _snapshotDao.remove(snapshotId); } else { - _snapshotDao.delete(snapshotId); + _snapshotDao.expunge(snapshotId); // In the snapshots table, // the last_snapshot_id field of the next snapshot becomes the last_snapshot_id of the deleted snapshot long prevSnapshotId = snapshot.getPrevSnapshotId(); @@ -1053,7 +1053,7 @@ public class SnapshotManagerImpl implements SnapshotManager { // Either way delete the snapshots for this volume. List snapshots = listSnapsforVolume(volumeId); for (SnapshotVO snapshot: snapshots) { - if(_snapshotDao.delete(snapshot.getId())){ + if(_snapshotDao.expunge(snapshot.getId())){ _accountMgr.decrementResourceCount(accountId, ResourceType.snapshot); //Log event after successful deletion @@ -1197,7 +1197,7 @@ public class SnapshotManagerImpl implements SnapshotManager { // We can only delete the schedules in the future, not the ones which are already executing. SnapshotScheduleVO snapshotSchedule = _snapshotScheduleDao.getCurrentSchedule(volumeId, Snapshot.MANUAL_POLICY_ID, false); if (snapshotSchedule != null) { - _snapshotScheduleDao.delete(snapshotSchedule.getId()); + _snapshotScheduleDao.expunge(snapshotSchedule.getId()); } } @@ -1256,7 +1256,7 @@ public class SnapshotManagerImpl implements SnapshotManager { } } if(success){ - _snapshotDao.delete(snapshot.getId()); + _snapshotDao.expunge(snapshot.getId()); } return success; } diff --git a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java index e76904fa228..9b008962b89 100644 --- a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java @@ -313,7 +313,7 @@ public class SnapshotSchedulerImpl implements SnapshotScheduler { if (_snapshotScheduleDao.findById(expectedId) != null) { // We need to acquire a lock and delete it, then release the lock. // But I don't know how to. - _snapshotScheduleDao.delete(expectedId); + _snapshotScheduleDao.expunge(expectedId); } if (policyId.longValue() == Snapshot.MANUAL_POLICY_ID) { // Don't need to schedule the next job for this. @@ -338,7 +338,7 @@ public class SnapshotSchedulerImpl implements SnapshotScheduler { SnapshotScheduleVO schedule = _snapshotScheduleDao.getCurrentSchedule(volumeId, policyId, false); boolean success = true; if (schedule != null) { - success = _snapshotScheduleDao.delete(schedule.getId()); + success = _snapshotScheduleDao.expunge(schedule.getId()); } if(!success){ s_logger.debug("Error while deleting Snapshot schedule with Id: "+schedule.getId()); diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index 3893caa0b63..5a473617158 100755 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -127,7 +127,7 @@ public class TemplateManagerImpl implements TemplateManager { VMTemplateVO template = new VMTemplateVO(id, name, format, isPublic, featured, fs, url.toString(), requiresHvm, bits, accountId, chksum, displayText, enablePassword, guestOSId, bootable); if (zoneId == null) { - List dcs = _dcDao.listAll(); + List dcs = _dcDao.listAllIncludingRemoved(); for (DataCenterVO dc: dcs) { _tmpltDao.addTemplateToZone(template, dc.getId()); diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 8ac5234660d..2e116761556 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -1547,7 +1547,7 @@ public class UserVmManagerImpl implements UserVmManager { } catch (Throwable th) { s_logger.error("Unable to create vm", th); if (vm != null) { - _vmDao.delete(vmId); + _vmDao.expunge(vmId); } _accountMgr.decrementResourceCount(account.getId(), ResourceType.user_vm); _accountMgr.decrementResourceCount(account.getId(), ResourceType.volume, numVolumes); @@ -2231,7 +2231,7 @@ public class UserVmManagerImpl implements UserVmManager { if ((answer != null) && answer.getResult()) { // delete the snapshot from the database - _snapshotDao.delete(snapshotId); + _snapshotDao.expunge(snapshotId); success = true; } if (answer != null) { @@ -2287,7 +2287,7 @@ public class UserVmManagerImpl implements UserVmManager { Transaction txn = Transaction.currentTxn(); txn.start(); createdSnapshot = _snapshotDao.findById(id); - _snapshotDao.delete(id); + _snapshotDao.expunge(id); txn.commit(); createdSnapshot = null; @@ -2709,7 +2709,7 @@ public class UserVmManagerImpl implements UserVmManager { boolean addedToGroups = _networkGroupManager.addInstanceToGroups(vmId, networkGroups); if (!addedToGroups) { s_logger.warn("Not all specified network groups can be found"); - _vmDao.delete(vm.getId()); + _vmDao.expunge(vm.getId()); throw new InvalidParameterValueException("Not all specified network groups can be found"); } @@ -2717,7 +2717,7 @@ public class UserVmManagerImpl implements UserVmManager { try { poolId = _storageMgr.createUserVM(account, vm, template, dc, pod.first(), offering, diskOffering, a,size); } catch (CloudRuntimeException e) { - _vmDao.delete(vmId); + _vmDao.expunge(vmId); _ipAddressDao.unassignIpAddress(guestIp); s_logger.debug("Released a guest ip address because we could not find storage: ip=" + guestIp); guestIp = null; @@ -2878,7 +2878,7 @@ public class UserVmManagerImpl implements UserVmManager { try { poolId = _storageMgr.createUserVM(account, vm, template, dc, pod.first(), offering, diskOffering,a,size); } catch (CloudRuntimeException e) { - _vmDao.delete(vmId); + _vmDao.expunge(vmId); _accountMgr.decrementResourceCount(account.getId(), ResourceType.user_vm); _accountMgr.decrementResourceCount(account.getId(), ResourceType.volume, numVolumes); if (s_logger.isDebugEnabled()) { diff --git a/utils/src/com/cloud/utils/db/GenericDao.java b/utils/src/com/cloud/utils/db/GenericDao.java index c74dea10259..4a28068d342 100755 --- a/utils/src/com/cloud/utils/db/GenericDao.java +++ b/utils/src/com/cloud/utils/db/GenericDao.java @@ -125,14 +125,14 @@ public interface GenericDao { * Look for all active rows. * @return list of entity beans. */ - List listAllActive(); + List listAll(); /** * Look for all active rows. * @param filter filter to limit the results * @return list of entity beans. */ - List listAllActive(Filter filter); + List listAll(Filter filter); /** @@ -143,7 +143,7 @@ public interface GenericDao { */ List search(SearchCriteria sc, Filter filter); - List searchAll(SearchCriteria sc, final Filter filter, final Boolean lock, final boolean cache); + List searchIncludingRemoved(SearchCriteria sc, final Filter filter, final Boolean lock, final boolean cache); /** * Customized search with SearchCritiria @@ -151,20 +151,20 @@ public interface GenericDao { * @param filter * @return list of entity beans. */ - public List searchAll(SearchCriteria sc, Filter filter); + public List searchIncludingRemoved(SearchCriteria sc, Filter filter); /** * Retrieves the entire table. * @return collection of entity beans. **/ - List listAll(); + List listAllIncludingRemoved(); /** * Retrieves the entire table. * @param filter filter to limit the returns. * @return collection of entity beans. **/ - List listAll(Filter filter); + List listAllIncludingRemoved(Filter filter); /** * Persist the entity bean. The id field of the entity is updated with @@ -188,14 +188,14 @@ public interface GenericDao { * @param id * @return true if removed. */ - boolean delete(ID id); + boolean expunge(ID id); /** * remove the entity bean specified by the search criteria * @param sc * @return number of rows deleted */ - int delete(final SearchCriteria sc); + int expunge(final SearchCriteria sc); /** * expunge the removed rows. diff --git a/utils/src/com/cloud/utils/db/GenericDaoBase.java b/utils/src/com/cloud/utils/db/GenericDaoBase.java index 0faf861b7a8..8c5f7bd2c1f 100755 --- a/utils/src/com/cloud/utils/db/GenericDaoBase.java +++ b/utils/src/com/cloud/utils/db/GenericDaoBase.java @@ -293,11 +293,11 @@ public abstract class GenericDaoBase implements Gene } sc.addAnd(_removed.second().field.getName(), SearchCriteria.Op.NULL); } - return searchAll(sc, filter, lock, cache); + return searchIncludingRemoved(sc, filter, lock, cache); } @Override - public List searchAll(SearchCriteria sc, final Filter filter, final Boolean lock, final boolean cache) { + public List searchIncludingRemoved(SearchCriteria sc, final Filter filter, final Boolean lock, final boolean cache) { String clause = sc != null ? sc.getWhereClause() : null; if (clause != null && clause.length() == 0) { clause = null; @@ -363,7 +363,7 @@ public abstract class GenericDaoBase implements Gene } @Override @SuppressWarnings("unchecked") @DB - public List searchAll(SearchCriteria sc, final Filter filter) { + public List searchIncludingRemoved(SearchCriteria sc, final Filter filter) { String clause = sc != null ? sc.getWhereClause() : null; if (clause != null && clause.length() == 0) { clause = null; @@ -723,7 +723,7 @@ public abstract class GenericDaoBase implements Gene protected T findOneBy(final SearchCriteria sc) { Filter filter = new Filter(1); - List results = searchAll(sc, filter, null, false); + List results = searchIncludingRemoved(sc, filter, null, false); assert results.size() <= 1 : "Didn't the limiting worked?"; return results.size() == 0 ? null : results.get(0); } @@ -751,7 +751,7 @@ public abstract class GenericDaoBase implements Gene @DB(txn=false) protected List listBy(final SearchCriteria sc, final Filter filter) { - return searchAll(sc, filter, null, false); + return searchIncludingRemoved(sc, filter, null, false); } @DB(txn=false) @@ -837,8 +837,8 @@ public abstract class GenericDaoBase implements Gene } @Override @DB(txn=false) - public List listAll() { - return listAll(null); + public List listAllIncludingRemoved() { + return listAllIncludingRemoved(null); } @DB(txn=false) @@ -872,7 +872,7 @@ public abstract class GenericDaoBase implements Gene } @Override @DB(txn=false) - public List listAll(final Filter filter) { + public List listAllIncludingRemoved(final Filter filter) { final StringBuilder sql = createPartialSelectSql(null, false); addFilter(sql, filter); @@ -903,14 +903,14 @@ public abstract class GenericDaoBase implements Gene } @Override @DB(txn=false) - public List listAllActive() { - return listAllActive(null); + public List listAll() { + return listAll(null); } @Override @DB(txn=false) - public List listAllActive(final Filter filter) { + public List listAll(final Filter filter) { if (_removed == null) { - return listAll(filter); + return listAllIncludingRemoved(filter); } final StringBuilder sql = createPartialSelectSql(null, true); @@ -921,7 +921,7 @@ public abstract class GenericDaoBase implements Gene } @Override - public boolean delete(final ID id) { + public boolean expunge(final ID id) { final Transaction txn = Transaction.currentTxn(); PreparedStatement pstmt = s_initStmt; String sql = null; @@ -952,7 +952,7 @@ public abstract class GenericDaoBase implements Gene // FIXME: Does not work for joins. @Override - public int delete(final SearchCriteria sc) { + public int expunge(final SearchCriteria sc) { final StringBuilder str = new StringBuilder("DELETE FROM "); str.append(_table); str.append(" WHERE "); @@ -1269,7 +1269,7 @@ public abstract class GenericDaoBase implements Gene @Override public boolean remove(final ID id) { if (_removeSql == null) { - return delete(id); + return expunge(id); } final Transaction txn = Transaction.currentTxn(); @@ -1299,7 +1299,7 @@ public abstract class GenericDaoBase implements Gene @Override public int remove(SearchCriteria sc) { if (_removeSql == null) { - return delete(sc); + return expunge(sc); } T vo = createForUpdate(); @@ -1337,7 +1337,7 @@ public abstract class GenericDaoBase implements Gene createCache(params); final boolean load = Boolean.parseBoolean((String)params.get("cache.preload")); if (load) { - listAllActive(); + listAll(); } return true;