Skip to content

Commit 57551e4

Browse files
marcaurelemarcaurele
committed
API: listDedicatedXXX should respect pagination
Fix CLOUDSTACK-9896
1 parent 32807cb commit 57551e4

File tree

4 files changed

+38
-23
lines changed

4 files changed

+38
-23
lines changed

‎plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import javax.inject.Inject;
2525
import javax.naming.ConfigurationException;
2626

27+
import com.cloud.utils.db.Filter;
2728
import org.apache.log4j.Logger;
2829
import org.springframework.stereotype.Component;
2930

@@ -819,6 +820,8 @@ public Pair<List<? extends DedicatedResourceVO>, Integer> listDedicatedZones(Lis
819820
String accountName = cmd.getAccountName();
820821
Long accountId = null;
821822
Long affinityGroupId = cmd.getAffinityGroupId();
823+
Long startIndex = cmd.getStartIndex();
824+
Long pageSize = cmd.getPageSizeVal();
822825

823826
if (accountName != null) {
824827
if (domainId != null) {
@@ -830,7 +833,8 @@ public Pair<List<? extends DedicatedResourceVO>, Integer> listDedicatedZones(Lis
830833
throw new InvalidParameterValueException("Please specify the domain id of the account: " + accountName);
831834
}
832835
}
833-
Pair<List<DedicatedResourceVO>, Integer> result = _dedicatedDao.searchDedicatedZones(zoneId, domainId, accountId, affinityGroupId);
836+
Filter searchFilter = new Filter(DedicatedResourceVO.class, "id", true, startIndex, pageSize);
837+
Pair<List<DedicatedResourceVO>, Integer> result = _dedicatedDao.searchDedicatedZones(zoneId, domainId, accountId, affinityGroupId, searchFilter);
834838
return new Pair<List<? extends DedicatedResourceVO>, Integer>(result.first(), result.second());
835839
}
836840

@@ -841,6 +845,8 @@ public Pair<List<? extends DedicatedResourceVO>, Integer> listDedicatedPods(List
841845
String accountName = cmd.getAccountName();
842846
Long accountId = null;
843847
Long affinityGroupId = cmd.getAffinityGroupId();
848+
Long startIndex = cmd.getStartIndex();
849+
Long pageSize = cmd.getPageSizeVal();
844850

845851
if (accountName != null) {
846852
if (domainId != null) {
@@ -852,7 +858,8 @@ public Pair<List<? extends DedicatedResourceVO>, Integer> listDedicatedPods(List
852858
throw new InvalidParameterValueException("Please specify the domain id of the account: " + accountName);
853859
}
854860
}
855-
Pair<List<DedicatedResourceVO>, Integer> result = _dedicatedDao.searchDedicatedPods(podId, domainId, accountId, affinityGroupId);
861+
Filter searchFilter = new Filter(DedicatedResourceVO.class, "id", true, startIndex, pageSize);
862+
Pair<List<DedicatedResourceVO>, Integer> result = _dedicatedDao.searchDedicatedPods(podId, domainId, accountId, affinityGroupId, searchFilter);
856863
return new Pair<List<? extends DedicatedResourceVO>, Integer>(result.first(), result.second());
857864
}
858865

@@ -863,6 +870,8 @@ public Pair<List<? extends DedicatedResourceVO>, Integer> listDedicatedClusters(
863870
String accountName = cmd.getAccountName();
864871
Long accountId = null;
865872
Long affinityGroupId = cmd.getAffinityGroupId();
873+
Long startIndex = cmd.getStartIndex();
874+
Long pageSize = cmd.getPageSizeVal();
866875

867876
if (accountName != null) {
868877
if (domainId != null) {
@@ -874,7 +883,8 @@ public Pair<List<? extends DedicatedResourceVO>, Integer> listDedicatedClusters(
874883
throw new InvalidParameterValueException("Please specify the domain id of the account: " + accountName);
875884
}
876885
}
877-
Pair<List<DedicatedResourceVO>, Integer> result = _dedicatedDao.searchDedicatedClusters(clusterId, domainId, accountId, affinityGroupId);
886+
Filter searchFilter = new Filter(DedicatedResourceVO.class, "id", true, startIndex, pageSize);
887+
Pair<List<DedicatedResourceVO>, Integer> result = _dedicatedDao.searchDedicatedClusters(clusterId, domainId, accountId, affinityGroupId, searchFilter);
878888
return new Pair<List<? extends DedicatedResourceVO>, Integer>(result.first(), result.second());
879889
}
880890

@@ -884,6 +894,8 @@ public Pair<List<? extends DedicatedResourceVO>, Integer> listDedicatedHosts(Lis
884894
Long domainId = cmd.getDomainId();
885895
String accountName = cmd.getAccountName();
886896
Long affinityGroupId = cmd.getAffinityGroupId();
897+
Long startIndex = cmd.getStartIndex();
898+
Long pageSize = cmd.getPageSizeVal();
887899

888900
Long accountId = null;
889901
if (accountName != null) {
@@ -896,8 +908,8 @@ public Pair<List<? extends DedicatedResourceVO>, Integer> listDedicatedHosts(Lis
896908
throw new InvalidParameterValueException("Please specify the domain id of the account: " + accountName);
897909
}
898910
}
899-
900-
Pair<List<DedicatedResourceVO>, Integer> result = _dedicatedDao.searchDedicatedHosts(hostId, domainId, accountId, affinityGroupId);
911+
Filter searchFilter = new Filter(DedicatedResourceVO.class, "id", true, startIndex, pageSize);
912+
Pair<List<DedicatedResourceVO>, Integer> result = _dedicatedDao.searchDedicatedHosts(hostId, domainId, accountId, affinityGroupId, searchFilter);
901913
return new Pair<List<? extends DedicatedResourceVO>, Integer>(result.first(), result.second());
902914
}
903915

‎server/src/com/cloud/dc/dao/DedicatedResourceDao.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import com.cloud.dc.DedicatedResourceVO;
2222
import com.cloud.utils.Pair;
23+
import com.cloud.utils.db.Filter;
2324
import com.cloud.utils.db.GenericDao;
2425

2526
public interface DedicatedResourceDao extends GenericDao<DedicatedResourceVO, Long> {
@@ -32,13 +33,13 @@ public interface DedicatedResourceDao extends GenericDao<DedicatedResourceVO, Lo
3233

3334
DedicatedResourceVO findByHostId(Long hostId);
3435

35-
Pair<List<DedicatedResourceVO>, Integer> searchDedicatedHosts(Long hostId, Long domainId, Long accountId, Long affinityGroupId);
36+
Pair<List<DedicatedResourceVO>, Integer> searchDedicatedHosts(Long hostId, Long domainId, Long accountId, Long affinityGroupId, Filter filter);
3637

37-
Pair<List<DedicatedResourceVO>, Integer> searchDedicatedClusters(Long clusterId, Long domainId, Long accountId, Long affinityGroupId);
38+
Pair<List<DedicatedResourceVO>, Integer> searchDedicatedClusters(Long clusterId, Long domainId, Long accountId, Long affinityGroupId, Filter filter);
3839

39-
Pair<List<DedicatedResourceVO>, Integer> searchDedicatedPods(Long podId, Long domainId, Long accountId, Long affinityGroupId);
40+
Pair<List<DedicatedResourceVO>, Integer> searchDedicatedPods(Long podId, Long domainId, Long accountId, Long affinityGroupId, Filter filter);
4041

41-
Pair<List<DedicatedResourceVO>, Integer> searchDedicatedZones(Long dataCenterId, Long domainId, Long accountId, Long affinityGroupId);
42+
Pair<List<DedicatedResourceVO>, Integer> searchDedicatedZones(Long dataCenterId, Long domainId, Long accountId, Long affinityGroupId, Filter filter);
4243

4344
List<DedicatedResourceVO> listByAccountId(Long accountId);
4445

‎server/src/com/cloud/dc/dao/DedicatedResourceDaoImpl.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.List;
2020

2121

22+
import com.cloud.utils.db.Filter;
2223
import org.springframework.stereotype.Component;
2324

2425
import com.cloud.dc.DedicatedResourceVO;
@@ -231,7 +232,7 @@ public DedicatedResourceVO findByHostId(Long hostId) {
231232
}
232233

233234
@Override
234-
public Pair<List<DedicatedResourceVO>, Integer> searchDedicatedZones(Long dataCenterId, Long domainId, Long accountId, Long affinityGroupId) {
235+
public Pair<List<DedicatedResourceVO>, Integer> searchDedicatedZones(Long dataCenterId, Long domainId, Long accountId, Long affinityGroupId, Filter filter) {
235236
SearchCriteria<DedicatedResourceVO> sc = ListAllZonesSearch.create();
236237
if (dataCenterId != null) {
237238
sc.setParameters("zoneId", dataCenterId);
@@ -247,11 +248,11 @@ public Pair<List<DedicatedResourceVO>, Integer> searchDedicatedZones(Long dataCe
247248
sc.setParameters("accountId", (Object)null);
248249
}
249250
}
250-
return searchAndCount(sc, null);
251+
return searchAndCount(sc, filter);
251252
}
252253

253254
@Override
254-
public Pair<List<DedicatedResourceVO>, Integer> searchDedicatedPods(Long podId, Long domainId, Long accountId, Long affinityGroupId) {
255+
public Pair<List<DedicatedResourceVO>, Integer> searchDedicatedPods(Long podId, Long domainId, Long accountId, Long affinityGroupId, Filter filter) {
255256
SearchCriteria<DedicatedResourceVO> sc = ListAllPodsSearch.create();
256257
if (podId != null) {
257258
sc.setParameters("podId", podId);
@@ -267,11 +268,11 @@ public Pair<List<DedicatedResourceVO>, Integer> searchDedicatedPods(Long podId,
267268
sc.setParameters("accountId", (Object)null);
268269
}
269270
}
270-
return searchAndCount(sc, null);
271+
return searchAndCount(sc, filter);
271272
}
272273

273274
@Override
274-
public Pair<List<DedicatedResourceVO>, Integer> searchDedicatedClusters(Long clusterId, Long domainId, Long accountId, Long affinityGroupId) {
275+
public Pair<List<DedicatedResourceVO>, Integer> searchDedicatedClusters(Long clusterId, Long domainId, Long accountId, Long affinityGroupId, Filter filter) {
275276
SearchCriteria<DedicatedResourceVO> sc = ListAllClustersSearch.create();
276277
if (clusterId != null) {
277278
sc.setParameters("clusterId", clusterId);
@@ -288,11 +289,11 @@ public Pair<List<DedicatedResourceVO>, Integer> searchDedicatedClusters(Long clu
288289
sc.setParameters("accountId", (Object)null);
289290
}
290291
}
291-
return searchAndCount(sc, null);
292+
return searchAndCount(sc, filter);
292293
}
293294

294295
@Override
295-
public Pair<List<DedicatedResourceVO>, Integer> searchDedicatedHosts(Long hostId, Long domainId, Long accountId, Long affinityGroupId) {
296+
public Pair<List<DedicatedResourceVO>, Integer> searchDedicatedHosts(Long hostId, Long domainId, Long accountId, Long affinityGroupId, Filter filter) {
296297
SearchCriteria<DedicatedResourceVO> sc = ListAllHostsSearch.create();
297298
if (hostId != null) {
298299
sc.setParameters("hostId", hostId);
@@ -308,7 +309,7 @@ public Pair<List<DedicatedResourceVO>, Integer> searchDedicatedHosts(Long hostId
308309
sc.setParameters("accountId", (Object)null);
309310
}
310311
}
311-
return searchAndCount(sc, null);
312+
return searchAndCount(sc, filter);
312313
}
313314

314315
@Override

‎server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import javax.inject.Inject;
3131
import javax.naming.ConfigurationException;
3232

33+
import com.cloud.utils.db.Filter;
3334
import com.cloud.utils.fsm.StateMachine2;
3435

3536
import org.apache.log4j.Logger;
@@ -639,21 +640,21 @@ private void checkForNonDedicatedResources(VirtualMachineProfile vmProfile, Data
639640
if (domainGroupMappings == null || domainGroupMappings.isEmpty()) {
640641
//The dedicated resource belongs to VM Account ID.
641642

642-
tempStorage = _dedicatedDao.searchDedicatedPods(null, vmDomainId, vmAccountId, null).first();
643+
tempStorage = _dedicatedDao.searchDedicatedPods(null, vmDomainId, vmAccountId, null, new Filter(DedicatedResourceVO.class, "id", true, 0L, 1L)).first();
643644

644645
for(DedicatedResourceVO vo : tempStorage) {
645646
allPodsFromDedicatedID.add(vo.getPodId());
646647
}
647648

648649
tempStorage.clear();
649-
tempStorage = _dedicatedDao.searchDedicatedClusters(null, vmDomainId, vmAccountId, null).first();
650+
tempStorage = _dedicatedDao.searchDedicatedClusters(null, vmDomainId, vmAccountId, null, new Filter(DedicatedResourceVO.class, "id", true, 0L, 1L)).first();
650651

651652
for(DedicatedResourceVO vo : tempStorage) {
652653
allClustersFromDedicatedID.add(vo.getClusterId());
653654
}
654655

655656
tempStorage.clear();
656-
tempStorage = _dedicatedDao.searchDedicatedHosts(null, vmDomainId, vmAccountId, null).first();
657+
tempStorage = _dedicatedDao.searchDedicatedHosts(null, vmDomainId, vmAccountId, null, new Filter(DedicatedResourceVO.class, "id", true, 0L, 1L)).first();
657658

658659
for(DedicatedResourceVO vo : tempStorage) {
659660
allHostsFromDedicatedID.add(vo.getHostId());
@@ -667,21 +668,21 @@ private void checkForNonDedicatedResources(VirtualMachineProfile vmProfile, Data
667668
else {
668669
//The dedicated resource belongs to VM Domain ID or No dedication.
669670

670-
tempStorage = _dedicatedDao.searchDedicatedPods(null, vmDomainId, null, null).first();
671+
tempStorage = _dedicatedDao.searchDedicatedPods(null, vmDomainId, null, null, new Filter(DedicatedResourceVO.class, "id", true, 0L, 1L)).first();
671672

672673
for(DedicatedResourceVO vo : tempStorage) {
673674
allPodsFromDedicatedID.add(vo.getPodId());
674675
}
675676

676677
tempStorage.clear();
677-
tempStorage = _dedicatedDao.searchDedicatedClusters(null, vmDomainId, null, null).first();
678+
tempStorage = _dedicatedDao.searchDedicatedClusters(null, vmDomainId, null, null, new Filter(DedicatedResourceVO.class, "id", true, 0L, 1L)).first();
678679

679680
for(DedicatedResourceVO vo : tempStorage) {
680681
allClustersFromDedicatedID.add(vo.getClusterId());
681682
}
682683

683684
tempStorage.clear();
684-
tempStorage = _dedicatedDao.searchDedicatedHosts(null, vmDomainId, null, null).first();
685+
tempStorage = _dedicatedDao.searchDedicatedHosts(null, vmDomainId, null, null, new Filter(DedicatedResourceVO.class, "id", true, 0L, 1L)).first();
685686

686687
for(DedicatedResourceVO vo : tempStorage) {
687688
allHostsFromDedicatedID.add(vo.getHostId());

0 commit comments

Comments
 (0)