Skip to content

merge attempt 20.3 -> 22.1 #12644

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

Closed
DaanHoogland wants to merge 9 commits into from
Closed

merge attempt 20.3 -> 22.1 #12644

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b45726f
ssvm: delete temp directory while deleting entity download url (#12562)
shwstppr Feb 11, 2026
4de8c2b
Add a Prometheus metric to track host certificate expiry (#12613)
nvazquez Feb 11, 2026
b7c970f
Fix issue with multiple KVM Host entries in host table (#12589)
nvazquez Feb 11, 2026
34f6f41
Fix injection of preset variables into the JS interpreter (#12515)
winterhazel Feb 11, 2026
18d6659
engine/schema: fix cluster/zone settings with encrypted values (#12626)
weizhouapache Feb 12, 2026
e22f842
Allow limit queries without random ordering (#12598)
sureshanaparti Feb 13, 2026
d8230c9
Usage: Heartbeat should not schedule usage job when a job is already …
abh1sar Feb 13, 2026
ae5308b
Fix issue when restoring backup after migration of volume (#12549)
Pearl1594 Feb 13, 2026
c7f300f
merge attempt 20.3 -> 22.1
Feb 17, 2026
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
Prev Previous commit
Next Next commit
Fix issue with multiple KVM Host entries in host table (#12589)
  • Loading branch information
@nvazquez
nvazquez authored Feb 11, 2026
commit b7c970f45f1deaba32171ab8a1aa15820009e7d9
2 changes: 2 additions & 0 deletions engine/components-api/src/main/java/com/cloud/resource/ResourceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ public interface ResourceManager extends ResourceService, Configurable {

public HostVO findHostByGuid(String guid);

HostVO findHostByGuidPrefix(String guid);

public HostVO findHostByName(String name);

HostStats getHostStatistics(Host host);
Expand Down
27 changes: 24 additions & 3 deletions server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2261,15 +2261,26 @@ private boolean checkCIDR(final HostPodVO pod, final String serverPrivateIP, fin
private HostVO getNewHost(StartupCommand[] startupCommands) {
StartupCommand startupCommand = startupCommands[0];

HostVO host = findHostByGuid(startupCommand.getGuid());
String fullGuid = startupCommand.getGuid();
logger.debug(String.format("Trying to find Host by guid %s", fullGuid));
HostVO host = findHostByGuid(fullGuid);

if (host != null) {
logger.debug(String.format("Found Host by guid %s: %s", fullGuid, host));
return host;
}

host = findHostByGuid(startupCommand.getGuidWithoutResource());
String guidPrefix = startupCommand.getGuidWithoutResource();
logger.debug(String.format("Trying to find Host by guid prefix %s", guidPrefix));
host = findHostByGuidPrefix(guidPrefix);

return host; // even when host == null!
if (host != null) {
logger.debug(String.format("Found Host by guid prefix %s: %s", guidPrefix, host));
return host;
}

logger.debug(String.format("Could not find Host by guid %s", fullGuid));
return null;
}

protected HostVO createHostVO(final StartupCommand[] cmds, final ServerResource resource, final Map<String, String> details, List<String> hostTags,
Expand Down Expand Up @@ -3296,13 +3307,23 @@ public List<HypervisorType> listAvailHypervisorInZone(final Long zoneId) {
public HostVO findHostByGuid(final String guid) {
final QueryBuilder<HostVO> sc = QueryBuilder.create(HostVO.class);
sc.and(sc.entity().getGuid(), Op.EQ, guid);
sc.and(sc.entity().getRemoved(), Op.NULL);
return sc.find();
}

@Override
public HostVO findHostByGuidPrefix(String guid) {
final QueryBuilder<HostVO> sc = QueryBuilder.create(HostVO.class);
sc.and(sc.entity().getGuid(), Op.LIKE, guid + "%");
sc.and(sc.entity().getRemoved(), Op.NULL);
return sc.find();
}

@Override
public HostVO findHostByName(final String name) {
final QueryBuilder<HostVO> sc = QueryBuilder.create(HostVO.class);
sc.and(sc.entity().getName(), Op.EQ, name);
sc.and(sc.entity().getRemoved(), Op.NULL);
return sc.find();
}

Expand Down
5 changes: 5 additions & 0 deletions server/src/test/java/com/cloud/resource/MockResourceManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,11 @@ public HostVO findHostByGuid(final String guid) {
return null;
}

@Override
public HostVO findHostByGuidPrefix(String guid) {
return null;
}

/* (non-Javadoc)
* @see com.cloud.resource.ResourceManager#findHostByName(java.lang.String)
*/
Expand Down
Loading