apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix ebtable cleanup issue: on ubuntu, it's not got deleted if vm is stopped

Browse Source
This commit is contained in:
Edison Su 2011-06-16 19:26:18 -04:00
parent 6b18b5804b
commit 8306bf7ee5
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
scripts/vm/network/security_group.py
View File

@ -88,7 +88,7 @@ def destroy_network_rules_for_vm(vm_name, vif=None):
if vm_name.startswith('i-') or vm_name.startswith('r-'):
vmchain_default = '-'.join(vm_name.split('-')[:-1]) + "-def"
destroy_ebtables_rules(vmchain)
destroy_ebtables_rules(vmchain, vif)
try:
if vmchain_default != None:
@ -129,10 +129,28 @@ def destroy_network_rules_for_vm(vm_name, vif=None):
return 'true'
def destroy_ebtables_rules(vm_name):
delcmd = "ebtables-save | grep ROUTING | grep " + vm_name + " | sed 's/-A/-D/'"
delcmds = execute(delcmd).split('\n')
delcmds.pop()
def destroy_ebtables_rules(vm_name, vif):
if vif is None:
return
delcmd = "ebtables -t nat -L PREROUTING | grep " + vif
delcmds = []
try:
delcmds = execute(delcmd).split('\n')
delcmds.pop()
delcmds = ["-D PREROUTING " + x for x in delcmds ]
except:
pass
postcmds = []
try:
postcmd = "ebtables -t nat -L POSTROUTING | grep " + vif
postcmds = execute(postcmd).split('\n')
postcmds.pop()
postcmds = ["-D POSTROUTING " + x for x in postcmds]
except:
pass
delcmds += postcmds
for cmd in delcmds:
try:
execute("ebtables -t nat " + cmd)
@ -231,7 +249,7 @@ def default_network_rules(vm_name, vm_id, vm_ip, vm_mac, vif, brname):
vmchain = vm_name
vmchain_default = '-'.join(vmchain.split('-')[:-1]) + "-def"
destroy_ebtables_rules(vmName)
destroy_ebtables_rules(vmName, vif)
try:
execute("iptables -N " + vmchain)
@ -284,7 +302,7 @@ def post_default_network_rules(vm_name, vm_id, vm_ip, vm_mac, vif, brname, dhcpS
pass
try:
execute("ebtables -t nat -A PREROUTING -i " + vif + " -p IPv4 --ip-protocol tcp --ip-destination-port 80 --ip-dst " + dhcpSvr + " -j dnat --to-destination " + hostMacAddr)
execute("ebtables -t nat -I " + vmchain_in + " -p IPv4 --ip-protocol tcp --ip-destination-port 80 --ip-dst " + dhcpSvr + " -j dnat --to-destination " + hostMacAddr)
except:
pass

2
server/src/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -590,7 +590,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
// Check if host is ready for removal
Status currentState = host.getStatus();
Status nextState = currentState.getNextStatus(Status.Event.Remove);
if (nextState == null) {
if (nextState == null && !isForced) {
s_logger.debug("There is no transition from state " + currentState.toString() + " to state " + Status.Event.Remove.toString());
return false;
}