merge attempt 20.3 -> 22.1 by DaanHoogland · Pull Request #12644 · apache/cloudstack

DaanHoogland · 2026-02-14T16:52:01Z

Description

This PR...

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)
Build/CI
Test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

…running (#12616)

DaanHoogland · 2026-02-14T16:53:35Z

@abh1sar @Pearl1594 @winterhazel , I did a merge forward and after hours of fixing still have some unit test problems. In general I feel quite unsure if all your PRs came out of my tinkering ok. Can you have a look please?

codecov · 2026-02-14T16:58:46Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 3.70%. Comparing base (7324ef4) to head (c7f300f).
⚠️ Report is 9 commits behind head on 4.22.

❗ There is a different number of reports uploaded between BASE (7324ef4) and HEAD (c7f300f). Click for more details.

HEAD has 1 upload less than BASE

Flag BASE (7324ef4) HEAD (c7f300f)

unittests 1 0

Additional details and impacted files

@@              Coverage Diff              @@
##               4.22   #12644       +/-   ##
=============================================
- Coverage     17.62%    3.70%   -13.92%     
=============================================
  Files          5917      448     -5469     
  Lines        531255    38018   -493237     
  Branches      64951     7035    -57916     
=============================================
- Hits          93639     1409    -92230     
+ Misses       427077    36422   -390655     
+ Partials      10539      187    -10352

Flag	Coverage Δ
uitests	`3.70% <ø> (ø)`
unittests	`?`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

abh1sar

Looked at Backup and Usage related files. Suggested fixes should get a successful build.

Functionality wise #12549 might not work in 4.22 as there were lots of changes. I'll test and raise a separate PR in 4.22 for that.

plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java

abh1sar · 2026-02-16T08:57:02Z

...t/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapperTest.java

        PrimaryDataStoreTO primaryDataStore = Mockito.mock(PrimaryDataStoreTO.class);
        when(command.getRestoreVolumePools()).thenReturn(Arrays.asList(primaryDataStore));
        when(command.getRestoreVolumePaths()).thenReturn(Arrays.asList("/var/lib/libvirt/images/volume-123"));
-        when(command.getRestoreVolumeUUID()).thenReturn("volume-123");


Add when(command.getBackupFiles()).thenReturn(Arrays.asList("volume-123"));

...t/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapperTest.java

abh1sar · 2026-02-16T08:58:25Z

...t/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapperTest.java

        PrimaryDataStoreTO primaryDataStore = Mockito.mock(PrimaryDataStoreTO.class);
        when(command.getRestoreVolumePools()).thenReturn(Arrays.asList(primaryDataStore));
        when(command.getRestoreVolumePaths()).thenReturn(Arrays.asList("/var/lib/libvirt/images/volume-123"));
-        when(command.getRestoreVolumeUUID()).thenReturn("volume-123");


Add when(command.getBackupFiles()).thenReturn(Arrays.asList("volume-123"));

abh1sar · 2026-02-16T08:58:38Z

...t/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapperTest.java

        PrimaryDataStoreTO primaryDataStore = Mockito.mock(PrimaryDataStoreTO.class);
        when(command.getRestoreVolumePools()).thenReturn(Arrays.asList(primaryDataStore));
        when(command.getRestoreVolumePaths()).thenReturn(Arrays.asList("/var/lib/libvirt/images/volume-123"));
-        when(command.getRestoreVolumeUUID()).thenReturn("volume-123");


Add when(command.getBackupFiles()).thenReturn(Arrays.asList("volume-123"));

abh1sar · 2026-02-16T08:58:48Z

...t/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapperTest.java

        PrimaryDataStoreTO primaryDataStore = Mockito.mock(PrimaryDataStoreTO.class);
        when(command.getRestoreVolumePools()).thenReturn(Arrays.asList(primaryDataStore));
        lenient().when(command.getRestoreVolumePaths()).thenReturn(Arrays.asList("/var/lib/libvirt/images/volume-123"));
-        lenient().when(command.getRestoreVolumeUUID()).thenReturn("volume-123");


Add when(command.getBackupFiles()).thenReturn(Arrays.asList("volume-123"));

...t/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapperTest.java

...ava/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java

winterhazel · 2026-02-16T11:27:21Z

...rk/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Value.java

-import com.cloud.vm.snapshot.VMSnapshot;
 import org.apache.cloudstack.quota.constant.QuotaTypes;

 public class Value extends GenericPresetVariable {


provisioningType and volumeType need to be converted to Strings in this class

...ava/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java

DaanHoogland · 2026-02-16T12:19:49Z

thanks @abh1sar @winterhazel , I will give it another go this afternoon/evening

...t/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapperTest.java

DaanHoogland · 2026-02-16T23:15:03Z

@abh1sar more errors

[INFO] Running com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRestoreBackupCommandWrapperTest
00:06:55.822 [main] ERROR com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRestoreBackupCommandWrapper - Failed to mount repository {} of type {} to the directory {}
00:06:55.829 [main] ERROR com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRestoreBackupCommandWrapper - Failed to create the tmp mount directory {} for restore
java.io.IOException: Failed to create temp directory
	at java.nio.file.Files.createTempDirectory(Files.java:1007) ~[?:?]
	at com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRestoreBackupCommandWrapper.mountBackupDirectory(LibvirtRestoreBackupCommandWrapper.java:188) ~[classes/:?]
	at com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRestoreBackupCommandWrapper.execute(LibvirtRestoreBackupCommandWrapper.java:83) ~[classes/:?]
	at com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRestoreBackupCommandWrapperTest.testExecuteWithTempDirectoryCreationFailure(LibvirtRestoreBackupCommandWrapperTest.java:472) ~[test-classes/:?]
	at jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[?:?]
	at jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[?:?]
	at jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[?:?]
	at java.lang.reflect.Method.invoke(Method.java:566) ~[?:?]
	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59) ~[junit-4.13.2.jar:4.13.2]
	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) ~[junit-4.13.2.jar:4.13.2]
	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56) ~[junit-4.13.2.jar:4.13.2]
	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17) ~[junit-4.13.2.jar:4.13.2]
	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26) ~[junit-4.13.2.jar:4.13.2]
	at org.mockito.internal.runners.DefaultInternalRunner$1$1.evaluate(DefaultInternalRunner.java:55) ~[mockito-core-5.16.1.jar:?]
	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) ~[junit-4.13.2.jar:4.13.2]
	at org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100) ~[junit-4.13.2.jar:4.13.2]
	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366) ~[junit-4.13.2.jar:4.13.2]
	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103) ~[junit-4.13.2.jar:4.13.2]
	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63) ~[junit-4.13.2.jar:4.13.2]
	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331) ~[junit-4.13.2.jar:4.13.2]
	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79) ~[junit-4.13.2.jar:4.13.2]
	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329) ~[junit-4.13.2.jar:4.13.2]
	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66) ~[junit-4.13.2.jar:4.13.2]
	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293) ~[junit-4.13.2.jar:4.13.2]
	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) ~[junit-4.13.2.jar:4.13.2]
	at org.junit.runners.ParentRunner.run(ParentRunner.java:413) ~[junit-4.13.2.jar:4.13.2]
	at org.mockito.internal.runners.DefaultInternalRunner$1.run(DefaultInternalRunner.java:100) ~[mockito-core-5.16.1.jar:?]
	at org.mockito.internal.runners.DefaultInternalRunner.run(DefaultInternalRunner.java:107) ~[mockito-core-5.16.1.jar:?]
	at org.mockito.internal.runners.StrictRunner.run(StrictRunner.java:42) ~[mockito-core-5.16.1.jar:?]
	at org.mockito.junit.MockitoJUnitRunner.run(MockitoJUnitRunner.java:163) ~[mockito-core-5.16.1.jar:?]
	at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:365) ~[surefire-junit4-2.22.2.jar:2.22.2]
	at org.apache.maven.surefire.junit4.JUnit4Provider.executeWithRerun(JUnit4Provider.java:273) ~[surefire-junit4-2.22.2.jar:2.22.2]
	at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:238) ~[surefire-junit4-2.22.2.jar:2.22.2]
	at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:159) ~[surefire-junit4-2.22.2.jar:2.22.2]
	at org.apache.maven.surefire.booter.ForkedBooter.invokeProviderInSameClassLoader(ForkedBooter.java:384) ~[surefire-booter-2.22.2.jar:2.22.2]
	at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:345) ~[surefire-booter-2.22.2.jar:2.22.2]
	at org.apache.maven.surefire.booter.ForkedBooter.execute(ForkedBooter.java:126) ~[surefire-booter-2.22.2.jar:2.22.2]
	at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:418) ~[surefire-booter-2.22.2.jar:2.22.2]
[ERROR] Tests run: 11, Failures: 0, Errors: 3, Skipped: 0, Time elapsed: 0.239 s <<< FAILURE! - in com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRestoreBackupCommandWrapperTest
[ERROR] testExecuteWithMultipleVolumes(com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRestoreBackupCommandWrapperTest)  Time elapsed: 0.002 s  <<< ERROR!
java.lang.IndexOutOfBoundsException: Index: 0, Size: 0
	at com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRestoreBackupCommandWrapperTest.testExecuteWithMultipleVolumes(LibvirtRestoreBackupCommandWrapperTest.java:517)

[ERROR] testExecuteWithVmExistsTrue(com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRestoreBackupCommandWrapperTest)  Time elapsed: 0.001 s  <<< ERROR!
java.lang.IndexOutOfBoundsException: Index: 0, Size: 0
	at com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRestoreBackupCommandWrapperTest.testExecuteWithVmExistsTrue(LibvirtRestoreBackupCommandWrapperTest.java:130)

[ERROR] testExecuteWithVmExistsFalse(com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRestoreBackupCommandWrapperTest)  Time elapsed: 0.001 s  <<< ERROR!
java.lang.IndexOutOfBoundsException: Index: 0, Size: 0
	at com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRestoreBackupCommandWrapperTest.testExecuteWithVmExistsFalse(LibvirtRestoreBackupCommandWrapperTest.java:167)

can you give a clue? cc @Pearl1594

abh1sar · 2026-02-17T02:03:46Z

[INFO] Running com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRestoreBackupCommandWrapperTest
00:06:55.822 [main] ERROR com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRestoreBackupCommandWrapper - Failed to mount repository {} of type {} to the directory {}
00:06:55.829 [main] ERROR com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRestoreBackupCommandWrapper - Failed to create the tmp mount directory {} for restore
java.io.IOException: Failed to create temp directory

@DaanHoogland this is not an error. it is an expected exception.

[ERROR] Tests run: 11, Failures: 0, Errors: 3, Skipped: 0, Time elapsed: 0.239 s <<< FAILURE! - in com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRestoreBackupCommandWrapperTest

Do you have logs for the 3 Errors? I don't see this in the current failed build logs

abh1sar

when(command.getBackupFiles()). .. is missing from 3 places

...t/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapperTest.java

DaanHoogland · 2026-02-17T10:57:43Z

merge forward based on advice here done directly

github-actions · 2026-02-17T11:58:37Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

shwstppr and others added 8 commits February 11, 2026 10:35

ssvm: delete temp directory while deleting entity download url (#12562)

b45726f

Add a Prometheus metric to track host certificate expiry (#12613)

4de8c2b

Fix issue with multiple KVM Host entries in host table (#12589)

b7c970f

Fix injection of preset variables into the JS interpreter (#12515)

34f6f41

engine/schema: fix cluster/zone settings with encrypted values (#12626)

18d6659

Allow limit queries without random ordering (#12598)

e22f842

Usage: Heartbeat should not schedule usage job when a job is already …

d8230c9

…running (#12616)

Fix issue when restoring backup after migration of volume (#12549)

ae5308b

DaanHoogland requested review from abh1sar and winterhazel February 14, 2026 16:52

boring-cyborg bot added component:database component:quota component:storage labels Feb 14, 2026

abh1sar approved these changes Feb 16, 2026

View reviewed changes

winterhazel reviewed Feb 16, 2026

View reviewed changes

DaanHoogland commented Feb 16, 2026

View reviewed changes

...t/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapperTest.java Outdated Show resolved Hide resolved

DaanHoogland commented Feb 16, 2026

View reviewed changes

...t/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapperTest.java Outdated Show resolved Hide resolved

DaanHoogland commented Feb 16, 2026

View reviewed changes

...t/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapperTest.java Outdated Show resolved Hide resolved

DaanHoogland commented Feb 16, 2026

View reviewed changes

...t/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapperTest.java Outdated Show resolved Hide resolved

merge attempt 20.3 -> 22.1

c7f300f

DaanHoogland force-pushed the 22-merge-issues branch from be07299 to c7f300f Compare February 17, 2026 07:42

abh1sar reviewed Feb 17, 2026

View reviewed changes

DaanHoogland closed this Feb 17, 2026

github-actions bot added the status:has-conflicts label Feb 17, 2026

Conversation

DaanHoogland commented Feb 14, 2026

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Uh oh!

DaanHoogland commented Feb 14, 2026

Uh oh!

codecov bot commented Feb 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

abh1sar left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

abh1sar Feb 16, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

abh1sar Feb 16, 2026

Choose a reason for hiding this comment

Uh oh!

abh1sar Feb 16, 2026

Choose a reason for hiding this comment

Uh oh!

abh1sar Feb 16, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

winterhazel Feb 16, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DaanHoogland commented Feb 16, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DaanHoogland commented Feb 16, 2026

Uh oh!

abh1sar commented Feb 17, 2026

Uh oh!

abh1sar left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DaanHoogland commented Feb 17, 2026

Uh oh!

github-actions bot commented Feb 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

codecov bot commented Feb 14, 2026 •

edited

Loading