Skip to content

Don't allow adding of existing host to another zone, pod or cluster #13182

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
vishesh92 wants to merge 3 commits into
base: 4.20
Choose a base branch
from
+131 −0
Draft

Don't allow adding of existing host to another zone, pod or cluster #13182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bf5881
Don't allow adding of existing host to another zone, pod or cluster
vishesh92 May 15, 2026
42369dc
server: add duplicate host check
shwstppr May 18, 2026
6aee0d9
Resolve IP from the hostname to avoid conflicts
vishesh92 May 18, 2026
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
49 changes: 49 additions & 0 deletions server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@
import static com.cloud.configuration.ConfigurationManagerImpl.MIGRATE_VM_ACROSS_CLUSTERS;
import static com.cloud.configuration.ConfigurationManagerImpl.SET_HOST_DOWN_TO_MAINTENANCE;

import java.net.InetAddress;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLDecoder;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
Expand All @@ -31,6 +33,7 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Random;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -798,6 +801,8 @@ private List<HostVO> discoverHostsFull(final Long dcId, final Long podId, Long c
throw new InvalidParameterValueException(url + " is not a valid uri");
}

checkForDuplicateHost(url);

final List<HostVO> hosts = new ArrayList<>();
logger.info("Trying to add a new host at {} in data center {}", url, zone);
boolean isHypervisorTypeSupported = false;
Expand Down Expand Up @@ -2281,6 +2286,27 @@ private HostVO getNewHost(StartupCommand[] startupCommands) {
return null;
}

protected void validateExistingHostLocationImmutable(final HostVO host, final boolean newHost,
final long dcId, final Long podId, final Long clusterId, final StartupCommand startup) {
if (newHost || host == null || host.getType() != Host.Type.Routing) {
return;
}
final Long existingDcId = host.getDataCenterId();
final Long existingPodId = host.getPodId();
final Long existingClusterId = host.getClusterId();
if (existingDcId == null || existingPodId == null || existingClusterId == null) {
return;
}
if (existingDcId == dcId && Objects.equals(existingPodId, podId) && Objects.equals(existingClusterId, clusterId)) {
return;
}
final String identity = host.getUuid() != null ? host.getUuid() : host.getGuid();
final String ip = startup != null ? startup.getPrivateIpAddress() : "unknown";
throw new InvalidParameterValueException(String.format(
"Host %s (ip: %s) is already registered in [zone: %d, pod: %d, cluster: %d] and cannot be re-added or reconnected with [zone: %d, pod: %s, cluster: %s]. Zone, pod and cluster of an existing host are immutable.",
identity, ip, existingDcId, existingPodId, existingClusterId, dcId, podId, clusterId));
}

protected HostVO createHostVO(final StartupCommand[] cmds, final ServerResource resource, final Map<String, String> details, List<String> hostTags,
final ResourceStateAdapter.Event stateEvent) {
boolean newHost = false;
Expand Down Expand Up @@ -2356,6 +2382,8 @@ protected HostVO createHostVO(final StartupCommand[] cmds, final ServerResource
}
}

validateExistingHostLocationImmutable(host, newHost, dcId, podId, clusterId, startup);

host.setDataCenterId(dc.getId());
host.setPodId(podId);
host.setClusterId(clusterId);
Expand Down Expand Up @@ -2585,6 +2613,27 @@ private Host createHostAndAgent(final ServerResource resource, final Map<String,
return host;
}

void checkForDuplicateHost(final String url) {
String hostIpOrName = null;
String ipAddress = null;
try {
hostIpOrName = new URI(UriUtils.encodeURIComponent(url)).getHost();
InetAddress ip = InetAddress.getByName(hostIpOrName);
ipAddress = ip.getHostAddress();
} catch (final URISyntaxException | UnknownHostException ignore) {
// unparseable URL or unknown host - discoverer will reject it shortly anyway
}
if (StringUtils.isBlank(hostIpOrName)) {
return;
}
final HostVO existingByIp = _hostDao.findByIp(ipAddress);
Comment on lines +2619 to +2629
if (existingByIp != null) {
throw new InvalidParameterValueException(String.format(
"A host with IP address / hostname '%s' (%s) already exists (id: %s). Remove it before adding again.",
hostIpOrName, ipAddress, existingByIp.getUuid()));
}
Comment on lines +2621 to +2634
}

private Host createHostAndAgentDeferred(final ServerResource resource, final Map<String, String> details, final boolean old, final List<String> hostTags, final boolean forRebalance) {
HostVO host = null;
StartupCommand[] cmds = null;
Expand Down
82 changes: 82 additions & 0 deletions server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package com.cloud.resource;

import com.cloud.agent.AgentManager;
import com.cloud.agent.api.StartupCommand;
import com.cloud.agent.api.GetVncPortAnswer;
import com.cloud.agent.api.GetVncPortCommand;
import com.cloud.capacity.dao.CapacityDao;
Expand Down Expand Up @@ -218,6 +219,19 @@ public void tearDown() throws Exception {
closeable.close();
}

@Test(expected = InvalidParameterValueException.class)
public void testCheckForDuplicateHostThrowsWhenIpAlreadyExists() {
when(hostDao.findByIp("10.0.0.10")).thenReturn(host);
resourceManager.checkForDuplicateHost("http://10.0.0.10");
}

@Test
public void testCheckForDuplicateHostAllowsUniqueHost() {
when(hostDao.findByIp("10.0.0.30")).thenReturn(null);
resourceManager.checkForDuplicateHost("http://10.0.0.30");
verify(hostDao, times(1)).findByIp("10.0.0.30");
}

@Test
public void testCheckAndMaintainEnterMaintenanceModeNoVms() throws NoTransitionException {
// Test entering into maintenance with no VMs running on host.
Expand Down Expand Up @@ -335,6 +349,74 @@ public void testGetHostCredentialsMissingParameter() {
resourceManager.getHostCredentials(host);
}

private HostVO mockExistingRoutingHost(long dcId, Long podId, Long clusterId) {
HostVO existing = Mockito.mock(HostVO.class);
when(existing.getType()).thenReturn(Host.Type.Routing);
when(existing.getDataCenterId()).thenReturn(dcId);
when(existing.getPodId()).thenReturn(podId);
when(existing.getClusterId()).thenReturn(clusterId);
when(existing.getUuid()).thenReturn("host-uuid");
return existing;
}

@Test(expected = InvalidParameterValueException.class)
public void testValidateExistingHostLocationImmutableRejectsZoneChange() {
HostVO existing = mockExistingRoutingHost(1L, 10L, 100L);
StartupCommand startup = Mockito.mock(StartupCommand.class);
when(startup.getPrivateIpAddress()).thenReturn("10.10.10.10");
resourceManager.validateExistingHostLocationImmutable(existing, false, 2L, 10L, 100L, startup);
}

@Test(expected = InvalidParameterValueException.class)
public void testValidateExistingHostLocationImmutableRejectsPodChange() {
HostVO existing = mockExistingRoutingHost(1L, 10L, 100L);
StartupCommand startup = Mockito.mock(StartupCommand.class);
when(startup.getPrivateIpAddress()).thenReturn("10.10.10.10");
resourceManager.validateExistingHostLocationImmutable(existing, false, 1L, 11L, 100L, startup);
}

@Test(expected = InvalidParameterValueException.class)
public void testValidateExistingHostLocationImmutableRejectsClusterChange() {
HostVO existing = mockExistingRoutingHost(1L, 10L, 100L);
StartupCommand startup = Mockito.mock(StartupCommand.class);
when(startup.getPrivateIpAddress()).thenReturn("10.10.10.10");
resourceManager.validateExistingHostLocationImmutable(existing, false, 1L, 10L, 101L, startup);
}

@Test
public void testValidateExistingHostLocationImmutableAllowsSameTupleReconnect() {
HostVO existing = mockExistingRoutingHost(1L, 10L, 100L);
resourceManager.validateExistingHostLocationImmutable(existing, false, 1L, 10L, 100L, null);
}

@Test
public void testValidateExistingHostLocationImmutableAllowsNewHost() {
HostVO existing = mockExistingRoutingHost(2L, 20L, 200L);
resourceManager.validateExistingHostLocationImmutable(existing, true, 1L, 10L, 100L, null);
}

@Test
public void testValidateExistingHostLocationImmutableSkipsNonRoutingHost() {
HostVO existing = Mockito.mock(HostVO.class);
when(existing.getType()).thenReturn(Host.Type.SecondaryStorageVM);
resourceManager.validateExistingHostLocationImmutable(existing, false, 1L, 10L, 100L, null);
}

@Test
public void testValidateExistingHostLocationImmutableSkipsPartialLocationRow() {
HostVO existing = Mockito.mock(HostVO.class);
when(existing.getType()).thenReturn(Host.Type.Routing);
when(existing.getDataCenterId()).thenReturn(1L);
when(existing.getPodId()).thenReturn(null);
when(existing.getClusterId()).thenReturn(null);
resourceManager.validateExistingHostLocationImmutable(existing, false, 2L, 10L, 100L, null);
}

@Test
public void testValidateExistingHostLocationImmutableSkipsNullExistingHost() {
resourceManager.validateExistingHostLocationImmutable(null, false, 2L, 10L, 100L, null);
}

@Test
public void testGetHostCredentials() {
Ternary<String, String, String> credentials = resourceManager.getHostCredentials(host);
Expand Down
Loading