From 225247d526ca5b58342f487c172dbd3a7156e6e4 Mon Sep 17 00:00:00 2001 From: Zach Robinson Date: Tue, 25 Oct 2016 15:26:40 -0700 Subject: [PATCH] remove flock in net.sh linux skeleton - it is no longer needed since we have the '-w' flag for iptables - the extra locking with timeouts can cause containers to fail to start concurrently as they all contend for the same lock - this helps large numbers of containers to be created concurrently especially on 4.4 kernels --- warden/root/linux/skeleton/net.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/warden/root/linux/skeleton/net.sh b/warden/root/linux/skeleton/net.sh index 354747b4..5f1a55f0 100755 --- a/warden/root/linux/skeleton/net.sh +++ b/warden/root/linux/skeleton/net.sh @@ -80,11 +80,6 @@ function setup_nat() { --jump ${nat_instance_chain} } -# Lock execution -mkdir -p ../tmp -exec 3> ../tmp/$(basename $0).lock -flock -x -w 10 3 - case "${1}" in "setup") setup_filter