[haizea-commit] r839 - branches/1.1/src/haizea/core/scheduler

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

Author: borja
Date: 2010-07-28 17:34:24 -0500 (Wed, 28 Jul 2010)
New Revision: 839

Modified:
   branches/1.1/src/haizea/core/scheduler/lease_scheduler.py
Log:
If lease is in state SUSPENDED_SCHEDULED, don't remove its files when it is cancelled.


Modified: branches/1.1/src/haizea/core/scheduler/lease_scheduler.py
===================================================================
--- branches/1.1/src/haizea/core/scheduler/lease_scheduler.py	2010-07-28 22:33:24 UTC (rev 838)
+++ branches/1.1/src/haizea/core/scheduler/lease_scheduler.py	2010-07-28 22:34:24 UTC (rev 839)
@@ -804,7 +804,10 @@
                     
         if must_cancel_and_requeue:
             self.logger.info("... lease #%i has been cancelled and requeued." % lease.id)
-            self.preparation_scheduler.cancel_preparation(lease)
+            if lease.get_state() == Lease.STATE_SUSPENDED_SCHEDULED:
+                self.preparation_scheduler.cancel_preparation(lease, remove_files = False)
+            else:
+                self.preparation_scheduler.cancel_preparation(lease)
             self.vm_scheduler.cancel_vm(vmrr)
             lease.remove_vmrr(vmrr)
             # TODO: Take into account other states