Changeset 793

Timestamp:

Jul 30, 2008, 9:50:42 PM (16 years ago)

Author:

y_z

Message:

added shared/exclusive locking; added shared locking of initial JSON cache read

Location:

trunk/packages/sipb-xen-base/files/usr/share/python-support/sipb-xen-base/invirt

Files:

• common.py (modified) (2 diffs)
• config.py (modified) (2 diffs)

trunk/packages/sipb-xen-base/files/usr/share/python-support/sipb-xen-base/invirt/common.py

@@ -40 +40 @@
     return wrapper
 
-def with_lock_file(path):
+def with_lock_file(path, exclusive = True):
     """
     Context manager for lock files.  Example:
@@ -54 +54 @@
         @with_closing(file(path, 'w'))
         def g(f):
-            flock(f, LOCK_EX)
+            if exclusive: locktype = LOCK_EX
+            else:         locktype = LOCK_SH
+            flock(f, locktype)
             try: return func()
             finally: flock(f, LOCK_UN)

trunk/packages/sipb-xen-base/files/usr/share/python-support/sipb-xen-base/invirt/config.py

@@ -5 +5 @@
 default_src_path   = '/etc/invirt/master.yaml'
 default_cache_path = '/var/lib/invirt/cache.json'
+lock_file          = '/var/lib/invirt/cache.lock'
 
 def load(src_path = default_src_path,
@@ -15 +16 @@
     I assume I have the permissions to write to the cache directory.
     """
+    # Namespace container for various state variables, so that they can be
+    # updated by closures.
+    ns = struct()
+
     if force_refresh:
-        do_refresh = True
+        ns.do_refresh = True
     else:
         src_mtime = getmtime(src_path)
-        try:            cache_mtime = getmtime(cache_path)
-        except OSError: do_refresh  = True
-        else:           do_refresh  = src_mtime > cache_mtime
+        try:            cache_mtime   = getmtime(cache_path)
+        except OSError: ns.do_refresh = True
+        else:           ns.do_refresh = src_mtime > cache_mtime
 
-    if not do_refresh:
-        # try reading from the cache first
-        try: cfg = with_closing(file(cache_path))(lambda f: json.read(f.read()))
-        except: do_refresh = True
+    if not ns.do_refresh:
+        # Try reading from the cache first.  This must be transactionally
+        # isolated from concurrent writes to prevent reading an incomplete
+        # (changing) version of the data (but the transaction can share the
+        # lock with other concurrent reads).
+        @with_lock_file(lock_file, False)
+        def read_cache():
+            try: ns.cfg = with_closing(file(cache_path))(lambda f: json.read(f.read()))
+            except: ns.do_refresh = True
 
-    if do_refresh:
+    if ns.do_refresh:
         # Atomically reload the source and regenerate the cache.  The read and
         # write must be a single transaction, or a stale version may be
         # written.
-        @with_lock_file('/var/lib/invirt/cache.lock')
-        def cfg():
+        @with_lock_file(lock_file)
+        def refresh_cache():
             import yaml
             try:    default_loader = yaml.CSafeLoader
             except: default_loader = yaml.SafeLoader
-            cfg = with_closing(file(src_path))(lambda f: yaml.load(f, default_loader))
-            try: with_closing(file(cache_path, 'w'))(lambda f: f.write(json.write(cfg)))
+            ns.cfg = with_closing(file(src_path))(lambda f: yaml.load(f, default_loader))
+            try: with_closing(file(cache_path, 'w'))(lambda f: f.write(json.write(ns.cfg)))
             except: pass # silent failure
-            return cfg
-    return cfg
+    return ns.cfg
 
 dicts = load()