Changeset 146

Timestamp:

Oct 9, 2007, 2:27:21 AM (17 years ago)

Author:

tabbott

Message:

1) reworking of lvm stuff into a single python script rather than a pile of shell scripts

2) changing naming for database VMs to always start with d_

Location:

trunk/packages

Files:

• sipb-xen-database/sipb-xen-database/client/etc/xen/sipb-database (modified) (3 diffs)
• sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/etc/remctl/conf.d/sipb-xen-web (modified) (1 diff)
• sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/usr/sbin/dispatch.sh (modified) (1 diff)
• sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/usr/sbin/remctl-update.sh (modified) (4 diffs)
• sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-listvms (modified) (1 diff)
• sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-lvm (added)
• sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-lvremove (deleted)
• sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-lvrename (deleted)

trunk/packages/sipb-xen-database/sipb-xen-database/client/etc/xen/sipb-database

@@ -5 +5 @@
 
 connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
+prefix = "d_"
 
 # 'machine_name', and optionally 'cdrom_image', should get passed in
@@ -21 +22 @@
 maxmem = memory
 check(re.match('^[A-Za-z0-9][A-Za-z0-9._-]*$', machine.name))
-name = machine.name
+name = prefix + machine.name
 check(re.match('^[0-9a-f-]+$', machine.uuid))
 uuid = machine.uuid
@@ -59 +60 @@
 for d in machine.disks:
     check(re.match('^[A-Za-z0-9]+$', d.guest_device_name))
-    device = '/dev/xenvg/' + machine.name + '_' + d.guest_device_name
+    device = '/dev/xenvg/' + prefix + machine.name + '_' + d.guest_device_name
     dspec = 'phy:%s,%s%s,w' % (device, diskioemu, d.guest_device_name)
     disk.append(dspec)

trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/etc/remctl/conf.d/sipb-xen-web

@@ -1 @@
-web lvcreate /usr/sbin/sipb-xen-lvcreate /etc/remctl/acl/web
-web lvremove /usr/sbin/sipb-xen-lvremove /etc/remctl/acl/web
-web lvrename /usr/sbin/sipb-xen-lvrename /etc/remctl/acl/web
+web lvcreate /usr/sbin/sipb-xen-lvm /etc/remctl/acl/web
+web lvremove /usr/sbin/sipb-xen-lvm /etc/remctl/acl/web
+web lvrename /usr/sbin/sipb-xen-lvm /etc/remctl/acl/web
+web lvresize /usr/sbin/sipb-xen-lvm /etc/remctl/acl/web
 web vmboot /usr/sbin/sipb-xen-boot /etc/remctl/acl/web
 web register /usr/sbin/remctl-update.sh /etc/remctl/acl/web

trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/usr/sbin/dispatch.sh

@@ -11 +11 @@
 
 ACTION=$(echo "$0" | awk -F'.' '{print $2}')
-MACHINE="$1"
+ORIGMACHINE="$1"
+MACHINE="d_$ORIGMACHINE"
 
 case "$ACTION" in
     list|vcpu-list|destroy|create|uptime|shutdown)
         xm "$ACTION" "$MACHINE"
-        exit 0
         ;;
     reboot-with-cdrom)
         xm shutdown "$MACHINE"
-        xm create sipb-database machine_name="$MACHINE" cdrom_image="$2"
+        xm create sipb-database machine_name="$ORIGMACHINE" cdrom_image="$2"
         ;;
     reboot)
         if [ -n "$2" ]; then
-            /usr/sbin/dispatch.reboot-with-cdrom.sh "$1" "$2" &
+            /usr/sbin/dispatch.reboot-with-cdrom.sh "$ORIGMACHINE" "$2" &
         else
             xm reboot "$MACHINE"

trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/usr/sbin/remctl-update.sh

@@ -47 +47 @@
 }
 
+check_machine_name()
+{
+    machine="$1"
+    if ! perl -0e 'exit($ARGV[0] !~ /^[A-Za-z0-9][A-Za-z0-9._-]*$/)' -- "$machinename"; then
+        echo "Bad machine name"
+        exit 1
+    fi
+}
+
 case "$1" in
     moiragroup)
@@ -77 +86 @@
     unregister)
         machine="$2"
+        check_machine_name "$machine"
         rm -f "$ACLDIR"/"$machine"
         rm -f "$MACHINEDIR"/"$machine"
@@ -84 +94 @@
         oldmachine="$2"
         newmachine="$3"
+        check_machine_name "$oldmachine"
+        check_machine_name "$newmachine"
         mv "$ACLDIR"/"$oldmachine" "$ACLDIR"/"$newmachine"
         rm -f "$MACHINEDIR"/"$oldmachine"
@@ -90 +102 @@
     register)
         machine="$2"
-        if [ "$machine" == "Domain-0" ]; then
-            echo "No, you can't control Domain 0"
-            exit 1
-        fi
-        if [ -e /etc/xen/"$machine" ]; then
-            echo "Machine already exists outside database"
-            exit 1
-        fi
+        check_machine_name "$machine"
         if [ -e "$ACLDIR"/"$machine" ]; then
             echo "Machine already registered"

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

@@ -1 +1 @@
 #!/bin/sh
 
-xm uptime
+xm uptime | sed -n 's/^d_// p'