diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2007-08-15 21:46:31 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2007-08-15 21:46:31 +0000 |
| commit | 8fa40e7d3bccfe0e889539b3b1e1a95e2e1dc2bb (patch) | |
| tree | 26adccc80c3c4d4da2a38e24baf8e717f0dc8dea | |
| parent | cd017657c457d0ff2a55f8e9128584df4fe08ccc (diff) | |
| download | bitbake-8fa40e7d3bccfe0e889539b3b1e1a95e2e1dc2bb.tar.gz | |
fetch/__init__.py: Add locking so multiple fetch processes don't compete for the same file
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | lib/bb/fetch/__init__.py | 15 |
2 files changed, 17 insertions, 1 deletions
@@ -21,6 +21,9 @@ Changes in Bitbake 1.8.x: - Add plain message function to bb.msg - Sort the list of providers before processing so dependency problems are reproducible rather than effectively random + - Add locking for fetchers so only one tries to fetch a given file at + a given time + Changes in Bitbake 1.8.6: - Correctly redirect stdin when forking diff --git a/lib/bb/fetch/__init__.py b/lib/bb/fetch/__init__.py index 229b28c19..bbff516ff 100644 --- a/lib/bb/fetch/__init__.py +++ b/lib/bb/fetch/__init__.py @@ -24,7 +24,7 @@ BitBake build tools. # # Based on functions from the base bb module, Copyright 2003 Holger Schurig -import os, re +import os, re, fcntl import bb from bb import data from bb import persist_data @@ -140,9 +140,21 @@ def go(d): # Touch md5 file to show activity os.utime(ud.md5, None) continue + lf = open(ud.lockfile, "a+") + fcntl.flock(lf.fileno(), fcntl.LOCK_EX) + if ud.localfile and not m.forcefetch(u, ud, d) and os.path.exists(ud.md5): + # If someone else fetched this before we got the lock, + # notice and don't try again + os.utime(ud.md5, None) + fcntl.flock(lf.fileno(), fcntl.LOCK_UN) + lf.close + continue m.go(u, ud, d) if ud.localfile and not m.forcefetch(u, ud, d): Fetch.write_md5sum(u, ud, d) + fcntl.flock(lf.fileno(), fcntl.LOCK_UN) + lf.close + def localpaths(d): """ @@ -264,6 +276,7 @@ class FetchData(object): else: self.localpath = self.method.localpath(self.url, self, d) self.md5 = self.localpath + '.md5' + self.lockfile = self.localpath + '.lock' # if user sets localpath for file, use it instead. |