Skip to content

Prevent NPE when removing NIC from a stopped VM using service offering with CPU cap set #12232

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

Draft
Pearl1594 wants to merge 4 commits into
base: 4.20
Choose a base branch
from
Draft

Prevent NPE when removing NIC from a stopped VM using service offering with CPU cap set #12232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
864071f
Prevent NPE when removing NIC from a stopped VM using service offerin…
Pearl1594 Dec 10, 2025
07cf173
fix test
Pearl1594 Dec 10, 2025
60e5ffc
removed unused import
Pearl1594 Dec 10, 2025
3dac829
fix test
Pearl1594 Dec 10, 2025
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
3 changes: 2 additions & 1 deletion server/src/main/java/com/cloud/hypervisor/KVMGuru.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ protected void setVmQuotaPercentage(VirtualMachineTO to, VirtualMachineProfile v
VirtualMachine vm = vmProfile.getVirtualMachine();
HostVO host = hostDao.findById(vm.getHostId());
if (host == null) {
throw new CloudRuntimeException("Host with id: " + vm.getHostId() + " not found");
logger.warn("Host is not available. Skipping CPU quota calculation for VM: {}", vm);
return;
}
logger.debug("Limiting CPU usage for VM: {} on host: {}", vm, host);
double hostMaxSpeed = getHostCPUSpeed(host);
Expand Down
4 changes: 2 additions & 2 deletions server/src/test/java/com/cloud/hypervisor/KVMGuruTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import com.cloud.storage.dao.GuestOSDao;
import com.cloud.storage.dao.GuestOSHypervisorDao;
import com.cloud.utils.Pair;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
import org.apache.cloudstack.api.ApiConstants;
Expand Down Expand Up @@ -141,10 +140,11 @@ public void testSetVmQuotaPercentage() {
Mockito.verify(vmTO).setCpuQuotaPercentage(Mockito.anyDouble());
}

@Test(expected = CloudRuntimeException.class)
@Test
public void testSetVmQuotaPercentageNullHost() {
Mockito.when(hostDao.findById(hostId)).thenReturn(null);
guru.setVmQuotaPercentage(vmTO, vmProfile);
Mockito.verify(vmTO, Mockito.never()).setCpuQuotaPercentage(Mockito.anyDouble());
}

@Test
Expand Down
Loading