Skip to content

OVS: validate distributed VPC topology updates #13792

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
Dogface2k wants to merge 3 commits into
base: main
Choose a base branch
from
+583 −31
Open

OVS: validate distributed VPC topology updates #13792

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
b8f4ab1
OVS: ignore distributed VPCs owned by other providers
Dogface2k Aug 4, 2026
42863fd
OVS: contain malformed topology callback failures
Dogface2k Aug 4, 2026
5b89988
OVS: preserve GRE key range and isolate VPC lookups
Dogface2k Aug 5, 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
101 changes: 70 additions & 31 deletions plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/OvsTunnelManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;

Expand Down Expand Up @@ -93,6 +94,11 @@
@Component
public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManager, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualMachine> {

private static final long MIN_GRE_KEY = 0L;
private static final long MAX_GRE_KEY = 4294967295L;
private static final Set<Network.State> VPC_TOPOLOGY_NETWORK_STATES = Set.of(
Network.State.Setup, Network.State.Implementing, Network.State.Implemented);

// boolean _isEnabled;
ScheduledExecutorService _executorPool;
ScheduledExecutorService _cleanupExecutor;
Expand Down Expand Up @@ -396,6 +402,12 @@ boolean isVpcEnabledForDistributedRouter(long vpcId) {
return vpc.usesDistributedRouter();
}

boolean isOvsDistributedRouterVpc(long vpcId) {
VpcVO vpc = _vpcDao.findById(vpcId);
return vpc != null && vpc.usesDistributedRouter()
&& _vpcMgr.isProviderSupportServiceInVpc(vpcId, Network.Service.Connectivity, Network.Provider.Ovs);
}

@Override
public void checkAndPrepareHostForTunnelNetwork(Network nw, Host host) {
if (nw.getVpcId() != null && isVpcEnabledForDistributedRouter(nw.getVpcId())) {
Expand Down Expand Up @@ -684,25 +696,28 @@ private void handleVmStateChange(VMInstanceVO vm) {
}

for (Long vpcId: vpcIds) {
VpcVO vpc = _vpcDao.findById(vpcId);
// nothing to do if the VPC is not setup for distributed routing
if (vpc == null || !vpc.usesDistributedRouter()) {
return;
}
try {
if (!isOvsDistributedRouterVpc(vpcId)) {
continue;
}

// get the list of hosts on which VPC spans (i.e hosts that need to be aware of VPC topology change update)
List<Long> vpcSpannedHostIds = _ovsNetworkToplogyGuru.getVpcSpannedHosts(vpcId);
String bridgeName=generateBridgeNameForVpc(vpcId);
// get the list of hosts on which VPC spans (i.e hosts that need to be aware of VPC topology change update)
List<Long> vpcSpannedHostIds = _ovsNetworkToplogyGuru.getVpcSpannedHosts(vpcId);
Comment thread
Dogface2k marked this conversation as resolved.
String bridgeName=generateBridgeNameForVpc(vpcId);

OvsVpcPhysicalTopologyConfigCommand topologyConfigCommand = prepareVpcTopologyUpdate(vpcId);
topologyConfigCommand.setSequenceNumber(getNextTopologyUpdateSequenceNumber(vpcId));
OvsVpcPhysicalTopologyConfigCommand topologyConfigCommand = prepareVpcTopologyUpdate(vpcId);
topologyConfigCommand.setSequenceNumber(getNextTopologyUpdateSequenceNumber(vpcId));

// send topology change update to VPC spanned hosts
for (Long id: vpcSpannedHostIds) {
if (!sendVpcTopologyChangeUpdate(topologyConfigCommand, id, bridgeName)) {
logger.debug("Failed to send VPC topology change update to host : " + id + ". Moving on " +
"with rest of the host update.");
// send topology change update to VPC spanned hosts
for (Long id: vpcSpannedHostIds) {
if (!sendVpcTopologyChangeUpdate(topologyConfigCommand, id, bridgeName)) {
logger.debug("Failed to send VPC topology change update to host : " + id + ". Moving on " +
"with rest of the host update.");
}
}
} catch (RuntimeException e) {
logger.error("Failed to update OVS distributed-router topology for VPC {} after VM {} changed state",
vpcId, vm.getId(), e);
}
}
}
Expand Down Expand Up @@ -731,6 +746,12 @@ OvsVpcPhysicalTopologyConfigCommand prepareVpcTopologyUpdate(long vpcId) {
assert (vpc != null): "invalid vpc id";

List<? extends Network> vpcNetworks = _vpcMgr.getVpcNetworks(vpcId);
List<Network> topologyNetworks = new ArrayList<>();
for (Network network : vpcNetworks) {
if (VPC_TOPOLOGY_NETWORK_STATES.contains(network.getState())) {
topologyNetworks.add(network);
}
}
List<Long> hostIds = _ovsNetworkToplogyGuru.getVpcSpannedHosts(vpcId);
List<Long> vmIds = _ovsNetworkToplogyGuru.getAllActiveVmsInVpc(vpcId);

Expand All @@ -741,7 +762,7 @@ OvsVpcPhysicalTopologyConfigCommand prepareVpcTopologyUpdate(long vpcId) {
for (Long hostId : hostIds) {
HostVO hostDetails = _hostDao.findById(hostId);
String remoteIp = null;
for (Network network: vpcNetworks) {
for (Network network: topologyNetworks) {
try {
remoteIp = getGreEndpointIP(hostDetails, network);
} catch (Exception e) {
Expand All @@ -753,21 +774,39 @@ OvsVpcPhysicalTopologyConfigCommand prepareVpcTopologyUpdate(long vpcId) {
hosts.add(host);
}

for (Network network: vpcNetworks) {
for (Network network: topologyNetworks) {
if (network.getBroadcastDomainType() != BroadcastDomainType.Vswitch || network.getBroadcastUri() == null) {
throw new CloudRuntimeException(String.format(
"OVS distributed-router VPC %s contains network %s without a Vswitch broadcast URI",
vpc.getUuid(), network.getUuid()));
}
String key = network.getBroadcastUri().getAuthority();
long gre_key;
if (key.contains(".")) {
String[] parts = key.split("\\.");
gre_key = Long.parseLong(parts[1]);
} else {
try {
gre_key = Long.parseLong(BroadcastDomainType.getValue(key));
} catch (Exception e) {
return null;
}
String expectedPrefix = vpcId + ".";
if (key == null || !key.startsWith(expectedPrefix) || key.indexOf('.', expectedPrefix.length()) >= 0) {
throw new CloudRuntimeException(String.format(
"OVS distributed-router network %s has invalid broadcast key %s for VPC %s",
network.getUuid(), key, vpc.getUuid()));
}
String greKeyValue = key.substring(expectedPrefix.length());
long greKey;
try {
greKey = Long.parseLong(greKeyValue);
} catch (NumberFormatException e) {
throw new CloudRuntimeException(String.format(
"OVS distributed-router network %s has non-numeric GRE key %s",
network.getUuid(), greKeyValue), e);
}
if (greKey < MIN_GRE_KEY || greKey > MAX_GRE_KEY) {
throw new CloudRuntimeException(String.format(
"OVS distributed-router network %s has GRE key %s outside the supported range %s-%s",
network.getUuid(), greKeyValue, MIN_GRE_KEY, MAX_GRE_KEY));
}
NicVO nic = _nicDao.findByIp4AddressAndNetworkId(network.getGateway(), network.getId());
OvsVpcPhysicalTopologyConfigCommand.Tier tier = new OvsVpcPhysicalTopologyConfigCommand.Tier(gre_key,
if (nic == null) {
throw new CloudRuntimeException(String.format(
"Unable to find the gateway NIC for OVS distributed-router network %s", network.getUuid()));
}
OvsVpcPhysicalTopologyConfigCommand.Tier tier = new OvsVpcPhysicalTopologyConfigCommand.Tier(greKey,
network.getUuid(), network.getGateway(), nic.getMacAddress(), network.getCidr());
tiers.add(tier);
}
Expand Down Expand Up @@ -802,9 +841,9 @@ public class NetworkAclEventsSubscriber implements MessageSubscriber {
public void onPublishMessage(String senderAddress, String subject, Object args) {
try {
NetworkVO network = (NetworkVO) args;
String bridgeName=generateBridgeNameForVpc(network.getVpcId());
if (network.getVpcId() != null && isVpcEnabledForDistributedRouter(network.getVpcId())) {
long vpcId = network.getVpcId();
Long vpcId = network.getVpcId();
if (vpcId != null && isOvsDistributedRouterVpc(vpcId)) {
String bridgeName = generateBridgeNameForVpc(vpcId);
OvsVpcRoutingPolicyConfigCommand cmd = prepareVpcRoutingPolicyUpdate(vpcId);
cmd.setSequenceNumber(getNextRoutingPolicyUpdateSequenceNumber(vpcId));

Expand Down
Loading