ud-generate: Add performance optimization by resolving IP adresses for hosts

only once and caching the result. [aba]

diff --git a/debian/changelog b/debian/changelog
index 9473aa5..3c46d61 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ userdir-ldap (0.3.XX) Xnstable; urgency=low
     ud-replicate clients use their ssh host key to authenticate to the
     db server.  The code now supports this but the feature is still
     disabled. [aba]
+  * ud-generate: Add performance optimization by resolving IP adresses
+    for hosts only once and caching the result. [aba]
 
- -- Peter Palfrader <weasel@debian.org>  Sat, 17 May 2008 11:25:49 +0200
+ -- Peter Palfrader <weasel@debian.org>  Sat, 17 May 2008 11:29:41 +0200
 
 userdir-ldap (0.3.23) unstable; urgency=low
 

diff --git a/ud-generate b/ud-generate
index ec618d8..f341bde 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -701,6 +701,24 @@ def GenBSMTP(l,File,HomePrefix):
    raise;
   Done(File,F,None);
 
+# cache IP adresses
+HostToIPCache = {}
+def HostToIP(Host):
+    global HostToIPCache
+    if not Host in HostToIPCache:
+        IPAdressesT = None
+        try:
+            IPAdressesT = list(set([ (a[0],a[4][0]) for a in socket.getaddrinfo(Host, None)]))
+        except socket.gaierror, (code):
+            if code[0] != -2: raise
+        IPAdresses = []
+        for addr in IPAdressesT:
+            if addr[0] == socket.AF_INET: IPAdresses += [addr[1], "::ffff:"+addr[1]]
+            else: IPAdresses += [addr[1]]
+        HostToIPCache[Host] = IPAdresses
+    return HostToIPCache[Host]
+
+
 # Generate the ssh known hosts file
 def GenSSHKnown(l,File,mode=None):
   F = None;
@@ -722,23 +740,12 @@ def GenSSHKnown(l,File,mode=None):
       SHost = Host.find(".")
       if SHost != None: HostNames += [Host[0:SHost]]
 
-      IPAdressesT = None
-      IPAdresses = []
-      # get IP adresses back as "proto adress" to distinguish between v4 and v6
-      try:
-         IPAdressesT = set([ (a[0],a[4][0]) for a in socket.getaddrinfo(Host, None)])
-      except:
-         if code[0] != -2: raise
-      for addr in IPAdressesT:
-         if addr[0] == socket.AF_INET: IPAdresses += [addr[1], "::ffff:"+addr[1]]
-        else: IPAdresses += [addr[1]]
-
       for I in x[1]["sshRSAHostKey"]:
          if mode and mode == 'authorized_keys':
-            #Line = 'command="rsync --server --sender -pr . /var/cache/userdir-ldap/hosts/%s",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="%s" %s' % (Host, ",".join(HNames + IPAdresses), I)
+            #Line = 'command="rsync --server --sender -pr . /var/cache/userdir-ldap/hosts/%s",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="%s" %s' % (Host, ",".join(HNames + HostToIP(Host)), I)
             Line = 'command="rsync --server --sender -pr . /var/cache/userdir-ldap/hosts/%s",no-port-forwarding,no-X11-forwarding,no-agent-forwarding %s' % (Host,I)
          else:
-            Line = "%s %s" %(",".join(HostNames + IPAdresses), I);
+            Line = "%s %s" %(",".join(HostNames + HostToIP(Host)), I);
          Line = Sanitize(Line) + "\n";
          F.write(Line);
   # Oops, something unspeakable happened.