Changeset 1697 for trunk

Timestamp:

Nov 17, 2008, 1:05:51 PM (16 years ago)

Author:

broder

Message:

Add real caching to remconffs

Location:

trunk/packages/invirt-remote-server

Files:

• debian/changelog (modified) (1 diff)
• files/usr/sbin/invirt-remconffs (modified) (5 diffs)

trunk/packages/invirt-remote-server/debian/changelog

@@ +1 @@
+invirt-remote-server (0.1.0) unstable; urgency=low
+
+  * Add real caching to remconffs
+
+ -- Evan Broder <broder@mit.edu>  Mon, 17 Nov 2008 13:05:32 -0500
+
 invirt-remote-server (0.0.18) unstable; urgency=low
 

trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remconffs

@@ -19 +19 @@
         |   `-- machinen
         `-- conf
-        
+        
         The machine list and the acls are drawn from a database.
         """
@@ -28 +28 @@
                 """
                 super(RemConfFS, self).__init__(*args, **kw)
-                self.lasttime = time()
+                self.lasttime = 0
                 self.fuse_args.add("allow_other", True)
                 
@@ -34 +34 @@
                 
                 syslog(LOG_DEBUG, 'Init complete.')
-        
-        def make_map(self):
-                m = Mapper()
-                m.connect('', controller='getroot')
-                m.connect('acl', controller='getmachines')
-                m.connect('acl/:machine', controller='getacl')
-                m.connect('conf', controller='getconf')
-                return m
-        
-        def getroot(self, **kw):
-                return ['acl', 'conf']
-        
+        
+        def make_map(self):
+                m = Mapper()
+                m.connect('', controller='getroot')
+                m.connect('acl', controller='getmachines')
+                m.connect('acl/:machine', controller='getacl')
+                m.connect('conf', controller='getconf')
+                return m
+        
+        def recache(self):
+                if time() - self.lasttime > 15:
+                        self.lasttime = time()
+                        database.clear_cache()
+                        self.machines = dict((machine.name, machine) for machine in database.session.query(database.Machine).all())
+        
+        def getroot(self, **kw):
+                return ['acl', 'conf']
+        
         def getacl(self, machine, **kw):
                 """Build the ACL file for a machine
                 """
-                machine = database.Machine.query().filter_by(name=machine).one()
+                self.recache()
+                machine = self.machines[machine]
                 users = [acl.user for acl in machine.acl]
                 return "\n".join(map(self.userToPrinc, users)
                                  + ['include /etc/remctl/acl/web',
-                                    ''])
-        
+                                        ''])
+        
         def getconf(self, **kw):
                 """Build the master conf file, with all machines
@@ -66 +73 @@
                 """Get the list of VMs in the database, clearing the cache if it's 
                 older than 15 seconds"""
-                if time() - self.lasttime > 15:
-                        self.lasttime = time()
-                        database.clear_cache()
-                return [machine.name for machine in database.session.query(database.Machine).all()]
-        
+                self.recache()
+                return self.machines.keys()
+        
         def userToPrinc(self, user):
                 """Convert Kerberos v4-style names to v5-style and append a default
@@ -85 +90 @@
 if __name__ == '__main__':
         database.connect()
-        routefs.main(RemConfFS)
+        routefs.main(RemConfFS)