[haizea-commit] r774 - branches/1.1/src/haizea/core

[haizea-commit at mailman.cs.uchicago.edu]

Author: borja
Date: 2010-01-15 17:22:47 -0600 (Fri, 15 Jan 2010)
New Revision: 774

Modified:
   branches/1.1/src/haizea/core/leases.py
Log:
More sanity checks

Modified: branches/1.1/src/haizea/core/leases.py
===================================================================
--- branches/1.1/src/haizea/core/leases.py	2010-01-15 21:08:48 UTC (rev 773)
+++ branches/1.1/src/haizea/core/leases.py	2010-01-15 23:22:47 UTC (rev 774)
@@ -715,12 +715,19 @@
             
     def sanity_check(self):
         prev_time = None
+        prev_vmrr = None
         for vmrr in self.vm_rrs:
             if len(vmrr.pre_rrs) > 0:
                 prev_time = vmrr.pre_rrs[0].start - 1
             else:
                 prev_time = vmrr.start - 1
                 
+            if prev_vmrr != None:
+                if vmrr.is_resuming():
+                    assert prev_vmrr.is_suspending()
+            else:
+                assert not vmrr.is_resuming()
+                
             for pre_rr in vmrr.pre_rrs:
                 assert pre_rr.start >= prev_time
                 assert pre_rr.end >= pre_rr.start
@@ -737,7 +744,10 @@
                 assert post_rr.start >= prev_time
                 assert post_rr.end >= post_rr.start
                 prev_time = post_rr.end
+                
+            prev_vmrr = vmrr
             
+            
     def __estimate_suspend_resume_time(self, rate):
         """ Estimate the time to suspend/resume an entire lease