apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE when sending copy command to least busy SSVM (#9125)

Browse Source
This commit is contained in:
Fabricio Duarte 2024-08-28 07:06:16 -03:00 committed by GitHub
parent c05edc40f4
commit 7692b745e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,4 +169,6 @@ public interface HostDao extends GenericDao<HostVO, Long>, StateDao<Status, Stat
List<HostVO> findHostsWithTagRuleThatMatchComputeOferringTags(String computeOfferingTags); List<HostVO> findHostsWithTagRuleThatMatchComputeOferringTags(String computeOfferingTags);
List<Long> findClustersThatMatchHostTagRule(String computeOfferingTags); List<Long> findClustersThatMatchHostTagRule(String computeOfferingTags);
List<Long> listSsvmHostsWithPendingMigrateJobsOrderedByJobCount();
} }

25
engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
View File

@ -1371,6 +1371,31 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
return new ArrayList<>(result); return new ArrayList<>(result);
} }
@Override
public List<Long> listSsvmHostsWithPendingMigrateJobsOrderedByJobCount() {
String query = "SELECT cel.host_id, COUNT(*) " +
"FROM cmd_exec_log cel " +
"JOIN host h ON cel.host_id = h.id " +
"WHERE h.removed IS NULL " +
"GROUP BY cel.host_id " +
"ORDER BY 2";
TransactionLegacy txn = TransactionLegacy.currentTxn();
List<Long> result = new ArrayList<>();
PreparedStatement pstmt;
try {
pstmt = txn.prepareAutoCloseStatement(query);
ResultSet rs = pstmt.executeQuery();
while (rs.next()) {
result.add((long) rs.getInt(1));
}
} catch (SQLException e) {
logger.warn("SQLException caught while listing SSVMs with least migrate jobs.", e);
}
return result;
}
private String getHostIdsByComputeTags(List<String> offeringTags){ private String getHostIdsByComputeTags(List<String> offeringTags){
List<String> questionMarks = new ArrayList(); List<String> questionMarks = new ArrayList();
offeringTags.forEach((tag) -> { questionMarks.add("?"); }); offeringTags.forEach((tag) -> { questionMarks.add("?"); });

26
engine/storage/src/main/java/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java
View File

@ -20,9 +20,6 @@ package org.apache.cloudstack.storage.image;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
@ -87,7 +84,6 @@ import com.cloud.storage.dao.VMTemplateZoneDao;
import com.cloud.storage.dao.VolumeDao; import com.cloud.storage.dao.VolumeDao;
import com.cloud.storage.download.DownloadMonitor; import com.cloud.storage.download.DownloadMonitor;
import com.cloud.utils.NumbersUtil; import com.cloud.utils.NumbersUtil;
import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.Proxy; import com.cloud.utils.net.Proxy;
import com.cloud.vm.VirtualMachineManager; import com.cloud.vm.VirtualMachineManager;
@ -425,8 +421,9 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver {
private Answer sendToLeastBusyEndpoint(List<EndPoint> eps, CopyCommand cmd) { private Answer sendToLeastBusyEndpoint(List<EndPoint> eps, CopyCommand cmd) {
Answer answer = null; Answer answer = null;
EndPoint endPoint = null; EndPoint endPoint = null;
List<Long> epIds = ssvmWithLeastMigrateJobs();
logger.debug("Picking SSVM from the pool with least commands running on it.");
List<Long> epIds = hostDao.listSsvmHostsWithPendingMigrateJobsOrderedByJobCount();
if (epIds.isEmpty()) { if (epIds.isEmpty()) {
Collections.shuffle(eps); Collections.shuffle(eps);
endPoint = eps.get(0); endPoint = eps.get(0);
@ -533,23 +530,4 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver {
private Integer getCopyCmdsCountToSpecificSSVM(Long ssvmId) { private Integer getCopyCmdsCountToSpecificSSVM(Long ssvmId) {
return _cmdExecLogDao.getCopyCmdCountForSSVM(ssvmId); return _cmdExecLogDao.getCopyCmdCountForSSVM(ssvmId);
} }
private List<Long> ssvmWithLeastMigrateJobs() {
logger.debug("Picking ssvm from the pool with least commands running on it");
String query = "select host_id, count(*) from cmd_exec_log group by host_id order by 2;";
TransactionLegacy txn = TransactionLegacy.currentTxn();
List<Long> result = new ArrayList<Long>();
PreparedStatement pstmt = null;
try {
pstmt = txn.prepareAutoCloseStatement(query);
ResultSet rs = pstmt.executeQuery();
while (rs.next()) {
result.add((long) rs.getInt(1));
}
} catch (SQLException e) {
logger.debug("SQLException caught", e);
}
return result;
}
} }