[oe-commits] [openembedded-core] 22/25: runqemu: fix a race issue on lockdir

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit ec33043477a0b915b0911f7d7eacb24361e4aaa8
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Wed Sep 14 02:45:57 2016 -0700

    runqemu: fix a race issue on lockdir
    
    There might be a race issue when multi runqemu processess are
    running at the same time:
    | Traceback (most recent call last):
    |   File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-ipk/build/scripts/runqemu", line 920, in <module>
    |     ret = main()
    |   File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-ipk/build/scripts/runqemu", line 911, in main
    |     config.setup_network()
    |   File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-ipk/build/scripts/runqemu", line 760, in setup_network
    |     self.setup_tap()
    |   File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-ipk/build/scripts/runqemu", line 697, in setup_tap
    |     os.mkdir(lockdir)
    | FileExistsError: [Errno 17] File exists: '/tmp/qemu-tap-locks'
    
    Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/runqemu | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index 9af13f3..b6bc0ba 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -694,7 +694,12 @@ class BaseConfig(object):
             raise Exception("runqemu-ifup, runqemu-ifdown or ip not found")
 
         if not os.path.exists(lockdir):
-            os.mkdir(lockdir)
+            # There might be a race issue when multi runqemu processess are
+            # running at the same time.
+            try:
+                os.mkdir(lockdir)
+            except FileExistsError:
+                pass
 
         cmd = '%s link' % ip
         logger.info('Running %s...' % cmd)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.