[lxc-devel] [lxd/master] network: Workaround iptables locking issues
stgraber on Github
lxc-bot at linuxcontainers.org
Thu Mar 8 10:35:03 UTC 2018
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/20180308/72b834bd/attachment.bin>
-------------- next part --------------
From dfaf11b6ec0b8720eda6eda9e6bb59a22fe44a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 8 Mar 2018 11:33:40 +0100
Subject: [PATCH] network: Workaround iptables locking issues
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Closes #4310
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
lxd/networks_iptables.go | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lxd/networks_iptables.go b/lxd/networks_iptables.go
index e0ea7b0e6..1c0c2bc88 100644
--- a/lxd/networks_iptables.go
+++ b/lxd/networks_iptables.go
@@ -39,7 +39,7 @@ func networkIptablesPrepend(protocol string, netName string, table string, chain
args = append(args, rule...)
args = append(args, "-m", "comment", "--comment", fmt.Sprintf("generated for LXD network %s", netName))
- _, err = shared.RunCommand(cmd, args...)
+ _, err = shared.TryRunCommand(cmd, args...)
if err != nil {
return err
}
@@ -71,7 +71,7 @@ func networkIptablesClear(protocol string, netName string, table string) error {
// List the rules
args := append(baseArgs, "-S")
- output, err := shared.RunCommand(cmd, args...)
+ output, err := shared.TryRunCommand(cmd, args...)
if err != nil {
return fmt.Errorf("Failed to list %s rules for %s (table %s)", protocol, netName, table)
}
@@ -86,7 +86,7 @@ func networkIptablesClear(protocol string, netName string, table string) error {
fields[0] = "-D"
args = append(baseArgs, fields...)
- _, err = shared.RunCommand("sh", "-c", fmt.Sprintf("%s %s", cmd, strings.Join(args, " ")))
+ _, err = shared.TryRunCommand("sh", "-c", fmt.Sprintf("%s %s", cmd, strings.Join(args, " ")))
if err != nil {
return err
}
More information about the lxc-devel
mailing list