Changeset 2132 for trunk/packages

Timestamp:

Feb 16, 2009, 11:52:01 PM (16 years ago)

Author:

iannucci

Message:

RAM quotas at remctl; RAM quota exception script, table, and usage in -web and -remote-create; /etc/nocreate support

Location:

trunk/packages

Files:

• invirt-base/debian/changelog (modified) (1 diff)
• invirt-base/scripts/invirt-setquota (added)
• invirt-database/debian/changelog (modified) (1 diff)
• invirt-database/python/database/models.py (modified) (5 diffs)
• invirt-database/python/database/owner.py (added)
• invirt-remote/debian/changelog (modified) (1 diff)
• invirt-remote/server/usr/sbin/invirt-remote-create (modified) (2 diffs)
• invirt-web/code/validation.py (modified) (2 diffs)
• invirt-web/debian/changelog (modified) (1 diff)

trunk/packages/invirt-base/debian/changelog

@@ +1 @@
+invirt-base (0.0.21) unstable; urgency=low
+
+  * added invirt-setquota script (self-documenting)
+
+ -- Peter A. Iannucci <iannucci@mit.edu>  Mon, 16 Feb 2009 23:48:25 -0500
+
 invirt-base (0.0.20) unstable; urgency=low
 

trunk/packages/invirt-database/debian/changelog

@@ +1 @@
+invirt-database (0.1.3) unstable; urgency=low
+
+  * Added owner table with ram quotas.
+  * Refactored Owner class into separate sourcefile
+
+ -- Peter A. Iannucci <iannucci@mit.edu>  Mon, 16 Feb 2009 23:49:39 -0500
+
 invirt-database (0.1.2) unstable; urgency=low
 

trunk/packages/invirt-database/python/database/models.py

@@ -17 +17 @@
            'mirrors_table',
            'autoinstalls_table',
+           'owners_table',
            'Machine',
            'MachineAccess',
@@ -25 +26 @@
            'Mirror',
            'Autoinstall',
+           'Owner',
            'or_',
            ]
@@ -83 +85 @@
        Column('arch', String, nullable=False))
 
+owners_table = Table('owners', meta,
+       Column('owner_id', String, primary_key=True, nullable=False),
+       Column('ram_quota_total', Integer, nullable=True),
+       Column('ram_quota_single', Integer, nullable=True))
+
 machine_access_table = Table('machine_access', meta,
        Column('machine_id', Integer, ForeignKey('machines.machine_id', ondelete='CASCADE'), nullable=False, index=True),
@@ -120 +127 @@
         return "<Autoinstall %s: %s (%s)>" % (self.autoinstall_id, self.description, self.type.type_id)
 
+from owner import Owner
+
 session.mapper(Machine, machine_table,
               properties={'nics': relation(NIC, backref="machine"),
@@ -133 +142 @@
                properties={'mirror': relation(Mirror, backref="cdroms")})
 session.mapper(Autoinstall, autoinstalls_table)
+session.mapper(Owner, owners_table)
 
 def clear_cache():

trunk/packages/invirt-remote/debian/changelog

@@ -2 +2 @@
 
   * modified host/usr/sbin/invirt-availability and invirt-vmcontrol to stat
-    /etc/invirt/nocreate; if it exists, they advertise zero free memory and 
+    /etc/invirt/nocreate; if it exists, they advertise zero free memory and
     refuse to create VMs
-
- -- Peter A. Iannucci <iannucci@mit.edu>  Sat, 14 Feb 2009 18:10:54 -0500
+  * added memory quota validation to invirt-remote-create
+  * added owner table to database with ram_quota_total and ram_quota_single
+
+ -- Peter A. Iannucci <iannucci@mit.edu>  Mon, 16 Feb 2009 23:49:14 -0500
 
 invirt-remote (0.3.3) unstable; urgency=low

trunk/packages/invirt-remote/server/usr/sbin/invirt-remote-create

@@ -13 +13 @@
 import sys
 import yaml
+import invirt.database
+
+def maxMemory(owner, xmlist):
+    """
+    Return the memory available for a new machine.
+    """
+    machines = invirt.database.Machine.query().filter_by(owner=owner)
+    (quota_total, quota_single) = invirt.database.Owner.getQuotas(owner)
+
+    active_machines = [m for m in machines if m.name in xmlist]
+    mem_usage = sum([x.memory for x in active_machines])
+    return min(quota_single, quota_total-mem_usage)
 
 def choose_host():
@@ -50 +62 @@
         return 1
 
+    if operation == "create":
+        invirt.database.connect()
+        machine = invirt.database.Machine.query().filter_by(name=machine_name).first()
+
+        owner = machine.owner
+        vm_memory = machine.memory
+
+        max_memory = maxMemory(owner, vms.keys())
+        if vm_memory > max_memory:
+            print >>sys.stderr, "owner %s requested %d MB of memory for vm %s; %d MB allowed" % (owner, vm_memory, machine_name, max_memory)
+            return 1
+
     host = choose_host()
     print 'Creating on host %s...' % host

trunk/packages/invirt-web/code/validation.py

@@ -6 +6 @@
 import string
 import dns.resolver
-from invirt.database import Machine, NIC, Type, Disk, CDROM, Autoinstall
+from invirt.database import Machine, NIC, Type, Disk, CDROM, Autoinstall, Owner
 from invirt.config import structs as config
 from invirt.common import InvalidInput, CodeError
 
-MAX_MEMORY_TOTAL = 512
-MAX_MEMORY_SINGLE = 512
 MIN_MEMORY_SINGLE = 16
 MAX_DISK_TOTAL = 50
@@ -92 +90 @@
     returned.
     """
-    if machine is not None and machine.memory > MAX_MEMORY_SINGLE:
-        # If they've been blessed, let them have it
-        return machine.memory
+    (quota_total, quota_single) = Owner.getQuotas(machine.owner if machine else owner)
+
     if not on:
-        return MAX_MEMORY_SINGLE
+        return quota_single
     machines = getMachinesByOwner(owner, machine)
     active_machines = [m for m in machines if m.name in g.xmlist_raw]
     mem_usage = sum([x.memory for x in active_machines if x != machine])
-    return min(MAX_MEMORY_SINGLE, MAX_MEMORY_TOTAL-mem_usage)
+    return min(quota_single, quota_total-mem_usage)
 
 def maxDisk(owner, machine=None):

trunk/packages/invirt-web/debian/changelog

@@ +1 @@
+invirt-web (0.0.19) unstable; urgency=low
+
+  * modified quota checking to refer to invirt.database.Owner for quotas and defaults
+
+ -- Peter A. Iannucci <iannucci@mit.edu>  Mon, 16 Feb 2009 23:49:21 -0500
+
 invirt-web (0.0.18) unstable; urgency=low