Feature Abort Shutdown
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
-
Ownerview ready
-
8 8 {{ a.get_readable_name }} 9 9 </strong> 10 10 {{ a.started|date:"Y-m-d H:i" }}{% if a.user %}, {{ a.user }}{% endif %} 11 {% if user.is_superuser and a.activity_code == "vm.Instance.shutdown" and not a.finished %} -
Owner
Activity.abortable field/property would make more sense.
-
-
8 8 {{ a.get_readable_name }} 9 9 </strong> 10 10 {{ a.started|date:"Y-m-d H:i" }}{% if a.user %}, {{ a.user }}{% endif %} 11 {% if user.is_superuser and a.activity_code == "vm.Instance.shutdown" and not a.finished %} 12 <form action="" method="POST" class="pull-right"> 13 {% csrf_token %} 14 <input type="hidden" name="abort_shutdown"/> 15 <button class="btn btn-danger btn-xs"><i class="icon-bolt"></i> {% trans "Abort shutdown" %}</button> -
Owner
👍 (IF comments above fixed and tests added) -
1042 1047 return local_tasks.wake_up.apply_async(args=[self, user], 1043 1048 queue="localhost.man") 1044 1049 1045 def shutdown(self, user=None, task_uuid=None, timeout=120): 1050 def shutdown(self, user=None, task_uuid=None, abortable_task=None, 1051 timeout=120): 1046 1052 """Shutdown virtual machine with ACPI signal. 1047 1053 """ 1048 1054 def __on_abort(activity, error): 1049 if isinstance(error, TimeLimitExceeded): 1055 if isinstance(error, TimeLimitExceeded) or \ 1056 isinstance(error, AbortException): -
Owner
isinstance(error, (TimeLimitExceeded, AbortException)) would be the same, only shorter
-
-
Status changed to closed
Toggle commit list -
Owner
This won't be merged, !70 (merged) addresses the same issue.
