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
Commit
d0dc3084
authored
Jul 05, 2014
by
Bach Dániel
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into feature-fix-acls
parents
af9bded6
0ac786b5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
circle/vm/models/instance.py
+3
-2
circle/vm/operations.py
+5
-5
No files found.
circle/vm/models/instance.py
View file @
d0dc3084
...
...
@@ -827,7 +827,8 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
def
migrate_vm
(
self
,
to_node
,
timeout
=
120
):
queue_name
=
self
.
get_remote_queue_name
(
'vm'
,
'slow'
)
return
vm_tasks
.
migrate
.
apply_async
(
args
=
[
self
.
vm_name
,
to_node
.
host
.
hostname
],
to_node
.
host
.
hostname
,
True
],
queue
=
queue_name
)
.
get
(
timeout
=
timeout
)
...
...
@@ -864,7 +865,7 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
AbortableAsyncResult
(
remote
.
id
)
.
abort
()
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'
)
return
vm_tasks
.
sleep
.
apply_async
(
args
=
[
self
.
vm_name
,
self
.
mem_dump
[
'path'
]],
...
...
circle/vm/operations.py
View file @
d0dc3084
...
...
@@ -275,10 +275,6 @@ class MigrateOperation(InstanceOperation):
to_node
=
self
.
instance
.
select_node
()
sa
.
result
=
to_node
# Shutdown networks
with
activity
.
sub_activity
(
'shutdown_net'
):
self
.
instance
.
shutdown_net
()
try
:
with
activity
.
sub_activity
(
'migrate_vm'
):
self
.
instance
.
migrate_vm
(
to_node
=
to_node
,
timeout
=
timeout
)
...
...
@@ -287,6 +283,10 @@ class MigrateOperation(InstanceOperation):
self
.
rollback
(
activity
)
raise
# Shutdown networks
with
activity
.
sub_activity
(
'shutdown_net'
):
self
.
instance
.
shutdown_net
()
# Refresh node information
self
.
instance
.
node
=
to_node
self
.
instance
.
save
()
...
...
@@ -556,7 +556,7 @@ class SleepOperation(InstanceOperation):
def
on_commit
(
self
,
activity
):
activity
.
resultant_state
=
'SUSPENDED'
def
_operation
(
self
,
activity
,
timeout
=
6
0
):
def
_operation
(
self
,
activity
,
timeout
=
24
0
):
# Destroy networks
with
activity
.
sub_activity
(
'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