Skip to content

engine/schema: fix new systemvm template is not registered during upgrade if hypervisor is not KVM #12952

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
abh1sar merged 3 commits into from
Apr 6, 2026
Merged

engine/schema: fix new systemvm template is not registered during upgrade if hypervisor is not KVM #12952

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f75453
engine/schema: fix new systemvm template is not registered during upg…
weizhouapache Apr 2, 2026
c0cbf79
fix test failure
weizhouapache Apr 2, 2026
57e1850
same code as main
weizhouapache Apr 2, 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
10 changes: 5 additions & 5 deletions engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,11 +315,11 @@ public void setUpdated(Date updated) {
public static final List<Pair<Hypervisor.HypervisorType, CPU.CPUArch>> hypervisorList = Arrays.asList(
new Pair<>(Hypervisor.HypervisorType.KVM, CPU.CPUArch.amd64),
new Pair<>(Hypervisor.HypervisorType.KVM, CPU.CPUArch.arm64),
new Pair<>(Hypervisor.HypervisorType.VMware, null),
new Pair<>(Hypervisor.HypervisorType.XenServer, null),
new Pair<>(Hypervisor.HypervisorType.Hyperv, null),
new Pair<>(Hypervisor.HypervisorType.LXC, null),
new Pair<>(Hypervisor.HypervisorType.Ovm3, null)
new Pair<>(Hypervisor.HypervisorType.VMware, CPU.CPUArch.getDefault()),
new Pair<>(Hypervisor.HypervisorType.XenServer, CPU.CPUArch.getDefault()),
new Pair<>(Hypervisor.HypervisorType.Hyperv, CPU.CPUArch.getDefault()),
new Pair<>(Hypervisor.HypervisorType.LXC, CPU.CPUArch.getDefault()),
new Pair<>(Hypervisor.HypervisorType.Ovm3, CPU.CPUArch.getDefault())
Copy link
Copy Markdown
Contributor

@sureshanaparti sureshanaparti Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@weizhouapache when arch type is null, it's defaulted to amd64, is null arch issue here?

cloudstack/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java

Lines 402 to 408 in e2497cf

protected static String getHypervisorArchKey(Hypervisor.HypervisorType hypervisorType, CPU.CPUArch arch) {
if (Hypervisor.HypervisorType.KVM.equals(hypervisorType)) {
return String.format("%s-%s", hypervisorType.name().toLowerCase(),
arch == null ? CPU.CPUArch.amd64.getType() : arch.getType());
}
return hypervisorType.name().toLowerCase();
}

Copy link
Copy Markdown
Contributor

@sureshanaparti sureshanaparti Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also, make note of the changes in the below PR in main (no need of forward merging the changes here to main)

https://github.com/apache/cloudstack/pull/11656/changes#diff-a9c9a38684718059c060de404bf9529de96e502f1e81b30793e6a32f725042a9

Copy link
Copy Markdown
Member Author

@weizhouapache weizhouapache Apr 2, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sureshanaparti
in another place

the arch of MetadataTemplateDetails is from hypervisorType, which is null for non-KVM

            NewTemplateMap.put(key, new MetadataTemplateDetails(
                    hypervisorType.first(),
                    section.get("templatename"),
                    section.get("filename"),
                    section.get("downloadurl"),
                    section.get("checksum"),
                    hypervisorType.second(),
                    section.get("guestos")));

but in hypervisorsInUse, the arch is amd64/x86_64 (default arch of clusters)

cloudstack/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java

Line 1068 in e2497cf

hypervisorsInUse = clusterDao.listDistinctHypervisorsArchAcrossClusters(null);

cluster arch

mysql> SELECT DISTINCT hypervisor_type,arch from cluster;
+-----------------+--------+
| hypervisor_type | arch   |
+-----------------+--------+
| VMware          | x86_64 |
+-----------------+--------+
1 row in set (0.00 sec)

so the check always return false (line 1034)

cloudstack/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java

Lines 1032 to 1034 in e2497cf

boolean isHypervisorArchMatchMetadata = hypervisorsInUse.stream()
.anyMatch(p -> p.first().equals(templateDetails.getHypervisorType())
&& Objects.equals(p.second(), templateDetails.getArch()));

Copy link
Copy Markdown
Member Author

@weizhouapache weizhouapache Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also, make note of the changes in the below PR in main (no need of forward merging the changes here to main)

https://github.com/apache/cloudstack/pull/11656/changes#diff-a9c9a38684718059c060de404bf9529de96e502f1e81b30793e6a32f725042a9

good point @sureshanaparti
so the issue should not appear in 4.22, great

Copy link
Copy Markdown
Contributor

@sureshanaparti sureshanaparti Apr 2, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok @weizhouapache, how about replacing hypervisorType.second() == null ? CPU.CPUArch.amd64.getType() : hypervisorType.second().getType() at

cloudstack/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java

Line 837 in e2497cf

hypervisorType.second(),

maybe, move it to method and use the call same method here and in getHypervisorArchKey()

private String getCPUArchType(CPU.CPUArch arch) {
    if (arch == null) {
        return CPU.CPUArch.amd64.getType();
    }
    return arch.getType();
}

);

public static final Map<String, MetadataTemplateDetails> NewTemplateMap = new HashMap<>();
Expand Down
2 changes: 1 addition & 1 deletion engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public void test_parseMetadataFile_success() {
templateDetails =
SystemVmTemplateRegistration.NewTemplateMap.get("vmware");
assertNotNull(templateDetails);
assertNull(templateDetails.getArch());
assertEquals(CPU.CPUArch.amd64, templateDetails.getArch());
assertEquals(Hypervisor.HypervisorType.VMware, templateDetails.getHypervisorType());
}

Expand Down
Loading