pickled: add lock around database saves
git-svn-id: https://svn.apache.org/repos/asf/incubator/tashi/trunk@1352702 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/tashi/clustermanager/data/pickled.py b/src/tashi/clustermanager/data/pickled.py
index 043d756..e7465c4 100644
--- a/src/tashi/clustermanager/data/pickled.py
+++ b/src/tashi/clustermanager/data/pickled.py
@@ -37,6 +37,7 @@
self.hostLock = threading.Lock()
self.hostLocks = {}
self.idLock = threading.Lock()
+ self.dbLock = threading.Lock()
self.load()
def cleanInstances(self):
@@ -54,21 +55,22 @@
return ch
def save(self):
- # XXXstroucki lock here to serialize saves
filename = self.file
# XXXstroucki could be better
tempfile = "%s.new" % filename
- filehandle = open(tempfile, "w")
- cPickle.dump((self.cleanHosts(), self.cleanInstances(), self.networks, self.users), filehandle)
- filehandle.close()
+ self.dbLock.acquire()
try:
+ filehandle = open(tempfile, "w")
+ cPickle.dump((self.cleanHosts(), self.cleanInstances(), self.networks, self.users), filehandle)
+ filehandle.close()
os.rename(tempfile, filename)
+
except OSError:
- # XXXstroucki: regular save will take place
- # soon enough, ignore this until locking is
- # in place.
- pass
+ self.log.exception("Error saving database")
+
+ finally:
+ self.dbLock.release()
def load(self):
if (os.access(self.file, os.F_OK)):
