Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
A prog2-höz tartozó friss repo anyagok itt elérhetőek:
https://git.iit.bme.hu/
Commit
0ac786b5
authored
Jul 05, 2014
by
Bach Dániel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vm: increase timeout in SleepOperation
parent
15821cba
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
circle/vm/models/instance.py
+1
-1
circle/vm/operations.py
+1
-1
No files found.
circle/vm/models/instance.py
View file @
0ac786b5
...
@@ -860,7 +860,7 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
...
@@ -860,7 +860,7 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
AbortableAsyncResult
(
remote
.
id
)
.
abort
()
AbortableAsyncResult
(
remote
.
id
)
.
abort
()
raise
Exception
(
"Shutdown aborted by user."
)
raise
Exception
(
"Shutdown aborted by user."
)
def
suspend_vm
(
self
,
timeout
=
6
0
):
def
suspend_vm
(
self
,
timeout
=
23
0
):
queue_name
=
self
.
get_remote_queue_name
(
'vm'
,
'slow'
)
queue_name
=
self
.
get_remote_queue_name
(
'vm'
,
'slow'
)
return
vm_tasks
.
sleep
.
apply_async
(
args
=
[
self
.
vm_name
,
return
vm_tasks
.
sleep
.
apply_async
(
args
=
[
self
.
vm_name
,
self
.
mem_dump
[
'path'
]],
self
.
mem_dump
[
'path'
]],
...
...
circle/vm/operations.py
View file @
0ac786b5
...
@@ -503,7 +503,7 @@ class SleepOperation(InstanceOperation):
...
@@ -503,7 +503,7 @@ class SleepOperation(InstanceOperation):
def
on_commit
(
self
,
activity
):
def
on_commit
(
self
,
activity
):
activity
.
resultant_state
=
'SUSPENDED'
activity
.
resultant_state
=
'SUSPENDED'
def
_operation
(
self
,
activity
,
timeout
=
6
0
):
def
_operation
(
self
,
activity
,
timeout
=
24
0
):
# Destroy networks
# Destroy networks
with
activity
.
sub_activity
(
'shutdown_net'
):
with
activity
.
sub_activity
(
'shutdown_net'
):
self
.
instance
.
shutdown_net
()
self
.
instance
.
shutdown_net
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment