Skip to content

bll: Allow resuming Paused/Suspended VMs with older custom compatibil… #1178

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

Open
dupondje wants to merge 1 commit into
base: master
Choose a base branch
from
+85 −2
Open

bll: Allow resuming Paused/Suspended VMs with older custom compatibil… #1178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,8 +1078,13 @@ protected boolean validateImpl() {
return false;
}

if (getVm().getCustomCompatibilityVersion() != null &&
vm.getCustomCompatibilityVersion().less(getStoragePool().getCompatibilityVersion())) {
// Skip the compatibility version check when resuming a Paused or Suspended VM,
// since the VM was already running with its custom compatibility version before
// the data center was upgraded and is only being resumed, not started fresh.
if (vm.getCustomCompatibilityVersion() != null &&
vm.getCustomCompatibilityVersion().less(getStoragePool().getCompatibilityVersion()) &&
vm.getStatus() != VMStatus.Paused &&
vm.getStatus() != VMStatus.Suspended) {
return failValidation(EngineMessage.ACTION_TYPE_FAILED_VM_COMPATIBILITY_VERSION_NOT_SUPPORTED,
String.format("$VmName %1$s", getVm().getName()),
String.format("$VmVersion %1$s", getVm().getCustomCompatibilityVersion().toString()),
Expand Down
78 changes: 78 additions & 0 deletions backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import org.ovirt.engine.core.bll.context.CommandContext;
import org.ovirt.engine.core.bll.interfaces.BackendInternal;
import org.ovirt.engine.core.bll.network.host.NetworkDeviceHelper;
import org.ovirt.engine.core.bll.network.host.VfScheduler;
import org.ovirt.engine.core.bll.scheduling.SchedulingManager;
Expand All @@ -70,6 +71,8 @@
import org.ovirt.engine.core.common.businessentities.storage.StorageType;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.errors.EngineException;
import org.ovirt.engine.core.common.errors.EngineMessage;
import org.ovirt.engine.core.common.interfaces.ErrorTranslator;
import org.ovirt.engine.core.common.interfaces.VDSBrokerFrontend;
import org.ovirt.engine.core.common.osinfo.OsRepository;
import org.ovirt.engine.core.common.utils.VmDeviceType;
Expand All @@ -78,6 +81,7 @@
import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
import org.ovirt.engine.core.dao.DiskImageDao;
import org.ovirt.engine.core.dao.SnapshotDao;
import org.ovirt.engine.core.dao.StorageServerConnectionDao;
Expand Down Expand Up @@ -159,6 +163,12 @@ public class RunVmCommandTest extends BaseCommandTest {
@Mock
private ResourceManager resourceManager;

@Mock
private BackendInternal backend;

@Mock
private AuditLogDirector auditLogDirector;

private static final String ACTIVE_ISO_PREFIX =
"/rhev/data-center/mnt/some_computer/f6bccab4-e2f5-4e02-bba0-5748a7bc07b6/images/11111111-1111-1111-1111-111111111111";
private static final String INACTIVE_ISO_PREFIX = "";
Expand Down Expand Up @@ -376,6 +386,7 @@ public void setUp() {
doNothing().when(command).initParametersForExternalNetworks(null, false);
doReturn(Collections.emptyMap()).when(command).flushPassthroughVnicToVfMap();
doReturn(vmManager).when(command).getVmManager();
when(backend.getErrorsTranslator()).thenReturn(mock(ErrorTranslator.class));
mockBackend();
}

Expand All @@ -402,6 +413,73 @@ public void testValidate() {
ValidateTestUtils.runAndAssertValidateSuccess(command);
}

@Test
@MockedConfig("mockConfiguration")
public void testValidateFailsOnOlderCustomCompatibilityVersionWhenVmDown() {
final VM vm = new VM();
vm.setStatus(VMStatus.Down);
vm.setCustomCompatibilityVersion(new Version(4, 7));
command.setVm(vm);
StoragePool storagePool = new StoragePool();
storagePool.setCompatibilityVersion(new Version(4, 8));
command.setStoragePool(storagePool);
doReturn(true).when(command).checkRngDeviceClusterCompatibility();
doReturn(true).when(command).checkPayload(any());
doReturn(ValidationResult.VALID).when(command).checkDisksInBackupStorage();
doReturn(false).when(command).isVmDuringBackup();
doNothing().when(command).checkVmLeaseStorageDomain();
Cluster cluster = new Cluster();
cluster.setArchitecture(ArchitectureType.x86_64);
cluster.setCompatibilityVersion(new Version(4, 8));
command.setCluster(cluster);
ValidateTestUtils.runAndAssertValidateFailure(command,
EngineMessage.ACTION_TYPE_FAILED_VM_COMPATIBILITY_VERSION_NOT_SUPPORTED);
}

@Test
@MockedConfig("mockConfiguration")
public void testValidateSucceedsOnOlderCustomCompatibilityVersionWhenVmSuspended() {
final VM vm = new VM();
vm.setStatus(VMStatus.Suspended);
vm.setCustomCompatibilityVersion(new Version(4, 7));
command.setVm(vm);
StoragePool storagePool = new StoragePool();
storagePool.setCompatibilityVersion(new Version(4, 8));
command.setStoragePool(storagePool);
doReturn(true).when(command).checkRngDeviceClusterCompatibility();
doReturn(true).when(command).checkPayload(any());
doReturn(ValidationResult.VALID).when(command).checkDisksInBackupStorage();
doReturn(false).when(command).isVmDuringBackup();
doNothing().when(command).checkVmLeaseStorageDomain();
Cluster cluster = new Cluster();
cluster.setArchitecture(ArchitectureType.x86_64);
cluster.setCompatibilityVersion(new Version(4, 8));
command.setCluster(cluster);
ValidateTestUtils.runAndAssertValidateSuccess(command);
}

@Test
@MockedConfig("mockConfiguration")
public void testValidateSucceedsOnOlderCustomCompatibilityVersionWhenVmPaused() {
final VM vm = new VM();
vm.setStatus(VMStatus.Paused);
vm.setCustomCompatibilityVersion(new Version(4, 7));
command.setVm(vm);
StoragePool storagePool = new StoragePool();
storagePool.setCompatibilityVersion(new Version(4, 8));
command.setStoragePool(storagePool);
doReturn(true).when(command).checkRngDeviceClusterCompatibility();
doReturn(true).when(command).checkPayload(any());
doReturn(ValidationResult.VALID).when(command).checkDisksInBackupStorage();
doReturn(false).when(command).isVmDuringBackup();
doNothing().when(command).checkVmLeaseStorageDomain();
Cluster cluster = new Cluster();
cluster.setArchitecture(ArchitectureType.x86_64);
cluster.setCompatibilityVersion(new Version(4, 8));
command.setCluster(cluster);
ValidateTestUtils.runAndAssertValidateSuccess(command);
}
Comment on lines +439 to +481

@JasperB-TeamBlue JasperB-TeamBlue Aug 18, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Instead of writing two tests that share the same result and a lot of repetitive code this could be rewritten as a parameterized test

    @ParameterizedTest
    @EnumSource(value = VMStatus.class, names = {"Suspended", "Paused"})
    @MockedConfig("mockConfiguration")
    public void testValidateSucceedsOnOlderCustomCompatibilityVersionWhenVmSuspendedOrPaused(VMStatus vmStatus) {
        final VM vm = new VM();
        vm.setStatus(vmStatus);
        vm.setCustomCompatibilityVersion(new Version(4, 7));
        command.setVm(vm);
        StoragePool storagePool = new StoragePool();
        storagePool.setCompatibilityVersion(new Version(4, 8));
        command.setStoragePool(storagePool);
        doReturn(true).when(command).checkRngDeviceClusterCompatibility();
        doReturn(true).when(command).checkPayload(any());
        doReturn(ValidationResult.VALID).when(command).checkDisksInBackupStorage();
        doReturn(false).when(command).isVmDuringBackup();
        doNothing().when(command).checkVmLeaseStorageDomain();
        Cluster cluster = new Cluster();
        cluster.setArchitecture(ArchitectureType.x86_64);
        cluster.setCompatibilityVersion(new Version(4, 8));
        command.setCluster(cluster);
        ValidateTestUtils.runAndAssertValidateSuccess(command);
    }

This results in the same vm states being tested, but less repetitive code.


public static Stream<Arguments> validateUnsupportedRng() {
Set<VmRngDevice.Source> sourcesEmpty = new HashSet<>();
Set<VmRngDevice.Source> sourcesRandom = new HashSet<>();
Expand Down