hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed file locking. Fix is slightly ugly (lock integer added) but it gets the job done

Browse source 
It avoids having to spin simply on the OSError.
This commit is contained in:
Gregory Becker 2015-08-25 15:32:45 -07:00
parent 4a2bd1753a
commit e32c59f805
1 changed files with 32 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
lib/spack/spack/database.py
View file

@ -115,22 +115,29 @@ def read_database(self):
"""
if not self.is_dirty():
return
"""
while True:
lock=0
while lock==0:
try:
os.mkdir(self.lock_path)
break
lock=1
except OSError as err:
pass
"""
if os.path.isfile(self.file_path):
with open(self.file_path,'r') as f:
self.from_yaml(f)
else:
#The file doesn't exist, construct empty data.
self.data = []
# os.rmdir(self.lock_path)
#The try statement ensures that a failure won't leave the
#database locked to other processes.
try:
if os.path.isfile(self.file_path):
with open(self.file_path,'r') as f:
self.from_yaml(f)
else:
#The file doesn't exist, construct empty data.
self.data = []
except:
os.rmdir(self.lock_path)
raise
os.rmdir(self.lock_path)
def write_database_to_yaml(self,stream):
@ -162,19 +169,25 @@ def write(self):
Write the database to the standard location
Implements mkdir locking for the database file
"""
"""
while True:
lock=0
while lock==0:
try:
os.mkdir(self.lock_path)
break
lock=1
except OSError as err:
pass
"""
with open(self.file_path,'w') as f:
self.last_write_time = int(time.time())
self.write_database_to_yaml(f)
# os.rmdir(self.lock_path)
#The try statement ensures that a failure won't leave the
#database locked to other processes.
try:
with open(self.file_path,'w') as f:
self.last_write_time = int(time.time())
self.write_database_to_yaml(f)
except:
os.rmdir(self.lock_path)
raise
os.rmdir(self.lock_path)
def get_index_of(self, spec):