rhtyd closed pull request #2361: CLOUDSTACK-10190:Duplicate public VLAN for two
different admin accounts.
URL: https://github.com/apache/cloudstack/pull/2361
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 6dab97ae1ed..1bf807af7ea 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2859,35 +2859,42 @@ public Vlan createVlanAndPublicIpRange(final
CreateVlanIpRangeCmd cmd) throws In
private Vlan commitVlan(final Long zoneId, final Long podId, final String
startIP, final String endIP, final String newVlanGatewayFinal, final String
newVlanNetmaskFinal,
final String vlanId, final Boolean forVirtualNetwork, final Long
networkId, final Long physicalNetworkId, final String startIPv6, final String
endIPv6,
final String ip6Gateway, final String ip6Cidr, final Domain
domain, final Account vlanOwner, final Network network, final Pair<Boolean,
Pair<String, String>> sameSubnet) {
- return Transaction.execute(new TransactionCallback<Vlan>() {
- @Override
- public Vlan doInTransaction(final TransactionStatus status) {
- String newVlanNetmask = newVlanNetmaskFinal;
- String newVlanGateway = newVlanGatewayFinal;
+ final GlobalLock commitVlanLock =
GlobalLock.getInternLock("CommitVlan");
+ commitVlanLock.lock(5);
+ s_logger.debug("Acquiring lock for committing vlan");
+ try {
+ return Transaction.execute(new TransactionCallback<Vlan>() {
+ @Override
+ public Vlan doInTransaction(final TransactionStatus status) {
+ String newVlanNetmask = newVlanNetmaskFinal;
+ String newVlanGateway = newVlanGatewayFinal;
- if ((sameSubnet == null || !sameSubnet.first()) &&
network.getTrafficType() == TrafficType.Guest && network.getGuestType() ==
GuestType.Shared
- && _vlanDao.listVlansByNetworkId(networkId) != null) {
- final Map<Capability, String> dhcpCapabilities =
_networkSvc.getNetworkOfferingServiceCapabilities(_networkOfferingDao.findById(network.getNetworkOfferingId()),
+ if ((sameSubnet == null || !sameSubnet.first()) &&
network.getTrafficType() == TrafficType.Guest && network.getGuestType() ==
GuestType.Shared
+ && _vlanDao.listVlansByNetworkId(networkId) !=
null) {
+ final Map<Capability, String> dhcpCapabilities =
_networkSvc.getNetworkOfferingServiceCapabilities(_networkOfferingDao.findById(network.getNetworkOfferingId()),
Service.Dhcp);
- final String supportsMultipleSubnets =
dhcpCapabilities.get(Capability.DhcpAccrossMultipleSubnets);
- if (supportsMultipleSubnets == null ||
!Boolean.valueOf(supportsMultipleSubnets)) {
- throw new InvalidParameterValueException("The dhcp
service provider for this network does not support dhcp across multiple
subnets");
+ final String supportsMultipleSubnets =
dhcpCapabilities.get(Capability.DhcpAccrossMultipleSubnets);
+ if (supportsMultipleSubnets == null ||
!Boolean.valueOf(supportsMultipleSubnets)) {
+ throw new InvalidParameterValueException("The
dhcp service provider for this network does not support dhcp across multiple
subnets");
+ }
+ s_logger.info("adding a new subnet to the network " +
network.getId());
+ } else if (sameSubnet != null) {
+ // if it is same subnet the user might not send the
vlan and the
+ // netmask details. so we are
+ // figuring out while validation and setting them here.
+ newVlanGateway = sameSubnet.second().first();
+ newVlanNetmask = sameSubnet.second().second();
}
- s_logger.info("adding a new subnet to the network " +
network.getId());
- } else if (sameSubnet != null) {
- // if it is same subnet the user might not send the vlan
and the
- // netmask details. so we are
- // figuring out while validation and setting them here.
- newVlanGateway = sameSubnet.second().first();
- newVlanNetmask = sameSubnet.second().second();
+ final Vlan vlan = createVlanAndPublicIpRange(zoneId,
networkId, physicalNetworkId, forVirtualNetwork, podId, startIP, endIP,
newVlanGateway, newVlanNetmask, vlanId,
+ false, domain, vlanOwner, startIPv6, endIPv6,
ip6Gateway, ip6Cidr);
+ // create an entry in the nic_secondary table. This will
be the new
+ // gateway that will be configured on the corresponding
routervm.
+ return vlan;
}
- final Vlan vlan = createVlanAndPublicIpRange(zoneId,
networkId, physicalNetworkId, forVirtualNetwork, podId, startIP, endIP,
newVlanGateway, newVlanNetmask, vlanId,
- false, domain, vlanOwner, startIPv6, endIPv6,
ip6Gateway, ip6Cidr);
- // create an entry in the nic_secondary table. This will be
the new
- // gateway that will be configured on the corresponding
routervm.
- return vlan;
- }
- });
+ });
+ } finally {
+ commitVlanLock.unlock();
+ }
}
public NetUtils.SupersetOrSubset checkIfSubsetOrSuperset(String
vlanGateway, String vlanNetmask, String newVlanGateway, String newVlanNetmask,
final String newStartIP, final String newEndIP) {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
