From 896e321465cdfceb7b8fa527a170a5aa7e59a192 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 27 Nov 2025 08:06:38 +0530 Subject: [PATCH] server: fix remove management server Fixes #12137 Signed-off-by: Abhishek Kumar --- .../com/cloud/server/ManagementServerImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java index 9e8fdb60694e..447edd275c28 100644 --- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java +++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java @@ -682,15 +682,15 @@ import com.cloud.alert.AlertVO; import com.cloud.alert.dao.AlertDao; import com.cloud.api.ApiDBUtils; -import com.cloud.api.query.dao.ManagementServerJoinDao; import com.cloud.api.query.dao.StoragePoolJoinDao; -import com.cloud.api.query.vo.ManagementServerJoinVO; import com.cloud.api.query.vo.StoragePoolJoinVO; import com.cloud.capacity.Capacity; import com.cloud.capacity.CapacityVO; import com.cloud.capacity.dao.CapacityDao; import com.cloud.capacity.dao.CapacityDaoImpl.SummedCapacity; import com.cloud.cluster.ClusterManager; +import com.cloud.cluster.ManagementServerHostVO; +import com.cloud.cluster.dao.ManagementServerHostDao; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManagerImpl; import com.cloud.consoleproxy.ConsoleProxyManagementState; @@ -789,7 +789,6 @@ import com.cloud.storage.GuestOSVO; import com.cloud.storage.GuestOsCategory; import com.cloud.storage.ScopeType; -import com.cloud.storage.snapshot.SnapshotManager; import com.cloud.storage.Storage; import com.cloud.storage.StorageManager; import com.cloud.storage.StoragePool; @@ -806,6 +805,7 @@ import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VolumeDao; import com.cloud.storage.secondary.SecondaryStorageVmManager; +import com.cloud.storage.snapshot.SnapshotManager; import com.cloud.tags.ResourceTagVO; import com.cloud.tags.dao.ResourceTagDao; import com.cloud.template.TemplateManager; @@ -1043,7 +1043,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe @Inject private BackupManager backupManager; @Inject - protected ManagementServerJoinDao managementServerJoinDao; + protected ManagementServerHostDao managementServerHostDao; @Inject ClusterManager _clusterMgr; @@ -5772,7 +5772,7 @@ public void setLockControllerListener(final LockControllerListener lockControlle @ActionEvent(eventType = EventTypes.EVENT_MANAGEMENT_SERVER_REMOVE, eventDescription = "removing Management Server") public boolean removeManagementServer(RemoveManagementServerCmd cmd) { final Long id = cmd.getId(); - ManagementServerJoinVO managementServer = managementServerJoinDao.findById(id); + ManagementServerHostVO managementServer = managementServerHostDao.findById(id); if (managementServer == null) { throw new InvalidParameterValueException(String.format("Unable to find a Management Server with ID equal to [%s].", id)); @@ -5782,8 +5782,8 @@ public boolean removeManagementServer(RemoveManagementServerCmd cmd) { throw new InvalidParameterValueException(String.format("Unable to remove Management Server with ID [%s]. It can only be removed when it is in the [%s] state, however currently it is in the [%s] state.", managementServer.getUuid(), ManagementServerHost.State.Down.name(), managementServer.getState().name())); } - managementServer.setRemoved(new Date()); - return managementServerJoinDao.update(id, managementServer); + managementServerHostDao.remove(id); + return true; }