From 8d44b43dd498f1ad31dec35d401985b8c1cd0fab Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Wed, 22 Jul 2026 15:03:56 +0200 Subject: [PATCH 1/2] add an maintenance prepare error event --- api/src/main/java/com/cloud/event/EventTypes.java | 2 ++ .../com/cloud/resource/ResourceManagerImpl.java | 3 +++ .../com/cloud/resource/ResourceManagerImplTest.java | 13 +++++++++++++ 3 files changed, 18 insertions(+) diff --git a/api/src/main/java/com/cloud/event/EventTypes.java b/api/src/main/java/com/cloud/event/EventTypes.java index 81ed185dae5a..3ef7db9ea82d 100644 --- a/api/src/main/java/com/cloud/event/EventTypes.java +++ b/api/src/main/java/com/cloud/event/EventTypes.java @@ -458,6 +458,7 @@ public class EventTypes { public static final String EVENT_MAINTENANCE_CANCEL = "MAINT.CANCEL"; public static final String EVENT_MAINTENANCE_CANCEL_PRIMARY_STORAGE = "MAINT.CANCEL.PS"; public static final String EVENT_MAINTENANCE_PREPARE = "MAINT.PREPARE"; + public static final String EVENT_MAINTENANCE_PREPARE_ERROR = "MAINT.PREPARE.ERROR"; public static final String EVENT_MAINTENANCE_PREPARE_PRIMARY_STORAGE = "MAINT.PREPARE.PS"; // Primary storage pool @@ -1046,6 +1047,7 @@ public class EventTypes { entityEventDetails.put(EVENT_MAINTENANCE_CANCEL, Host.class); entityEventDetails.put(EVENT_MAINTENANCE_CANCEL_PRIMARY_STORAGE, Host.class); entityEventDetails.put(EVENT_MAINTENANCE_PREPARE, Host.class); + entityEventDetails.put(EVENT_MAINTENANCE_PREPARE_ERROR, Host.class); entityEventDetails.put(EVENT_MAINTENANCE_PREPARE_PRIMARY_STORAGE, Host.class); // Primary storage pool diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java index a6a75fc39613..e0185a10c4f3 100755 --- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java @@ -1730,6 +1730,9 @@ protected boolean setHostIntoErrorInPrepareForMaintenance(HostVO host, List ActionEventUtils.onCompletedActionEvent( + anyLong(), anyLong(), eq(EventVO.LEVEL_ERROR), eq(EventTypes.EVENT_MAINTENANCE_PREPARE_ERROR), + eq(expectedDescription), eq(hostId), isNull(), eq(0L))); Assert.assertFalse(enterMaintenanceMode); } + @Test + public void testMaintenancePrepareErrorEventMapsToHostEntity() { + Assert.assertEquals(Host.class, EventTypes.getEntityClassForEvent(EventTypes.EVENT_MAINTENANCE_PREPARE_ERROR)); + } + private void verifyReturnToPrepareForMaintenanceCalls() throws NoTransitionException { boolean enterMaintenanceMode = resourceManager.checkAndMaintain(hostId); verify(resourceManager).attemptMaintain(host); From 277dfb2dffb529bcf48bc24d077d4a1b649d776d Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Wed, 21 Oct 2026 09:23:31 +0200 Subject: [PATCH 2/2] emit error event on ErrorInMaintenance, not just ErrorInPrepareForMaintenance --- .../src/main/java/com/cloud/resource/ResourceManagerImpl.java | 3 +++ .../test/java/com/cloud/resource/ResourceManagerImplTest.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java index e0185a10c4f3..113ea3949857 100755 --- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java @@ -1723,6 +1723,9 @@ protected boolean setHostIntoErrorInMaintenance(HostVO host, List _haMgr.cancelScheduledMigrations(host); configureVncAccessForKVMHostFailedMigrations(host, errorVms); resourceStateTransitTo(host, ResourceState.Event.UnableToMaintain, _nodeId); + ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(), CallContext.current().getCallingAccountId(), + EventVO.LEVEL_ERROR, EventTypes.EVENT_MAINTENANCE_PREPARE_ERROR, + String.format("failed to put host %s into maintenance due to running VMs that could not be migrated or VMs in error state", host), host.getId(), null, 0); return false; } diff --git a/server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java b/server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java index 5bf924ef34dd..32d98cc62984 100644 --- a/server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java +++ b/server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java @@ -524,6 +524,7 @@ private void setupErrorVms() { } private void verifyErrorInMaintenanceCalls() throws NoTransitionException { + when(host.getResourceState()).thenReturn(ResourceState.PrepareForMaintenance); boolean enterMaintenanceMode = resourceManager.checkAndMaintain(hostId); verify(resourceManager).attemptMaintain(host); verify(resourceManager).setHostIntoErrorInMaintenance(eq(host), any()); @@ -531,6 +532,9 @@ private void verifyErrorInMaintenanceCalls() throws NoTransitionException { verify(resourceManager, never()).setHostIntoErrorInPrepareForMaintenance(any(), any()); verify(resourceManager, never()).setHostIntoPrepareForMaintenanceAfterErrorsFixed(any()); verify(resourceManager).resourceStateTransitTo(eq(host), eq(UnableToMaintain), anyLong()); + actionEventUtilsMocked.verify(() -> ActionEventUtils.onCompletedActionEvent( + anyLong(), anyLong(), eq(EventVO.LEVEL_ERROR), eq(EventTypes.EVENT_MAINTENANCE_PREPARE_ERROR), + anyString(), eq(hostId), isNull(), eq(0L))); Assert.assertFalse(enterMaintenanceMode); }