[lxc-devel] [lxd/master] lxd/devices/nic: Set MTU on both side of veth

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 370 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20191001/cafb5bd2/attachment.bin>
-------------- next part --------------
From a1f5e2fba281683f1d149487724a72ba22012f18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 1 Oct 2019 13:00:51 -0400
Subject: [PATCH] lxd/devices/nic: Set MTU on both side of veth
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #6270

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/device/device_utils_network.go | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lxd/device/device_utils_network.go b/lxd/device/device_utils_network.go
index da17438110..e2eeed970b 100644
--- a/lxd/device/device_utils_network.go
+++ b/lxd/device/device_utils_network.go
@@ -300,7 +300,6 @@ func networkCreateVethPair(hostName string, m deviceConfig.Device) (string, erro
 		MTU, err := strconv.ParseUint(m["mtu"], 10, 32)
 		if err != nil {
 			return "", fmt.Errorf("Invalid MTU specified: %v", err)
-
 		}
 
 		err = NetworkSetDevMTU(peerName, MTU)
@@ -308,16 +307,29 @@ func networkCreateVethPair(hostName string, m deviceConfig.Device) (string, erro
 			NetworkRemoveInterface(peerName)
 			return "", fmt.Errorf("Failed to set the MTU: %v", err)
 		}
+
+		err = NetworkSetDevMTU(hostName, MTU)
+		if err != nil {
+			NetworkRemoveInterface(peerName)
+			return "", fmt.Errorf("Failed to set the MTU: %v", err)
+		}
 	} else if m["parent"] != "" {
 		parentMTU, err := NetworkGetDevMTU(m["parent"])
 		if err != nil {
 			return "", fmt.Errorf("Failed to get the parent MTU: %v", err)
 		}
+
 		err = NetworkSetDevMTU(peerName, parentMTU)
 		if err != nil {
 			NetworkRemoveInterface(peerName)
 			return "", fmt.Errorf("Failed to set the MTU: %v", err)
 		}
+
+		err = NetworkSetDevMTU(hostName, parentMTU)
+		if err != nil {
+			NetworkRemoveInterface(peerName)
+			return "", fmt.Errorf("Failed to set the MTU: %v", err)
+		}
 	}
 
 	return peerName, nil