Commit 7e142ce6 by Dudás Ádám

vm: record unanticipated VM state changes to activity log

closes #70
parent 9406a057
......@@ -22,7 +22,8 @@ from taggit.managers import TaggableManager
from acl.models import AclBase
from storage.models import Disk
from ..tasks import local_tasks, vm_tasks, agent_tasks
from .activity import instance_activity, InstanceActivity
from .activity import (ActivityInProgressError, instance_activity,
from .common import BaseResourceConfigModel, Lease
from .network import Interface
from .node import Node, Trait
......@@ -274,6 +275,7 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
return 'NOSTATE' if act is None else act.resultant_state
def manual_state_change(self, new_state, reason=None, user=None):
# TODO cancel concurrent activity (if exists)
act = InstanceActivity.create(code_suffix='manual_state_change',
instance=self, user=user)
act.finished = act.started
......@@ -283,7 +285,16 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
def vm_state_changed(self, new_state):
act = InstanceActivity.create(code_suffix='vm_state_changed',
except ActivityInProgressError:
pass # discard state change if another activity is in progress.
act.finished = act.started
act.resultant_state = new_state
act.succeeded = True
def clean(self, *args, **kwargs):
if self.time_of_delete is None:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment