Changeset 1661:8273ceb1c759

Timestamp:

06/13/08 16:19:41 (2 months ago)

Author:

klai@…

Branch:

default

Message:

Bring up IPv4Address resources during boot process rather than after, thus speeding up boot

Location:

src/Tycoon/Virtualization

Files:

• Resources.py (modified) (1 diff)
• Xen.py (modified) (1 diff)
• XenResources.py (modified) (5 diffs)
• XenUtil.py (modified) (2 diffs)

src/Tycoon/Virtualization/Resources.py

@@ -58 +58 @@
 
         self.__accumulated_resources = {}
+        self.last_share = {}
+
+    def set_last_share(self, account_name):
+        self.set_share(*((account_name,) + self.last_share[account_name]))
+        
+    def clear_shares(self):
+        self.last_share = {}
 
     def verify(self):

src/Tycoon/Virtualization/Xen.py

@@ -648 +648 @@
     def set_share_start(self):
         self.resources['CPU'].clear_shares()
+        self.resources['IPv4Address'].clear_shares()
 
     def configure_file_system(

src/Tycoon/Virtualization/XenResources.py

@@ -64 +64 @@
             capacity = cpu_info['cpu_khz'] * 1000
         self.set_min_capacity(capacity)
-        self.__last_share = {}
         
     def is_available(self, requested_id, pref):
@@ -98 +97 @@
 
     def set_share(self, account_name, share, num_vcpus=None):
-        self.__last_share[account_name] = share
+        self.last_share[account_name] = (share, num_vcpus)
         domain_info = self.__get_domain_info(account_name)
         # Must set vcpus before checking if the domain is running
@@ -122 +121 @@
             x = domain_info['cpu_time']
         return x
-
-    def set_last_share(self, account_name):
-        self.set_share(account_name, self.__last_share[account_name])
-        
-    def clear_shares(self):
-        self.__last_share = {}
 
     def get_total_capacity(self):
@@ -558 +551 @@
     def __init__(
         self, __reactor, __instances, __get_domain_info, __get_account_status,
-        __write_account, __get_state, __shutdown_vm, __xen_main,
-        __xen_server):
+        __write_account, __get_state, __shutdown_vm, __xen_main, __xen_server):
         """
         """
@@ -666 +658 @@
         
     def set_share(self, account_name, share, resource_id):
+        self.last_share[account_name] = (share, resource_id)
         domain_info = self.__get_domain_info(account_name)
 

src/Tycoon/Virtualization/XenUtil.py

@@ -214 +214 @@
 class Boot(object):
     """Boot the virtual machine.
-    If necessary, temporarily reserve memory to
-    be able to boot, and then drop reservation.
     """
     def __init__(
@@ -279 +277 @@
                     config_file, i + 1), 'error_value': d.result}
             return
-
+        
+        # Some resources need to be allocated after the boot is initiated
         self.__resources['CPU'].set_last_share(account_name)
+        self.__resources['IPv4Address'].set_last_share(account_name)
         d = defer.Deferred()
         self.__reactor.callLater(