Skip to content

Commit 63de65d

Browse files
sudo87dhslove
sudo87
authored and
dhslove
committed
Skip removal of offerings if in use during domain removal (apache#11780)
This PR fixes apache#11502 - Prevent service offering update to specific domains if any instance for the offering are outside of those - Removal of offerings is skipped if it is in use by any Instance.
1 parent 8314096 commit 63de65d

6 files changed

Lines changed: 87 additions & 4 deletions

File tree

‎engine/schema/src/main/java/com/cloud/storage/dao/VolumeDao.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,6 @@ public interface VolumeDao extends GenericDao<VolumeVO, Long>, StateDao<Volume.S
168168
VolumeVO findOneByIScsiName(String iScsiName);
169169

170170
VolumeVO findByLastIdAndState(long lastVolumeId, Volume.State...states);
171+
172+
int getVolumeCountByOfferingId(long diskOfferingId);
171173
}

‎engine/schema/src/main/java/com/cloud/storage/dao/VolumeDaoImpl.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long> implements Vol
7979
protected GenericSearchBuilder<VolumeVO, SumCount> primaryStorageSearch2;
8080
protected GenericSearchBuilder<VolumeVO, SumCount> secondaryStorageSearch;
8181
private final SearchBuilder<VolumeVO> poolAndPathSearch;
82+
final GenericSearchBuilder<VolumeVO, Integer> CountByOfferingId;
8283

8384
@Inject
8485
ReservationDao reservationDao;
@@ -512,6 +513,11 @@ public VolumeDaoImpl() {
512513
poolAndPathSearch.and("poolId", poolAndPathSearch.entity().getPoolId(), Op.EQ);
513514
poolAndPathSearch.and("path", poolAndPathSearch.entity().getPath(), Op.EQ);
514515
poolAndPathSearch.done();
516+
517+
CountByOfferingId = createSearchBuilder(Integer.class);
518+
CountByOfferingId.select(null, Func.COUNT, CountByOfferingId.entity().getId());
519+
CountByOfferingId.and("diskOfferingId", CountByOfferingId.entity().getDiskOfferingId(), Op.EQ);
520+
CountByOfferingId.done();
515521
}
516522

517523
@Override
@@ -941,4 +947,12 @@ public VolumeVO findByLastIdAndState(long lastVolumeId, State ...states) {
941947
sc.and(sc.entity().getState(), SearchCriteria.Op.IN, (Object[]) states);
942948
return sc.find();
943949
}
950+
951+
@Override
952+
public int getVolumeCountByOfferingId(long diskOfferingId) {
953+
SearchCriteria<Integer> sc = CountByOfferingId.create();
954+
sc.setParameters("diskOfferingId", diskOfferingId);
955+
List<Integer> results = customSearch(sc, null);
956+
return results.get(0);
957+
}
944958
}

‎engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDao.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,4 +188,8 @@ List<VMInstanceVO> searchRemovedByRemoveDate(final Date startDate, final Date en
188188
Map<String, Long> getNameIdMapForVmIds(Collection<Long> ids);
189189

190190
List<VMInstanceVO> listByIdsIncludingRemoved(List<Long> ids);
191+
192+
int getVmCountByOfferingId(Long serviceOfferingId);
193+
194+
int getVmCountByOfferingNotInDomain(Long serviceOfferingId, List<Long> domainIds);
191195
}

‎engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
104104
protected SearchBuilder<VMInstanceVO> LastHostAndStatesSearch;
105105
protected SearchBuilder<VMInstanceVO> VmsNotInClusterUsingPool;
106106
protected SearchBuilder<VMInstanceVO> IdsPowerStateSelectSearch;
107+
GenericSearchBuilder<VMInstanceVO, Integer> CountByOfferingId;
108+
GenericSearchBuilder<VMInstanceVO, Integer> CountUserVmNotInDomain;
107109

108110
@Inject
109111
ResourceTagDao tagsDao;
@@ -354,6 +356,18 @@ protected void init() {
354356
IdsPowerStateSelectSearch.entity().getPowerStateUpdateCount(),
355357
IdsPowerStateSelectSearch.entity().getPowerStateUpdateTime());
356358
IdsPowerStateSelectSearch.done();
359+
360+
CountByOfferingId = createSearchBuilder(Integer.class);
361+
CountByOfferingId.select(null, Func.COUNT, CountByOfferingId.entity().getId());
362+
CountByOfferingId.and("serviceOfferingId", CountByOfferingId.entity().getServiceOfferingId(), Op.EQ);
363+
CountByOfferingId.done();
364+
365+
CountUserVmNotInDomain = createSearchBuilder(Integer.class);
366+
CountUserVmNotInDomain.select(null, Func.COUNT, CountUserVmNotInDomain.entity().getId());
367+
CountUserVmNotInDomain.and("serviceOfferingId", CountUserVmNotInDomain.entity().getServiceOfferingId(), Op.EQ);
368+
CountUserVmNotInDomain.and("domainIdsNotIn", CountUserVmNotInDomain.entity().getDomainId(), Op.NIN);
369+
CountUserVmNotInDomain.done();
370+
357371
}
358372

359373
@Override
@@ -1256,4 +1270,27 @@ public List<VMInstanceVO> listByIdsIncludingRemoved(List<Long> ids) {
12561270
sc.setParameters("ids", ids.toArray());
12571271
return listIncludingRemovedBy(sc);
12581272
}
1273+
1274+
@Override
1275+
public int getVmCountByOfferingId(Long serviceOfferingId) {
1276+
if (serviceOfferingId == null) {
1277+
return 0;
1278+
}
1279+
SearchCriteria<Integer> sc = CountByOfferingId.create();
1280+
sc.setParameters("serviceOfferingId", serviceOfferingId);
1281+
List<Integer> count = customSearch(sc, null);
1282+
return count.get(0);
1283+
}
1284+
1285+
@Override
1286+
public int getVmCountByOfferingNotInDomain(Long serviceOfferingId, List<Long> domainIds) {
1287+
if (serviceOfferingId == null || CollectionUtils.isEmpty(domainIds)) {
1288+
return 0;
1289+
}
1290+
SearchCriteria<Integer> sc = CountUserVmNotInDomain.create();
1291+
sc.setParameters("serviceOfferingId", serviceOfferingId);
1292+
sc.setParameters("domainIdsNotIn", domainIds.toArray());
1293+
List<Integer> count = customSearch(sc, null);
1294+
return count.get(0);
1295+
}
12591296
}

‎server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@
5353
import com.cloud.network.router.VirtualNetworkApplianceManager;
5454
import com.cloud.storage.secondary.SecondaryStorageVmManager;
5555
import com.cloud.vm.VirtualMachineManager;
56+
import com.cloud.exception.UnsupportedServiceException;
57+
import com.cloud.network.as.AutoScaleManager;
58+
import com.cloud.user.AccountManagerImpl;
5659
import org.apache.cloudstack.acl.RoleType;
5760
import org.apache.cloudstack.acl.SecurityChecker;
5861
import org.apache.cloudstack.affinity.AffinityGroup;
@@ -3940,6 +3943,12 @@ public ServiceOffering updateServiceOffering(final UpdateServiceOfferingCmd cmd)
39403943
List<Long> filteredDomainIds = filterChildSubDomains(domainIds);
39413944
Collections.sort(filteredDomainIds);
39423945

3946+
// avoid domain update of service offering if any instance is associated to it
3947+
int instanceCount = _vmInstanceDao.getVmCountByOfferingNotInDomain(offeringHandle.getId(), filteredDomainIds);
3948+
if (instanceCount > 0) {
3949+
throw new UnsupportedServiceException("There are Instances associated to this service offering outside of the specified domains.");
3950+
}
3951+
39433952
List<Long> filteredZoneIds = new ArrayList<>();
39443953
if (CollectionUtils.isNotEmpty(zoneIds)) {
39453954
filteredZoneIds.addAll(zoneIds);

‎server/src/main/java/com/cloud/user/DomainManagerImpl.java‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
import com.cloud.api.query.vo.VpcOfferingJoinVO;
3535
import com.cloud.configuration.Resource;
3636
import com.cloud.domain.dao.DomainDetailsDao;
37+
import com.cloud.network.dao.NetworkDao;
38+
import com.cloud.network.vpc.dao.VpcDao;
3739
import com.cloud.network.vpc.dao.VpcOfferingDao;
3840
import com.cloud.network.vpc.dao.VpcOfferingDetailsDao;
3941
import com.cloud.offerings.dao.NetworkOfferingDao;
@@ -85,6 +87,7 @@
8587
import com.cloud.service.dao.ServiceOfferingDao;
8688
import com.cloud.service.dao.ServiceOfferingDetailsDao;
8789
import com.cloud.storage.dao.DiskOfferingDao;
90+
import com.cloud.storage.dao.VolumeDao;
8891
import com.cloud.user.dao.AccountDao;
8992
import com.cloud.utils.Pair;
9093
import com.cloud.utils.component.ManagerBase;
@@ -101,6 +104,8 @@
101104
import com.cloud.utils.net.NetUtils;
102105
import com.cloud.vm.ReservationContext;
103106
import com.cloud.vm.ReservationContextImpl;
107+
import com.cloud.vm.dao.VMInstanceDao;
108+
104109
import org.apache.commons.lang3.StringUtils;
105110

106111
@Component
@@ -141,6 +146,14 @@ public class DomainManagerImpl extends ManagerBase implements DomainManager, Dom
141146
@Inject
142147
private ProjectDao _projectDao;
143148
@Inject
149+
private VMInstanceDao vmInstanceDao;
150+
@Inject
151+
private NetworkDao networkDao;
152+
@Inject
153+
private VolumeDao volumeDao;
154+
@Inject
155+
private VpcDao vpcDao;
156+
@Inject
144157
private ProjectManager _projectMgr;
145158
@Inject
146159
private RegionManager _regionMgr;
@@ -543,7 +556,8 @@ private void removeVpcOfferings(Long domainId, String domainIdString) {
543556
List<Long> vpcOfferingsDetailsToRemove = new ArrayList<>();
544557
List<VpcOfferingJoinVO> vpcOfferingsForThisDomain = vpcOfferingJoinDao.findByDomainId(domainId);
545558
for (VpcOfferingJoinVO vpcOffering : vpcOfferingsForThisDomain) {
546-
if (domainIdString.equals(vpcOffering.getDomainId())) {
559+
int vpcCount = vpcDao.getVpcCountByOfferingId(vpcOffering.getId());
560+
if (vpcCount == 0) {
547561
vpcOfferingDao.remove(vpcOffering.getId());
548562
} else {
549563
vpcOfferingsDetailsToRemove.add(vpcOffering.getId());
@@ -558,7 +572,8 @@ private void removeNetworkOfferings(Long domainId, String domainIdString) {
558572
List<Long> networkOfferingsDetailsToRemove = new ArrayList<>();
559573
List<NetworkOfferingJoinVO> networkOfferingsForThisDomain = networkOfferingJoinDao.findByDomainId(domainId, false);
560574
for (NetworkOfferingJoinVO networkOffering : networkOfferingsForThisDomain) {
561-
if (domainIdString.equals(networkOffering.getDomainId())) {
575+
int networkCount = networkDao.getNetworkCountByNetworkOffId(networkOffering.getId());
576+
if (networkCount == 0) {
562577
networkOfferingDao.remove(networkOffering.getId());
563578
} else {
564579
networkOfferingsDetailsToRemove.add(networkOffering.getId());
@@ -573,7 +588,8 @@ private void removeServiceOfferings(Long domainId, String domainIdString) {
573588
List<Long> serviceOfferingsDetailsToRemove = new ArrayList<>();
574589
List<ServiceOfferingJoinVO> serviceOfferingsForThisDomain = serviceOfferingJoinDao.findByDomainId(domainId);
575590
for (ServiceOfferingJoinVO serviceOffering : serviceOfferingsForThisDomain) {
576-
if (domainIdString.equals(serviceOffering.getDomainId())) {
591+
int vmCount = vmInstanceDao.getVmCountByOfferingId(serviceOffering.getId());
592+
if (vmCount == 0) {
577593
serviceOfferingDao.remove(serviceOffering.getId());
578594
} else {
579595
serviceOfferingsDetailsToRemove.add(serviceOffering.getId());
@@ -588,7 +604,8 @@ private void removeDiskOfferings(Long domainId, String domainIdString) {
588604
List<Long> diskOfferingsDetailsToRemove = new ArrayList<>();
589605
List<DiskOfferingJoinVO> diskOfferingsForThisDomain = diskOfferingJoinDao.findByDomainId(domainId);
590606
for (DiskOfferingJoinVO diskOffering : diskOfferingsForThisDomain) {
591-
if (domainIdString.equals(diskOffering.getDomainId())) {
607+
int volumeCount = volumeDao.getVolumeCountByOfferingId(diskOffering.getId());
608+
if (volumeCount == 0) {
592609
diskOfferingDao.remove(diskOffering.getId());
593610
} else {
594611
diskOfferingsDetailsToRemove.add(diskOffering.getId());

0 commit comments

Comments
 (0)