Merge branch 'fix-wakeup' into 'master'

Handle wake up errors v2

Closes #272

circle/vm/operations.py

@@ -34,6 +34,7 @@ from common.models import (
     create_readable, humanize_exception, HumanReadableException
     create_readable, humanize_exception, HumanReadableException
 )
 )
 from common.operations import Operation, register_operation
 from common.operations import Operation, register_operation
+from manager.scheduler import SchedulerError
 from .tasks.local_tasks import (
 from .tasks.local_tasks import (
     abortable_async_instance_operation, abortable_async_node_operation,
     abortable_async_instance_operation, abortable_async_node_operation,
 )
 )
@@ -728,6 +729,9 @@ class WakeUpOperation(InstanceOperation):
         return self.instance.status == self.instance.STATUS.SUSPENDED
         return self.instance.status == self.instance.STATUS.SUSPENDED
 
 
     def on_abort(self, activity, error):
     def on_abort(self, activity, error):
+        if isinstance(error, SchedulerError):
+            activity.resultant_state = None
+        else:
             activity.resultant_state = 'ERROR'
             activity.resultant_state = 'ERROR'
 
 
     def _operation(self, activity, timeout=60):
     def _operation(self, activity, timeout=60):