540117 - postupload fails if directory exists

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Chris AtLee [:catlee]]

I suspect this happens when two slaves are uploading at the same time:

Running post-upload command: post_upload.py -p firefox -v 3.6rc2 -n 1 --release-to-candidates-dir
http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/3.6rc2-candidates/build1/linux-i686/eo/firefox-3.6rc2.tar.bz2
Traceback (most recent call last):
  File "/usr/bin/post_upload.py", line 267, in ?
    func(options, upload_dir, files)
  File "/usr/bin/post_upload.py", line 140, in ReleaseToCandidatesDir
    CopyFileToDir(f, upload_dir, realCandidatesPath, preserve_dirs=True)
  File "/usr/bin/post_upload.py", line 38, in CopyFileToDir
    os.makedirs(full_dest_dir, 0755)
  File "/usr/lib/python2.4/os.py", line 159, in makedirs
    mkdir(name, mode)
OSError: [Errno 17] File exists: '/home/ftp/pub/firefox/nightly/3.6rc2-candidates/build1/linux-i686/xpi'
Encountered error while uploading

Comment 1

[[e-mail] (:bhearsum)]

This should be a simple fix, I'll have a look.

Comment 2

[[e-mail] (:bhearsum)]

Attachment: untested patch - ignore 'file exists' errors

Comment 3

[[e-mail] (:bhearsum)]

Attachment: better version, using errno

Pretty hard to reproduce this in staging, but I have verified that 'make upload' works as intended still.

Comment 4

[[e-mail] (:bhearsum)]

Comment on attachment 422224 [details] [diff] [review]
better version, using errno

changeset:   479:694b96076cd8

Comment 5

[[e-mail] (:bhearsum)]

Landed, updated the checkout on stage.