Skip to content

vm-import: fix unmanaged instance listing #5400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sureshanaparti merged 3 commits into from
Feb 3, 2022
Merged

vm-import: fix unmanaged instance listing #5400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f20a8e
vm-import: fix unmanaged instance listing
shwstppr Jan 28, 2022
c23168b
use SearchBuilder to fix query condition
shwstppr Jan 31, 2022
84ff334
add paranthesis
shwstppr Jan 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,5 @@ public interface VMInstanceDao extends GenericDao<VMInstanceVO, Long>, StateDao<

void updateSystemVmTemplateId(long templateId, Hypervisor.HypervisorType hypervisorType);

List<VMInstanceVO> listByHostOrLastHostOrHostPod(long hostId, long podId);
}
19 changes: 18 additions & 1 deletion engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
import javax.annotation.PostConstruct;
import javax.inject.Inject;

import com.cloud.hypervisor.Hypervisor;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;

import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor;
import com.cloud.server.ResourceTag.ResourceObjectType;
import com.cloud.tags.dao.ResourceTagDao;
import com.cloud.utils.DateUtil;
Expand Down Expand Up @@ -961,6 +961,23 @@ public void updateSystemVmTemplateId(long templateId, Hypervisor.HypervisorType
} catch (Throwable e) {
throw new CloudRuntimeException("Caught: " + sql, e);
}
}

@Override
public List<VMInstanceVO> listByHostOrLastHostOrHostPod(long hostId, long podId) {
SearchBuilder<VMInstanceVO> sb = createSearchBuilder();
sb.or().op("hostId", sb.entity().getHostId(), Op.EQ);
sb.or("lastHostId", sb.entity().getLastHostId(), Op.EQ);
sb.and().op("hostIdNull", sb.entity().getHostId(), SearchCriteria.Op.NULL);
sb.and("lastHostIdNull", sb.entity().getHostId(), SearchCriteria.Op.NULL);
sb.and("podId", sb.entity().getPodIdToDeployIn(), Op.EQ);
sb.cp();
sb.cp();
sb.done();
SearchCriteria<VMInstanceVO> sc = sb.create();
sc.setParameters("hostId", String.valueOf(hostId));
sc.setParameters("lastHostId", String.valueOf(hostId));
sc.setParameters("podId", String.valueOf(podId));
return listBy(sc);
}
}
15 changes: 3 additions & 12 deletions server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

import javax.inject.Inject;

Expand Down Expand Up @@ -363,18 +364,8 @@ private List<String> getAdditionalNameFilters(Cluster cluster) {
}

private List<String> getHostManagedVms(Host host) {
List<String> managedVms = new ArrayList<>();
List<VMInstanceVO> instances = vmDao.listByHostId(host.getId());
for (VMInstanceVO instance : instances) {
managedVms.add(instance.getInstanceName());
}
instances = vmDao.listByLastHostIdAndStates(host.getId(),
VirtualMachine.State.Stopped, VirtualMachine.State.Destroyed,
VirtualMachine.State.Expunging, VirtualMachine.State.Error,
VirtualMachine.State.Unknown, VirtualMachine.State.Shutdown);
for (VMInstanceVO instance : instances) {
managedVms.add(instance.getInstanceName());
}
List<VMInstanceVO> instances = vmDao.listByHostOrLastHostOrHostPod(host.getId(), host.getPodId());
List<String> managedVms = instances.stream().map(VMInstanceVO::getInstanceName).collect(Collectors.toList());
return managedVms;
}

Expand Down