Change in vdsm[master]: Remove redundant ifupping of bonded ifaces.

asegurap at redhat.com asegurap at redhat.com
Wed Dec 12 18:00:19 UTC 2012


Antoni Segura Puimedon has uploaded a new change for review.

Change subject: Remove redundant ifupping of bonded ifaces.
......................................................................

Remove redundant ifupping of bonded ifaces.

ifup-eth of initscripts, when ifupping a bond checks which are
its slaves and ifups them. Thus, removing this two ifup places
we avoid a big source of FAILED messages in our logs while
keeping all the functionality and correctness.

Change-Id: I069ac2b60a2d591b5cc76484e0d7eee30b1429e2
Signed-off-by: Antoni S. Puimedon <asegurap at redhat.com>
---
M vdsm/configNetwork.py
1 file changed, 5 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/10009/1

diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py
index 711a0d4..def9f34 100755
--- a/vdsm/configNetwork.py
+++ b/vdsm/configNetwork.py
@@ -1004,11 +1004,11 @@
     # Now we can run ifup for all interfaces
     if bonding:
         ifup(bonding, bondBootproto == 'dhcp' and not blockingDhcp)
-
-    # NICs must be activated in the same order of boot time
-    # to expose the correct MAC address.
-    for nic in nicSort(nics):
-        ifup(nic, options.get('bootproto') == 'dhcp' and not blockingDhcp)
+    else:
+        # NICs must be activated in the same order of boot time
+        # to expose the correct MAC address.
+        for nic in nicSort(nics):
+            ifup(nic, options.get('bootproto') == 'dhcp' and not blockingDhcp)
 
     # Now we can ifup VLAN interface, because bond and nic already up
     if vlan:
@@ -1266,10 +1266,6 @@
 
         # Now we can run ifup for all interfaces
         ifup(bond)
-        # NICs must be activated in the same order of boot time
-        # to expose the correct MAC address.
-        for nic in nicSort(bondAttrs['nics']):
-            ifup(nic)
 
 
 def _removeBondings(bondings, configWriter):


--
To view, visit http://gerrit.ovirt.org/10009
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I069ac2b60a2d591b5cc76484e0d7eee30b1429e2
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap at redhat.com>


More information about the vdsm-patches mailing list