etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 14536 - DB exception while trying to delete physical network 

Reviewed-By: Sheng Yang

Changes:
Added proper cleanup for virtual router elements.
This commit is contained in:
prachi 2012-03-29 12:35:28 -07:00
parent 4aa4522b55
commit 8d64e4a8e6
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -4785,7 +4785,19 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
_dcDao.deleteVnet(physicalNetworkId);
// delete service providers
_pNSPDao.deleteProviders(physicalNetworkId);
List<PhysicalNetworkServiceProviderVO> providers = _pNSPDao.listBy(physicalNetworkId);
for(PhysicalNetworkServiceProviderVO provider : providers){
try {
deleteNetworkServiceProvider(provider.getId());
}catch (ResourceUnavailableException e) {
s_logger.warn("Unable to complete destroy of the physical network provider: " + provider.getProviderName() + ", id: "+ provider.getId(), e);
return false;
} catch (ConcurrentOperationException e) {
s_logger.warn("Unable to complete destroy of the physical network provider: " + provider.getProviderName() + ", id: "+ provider.getId(), e);
return false;
}
}
// delete traffic types
_pNTrafficTypeDao.deleteTrafficTypes(physicalNetworkId);

3
server/src/com/cloud/network/element/VirtualRouterElement.java
View File

@ -59,7 +59,6 @@ import com.cloud.network.lb.LoadBalancingRule;
import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy;
import com.cloud.network.lb.LoadBalancingRulesManager;
import com.cloud.network.router.VirtualNetworkApplianceManager;
import com.cloud.network.router.VirtualRouter;
import com.cloud.network.router.VirtualRouter.Role;
import com.cloud.network.rules.FirewallRule;
import com.cloud.network.rules.LbStickinessMethod;
@ -672,6 +671,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
for (DomainRouterVO router : routers) {
result = result && (_routerMgr.destroyRouter(router.getId()) != null);
}
_vrProviderDao.remove(elementId);
return result;
}