Changeset 397 for trunk

Timestamp:

Apr 2, 2008, 4:36:45 AM (17 years ago)

Author:

broder

Message:

Create and destroy conserver consoles through a Python script,
instead of a shell script. Also run this script every 5 minutes or so

Location:

trunk/packages

Files:

• sipb-xen-console-server/debian/changelog (modified) (1 diff)
• sipb-xen-console-server/debian/sipb-xen-console-server.cron.d (added)
• sipb-xen-console-server/files/etc/conserver/conf.d (deleted)
• sipb-xen-console-server/files/etc/conserver/conserver.cf.sipb-xen (modified) (1 diff)
• sipb-xen-console-server/files/etc/conserver/includes.cf (deleted)
• sipb-xen-console-server/files/etc/conserver/sipb-xen-consoles.cf (added)
• sipb-xen-console-server/files/usr/sbin/sipb-xen-update-conserver (modified) (1 diff)
• sipb-xen-remctl-auto/debian/changelog (modified) (1 diff)
• sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-vmcontrol (modified) (2 diffs)

trunk/packages/sipb-xen-console-server/debian/changelog

@@ +1 @@
+sipb-xen-console-server (2) unstable; urgency=low
+
+  * Use a python based update-conserver script that gets the list of
+    consoles from xm list
+  * Run the update-conserver script every 5 minutes to catch VMs that
+    are not started or stopped through the remctl interface
+
+ -- Evan Broder <broder@sipb-xen-dev.mit.edu>  Wed,  2 Apr 2008 04:32:58 -0400
+
 sipb-xen-console-server (1.0.2) unstable; urgency=low
 

trunk/packages/sipb-xen-console-server/files/etc/conserver/conserver.cf.sipb-xen

@@ -24 +24 @@
 }
 
-#include /etc/conserver/includes.cf
+#include /etc/conserver/sipb-xen-consoles.cf
 
 ##

trunk/packages/sipb-xen-console-server/files/usr/sbin/sipb-xen-update-conserver

@@ -1 @@
-#!/bin/bash
+#!/usr/bin/python
 
-ls /etc/conserver/conf.d/ | sed -e 's|^|#include /etc/conserver/conf.d/|' >/etc/conserver/includes.cf
-/etc/init.d/conserver-server reload
+import sipb_xen_database
+import subprocess
+import os
+
+sipb_xen_database.connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
+
+def live_vms():
+    p = subprocess.Popen(['xm', 'list'], stdout=subprocess.PIPE)
+    p.wait()
+    output = p.stdout.read()
+    vms = [x.split()[0][2:] for x in output.splitlines() if x.startswith('d_')]
+    return vms
+
+def reload_conserver():
+    p = subprocess.Popen(['/etc/init.d/conserver-server', 'restart'], stdout=subprocess.PIPE)
+    p.wait()
+
+if __name__ == '__main__':
+    f = open('/etc/conserver/sipb-xen-consoles.cf', 'w')
+    f.write('\n'.join('console %s {}' % vm for vm in live_vms()))
+    f.close()
+    reload_conserver()

trunk/packages/sipb-xen-remctl-auto/debian/changelog

@@ +1 @@
+sipb-xen-remctl-auto (1.0.9) unstable; urgency=low
+
+  * Change the way that conserver is updated
+
+ -- Evan Broder <broder@sipb-xen-dev.mit.edu>  Wed,  2 Apr 2008 04:36:04 -0400
+
 sipb-xen-remctl-auto (1.0.8) unstable; urgency=low
 

trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-vmcontrol

@@ -20 +20 @@
     destroy|shutdown)
         xm "$ACTION" "$MACHINE"
-        rm "/etc/conserver/conf.d/$MACHINE"
         /usr/sbin/sipb-xen-update-conserver
         ;;
@@ -40 +39 @@
             xm create sipb-database machine_name="$ORIGMACHINE"
         fi
-        echo "console $ORIGMACHINE {}" >"/etc/conserver/conf.d/$MACHINE"
         /usr/sbin/sipb-xen-update-conserver
         ;;