mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-29 13:27:59 +00:00
Code Issues Releases Wiki Activity

xenserver: Kill bond slaves' dhclients when bringing up bond master.

Browse Source 
This fixes the converse of the problem addressed by commit fe19e820
"xenserver: Kill bond master's dhclient when bringing up bond slave".  In
that commit's log message, I claimed that the converse was not a problem,
but I was wrong.  I must have screwed up in testing, because it really is
a problem.  This commit fixes it.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ian Campbell <Ian.Campbell@citrix.com>
CC: Dominic Curran <dominic.curran@citrix.com>
Reported-by: Michael Mao <mmao@nicira.com>
Bug #2668.
This commit is contained in:
Ben Pfaff 2010-07-16 09:22:23 -07:00
parent ac7f2d4bb4
commit f51c1d9890
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -37,6 +37,7 @@ Jan Medved jmedved@juniper.net
Jeongkeun Lee jklee@hp.com Jeongkeun Lee jklee@hp.com
Joan Cirer joan@ev0.net Joan Cirer joan@ev0.net
John Galgay john@galgay.net John Galgay john@galgay.net
Michael Mao mmao@nicira.com
Paulo Cravero pcravero@as2594.net Paulo Cravero pcravero@as2594.net
Peter Balland peter@nicira.com Peter Balland peter@nicira.com
Ram Jothikumar rjothikumar@nicira.com Ram Jothikumar rjothikumar@nicira.com

18
xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
View File

@ -431,17 +431,25 @@ class DatapathVswitch(Datapath):
def bring_down_existing(self): def bring_down_existing(self):
# interface-reconfigure is never explicitly called to down a # interface-reconfigure is never explicitly called to down a
# bond master. However, when we are called to up a slave it # bond master. However, when we are called to up a slave it
# is implicit that we are destroying the master. # is implicit that we are destroying the master. Conversely,
# when we are called to up a bond is is implicit that we are
# taking down the slaves.
# #
# This is (only) important in the case where the bond master # This is (only) important in the case where the device being
# uses DHCP. We need to kill the dhclient process, otherwise # implicitly taken down uses DHCP. We need to kill the
# bringing the bond master back up later will fail because # dhclient process, otherwise performing the inverse operation
# ifup will refuse to start a duplicate dhclient. # later later will fail because ifup will refuse to start a
# duplicate dhclient.
bond_masters = pif_get_bond_masters(self._pif) bond_masters = pif_get_bond_masters(self._pif)
for master in bond_masters: for master in bond_masters:
log("action_up: bring down bond master %s" % (pif_netdev_name(master))) log("action_up: bring down bond master %s" % (pif_netdev_name(master)))
run_command(["/sbin/ifdown", pif_bridge_name(master)]) run_command(["/sbin/ifdown", pif_bridge_name(master)])
bond_slaves = pif_get_bond_slaves(self._pif)
for slave in bond_slaves:
log("action_up: bring down bond slave %s" % (pif_netdev_name(slave)))
run_command(["/sbin/ifdown", pif_bridge_name(slave)])
def configure(self): def configure(self):
# Bring up physical devices. ovs-vswitchd initially enables or # Bring up physical devices. ovs-vswitchd initially enables or
# disables bond slaves based on whether carrier is detected # disables bond slaves based on whether carrier is detected