Patchwork [1/2] sanity: Use random filename for maximum path length test

login
register
mail settings
Submitter Mike Crowe
Date Nov. 25, 2013, 3:20 p.m.
Message ID <1385392815-29916-1-git-send-email-mac@mcrowe.com>
Download mbox | patch
Permalink /patch/62305/
State New
Headers show

Comments

Mike Crowe - Nov. 25, 2013, 3:20 p.m.
check_create_long_filename used a fixed filename for its test files. This
meant that os.remove(testfile) could fail with ENOENT if two instances were
running at the same time against the same sstate directory. Using a
randomly generated filename stops this from happening.

(Although it might seem unlikely, this race did appear to occur multiple
times with Jenkins - presumably because the matrix jobs were all kicked off
at the same time.)

Signed-off-by: Mike Crowe <mac@mcrowe.com>
---
 meta/classes/sanity.bbclass |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Richard Purdie - Nov. 25, 2013, 3:48 p.m.
On Mon, 2013-11-25 at 15:20 +0000, Mike Crowe wrote:
> check_create_long_filename used a fixed filename for its test files. This
> meant that os.remove(testfile) could fail with ENOENT if two instances were
> running at the same time against the same sstate directory. Using a
> randomly generated filename stops this from happening.
> 
> (Although it might seem unlikely, this race did appear to occur multiple
> times with Jenkins - presumably because the matrix jobs were all kicked off
> at the same time.)
> 
> Signed-off-by: Mike Crowe <mac@mcrowe.com>
> ---
>  meta/classes/sanity.bbclass |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

We've been puzzling over this on the project autobuilder too, although I
didn't spot why, nicely found!

Cheers,

Richard

> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
> index 6807a23..0d40792 100644
> --- a/meta/classes/sanity.bbclass
> +++ b/meta/classes/sanity.bbclass
> @@ -175,7 +175,8 @@ def check_conf_exists(fn, data):
>      return False
>  
>  def check_create_long_filename(filepath, pathname):
> -    testfile = os.path.join(filepath, ''.join([`num`[-1] for num in xrange(1,200)]))
> +    import string, random
> +    testfile = os.path.join(filepath, ''.join(random.choice(string.ascii_letters) for x in range(200)))
>      try:
>          if not os.path.exists(filepath):
>              bb.utils.mkdirhier(filepath)

Patch

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 6807a23..0d40792 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -175,7 +175,8 @@  def check_conf_exists(fn, data):
     return False
 
 def check_create_long_filename(filepath, pathname):
-    testfile = os.path.join(filepath, ''.join([`num`[-1] for num in xrange(1,200)]))
+    import string, random
+    testfile = os.path.join(filepath, ''.join(random.choice(string.ascii_letters) for x in range(200)))
     try:
         if not os.path.exists(filepath):
             bb.utils.mkdirhier(filepath)