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
35fec9da
authored
Dec 21, 2020
by
Máhonfai Bálint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add percentage progress and abort to import disk operation
parent
c62edb89
Pipeline
#1387
passed with stage
in 0 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
18 deletions
+30
-18
circle/storage/models.py
+26
-16
circle/vm/operations.py
+4
-2
No files found.
circle/storage/models.py
View file @
35fec9da
...
...
@@ -123,8 +123,8 @@ class Disk(TimeStampedModel):
TYPES
=
[(
'qcow2-norm'
,
'qcow2 normal'
),
(
'qcow2-snap'
,
'qcow2 snapshot'
),
(
'iso'
,
'iso'
),
(
'raw-ro'
,
'raw read-only'
),
(
'raw-rw'
,
'raw'
)]
BUS_TYPES
=
((
'virtio'
,
'virtio'
),
(
'ide'
,
'ide'
),
(
'scsi'
,
'scsi'
))
EXPORT_FORMATS
=
((
'
vmdk'
,
_
(
'VMware
disk image'
)),
(
'
qcow2'
,
_
(
'QEMU
disk image'
)),
EXPORT_FORMATS
=
((
'
qcow2'
,
_
(
'QEMU
disk image'
)),
(
'
vmdk'
,
_
(
'VMware
disk image'
)),
(
'vdi'
,
_
(
'VirtualBox disk image'
)),
(
'vpc'
,
_
(
'HyperV disk image'
)))
name
=
CharField
(
blank
=
True
,
max_length
=
100
,
verbose_name
=
_
(
"name"
))
...
...
@@ -431,6 +431,19 @@ class Disk(TimeStampedModel):
return
disk
@classmethod
def
_run_abortable_task
(
cls
,
remote
,
task
):
while
True
:
try
:
result
=
remote
.
get
(
timeout
=
5
)
break
except
TimeoutError
as
e
:
if
task
is
not
None
and
task
.
is_aborted
():
AbortableAsyncResult
(
remote
.
id
)
.
abort
()
raise
humanize_exception
(
ugettext_noop
(
"Operation aborted by user."
),
e
)
return
result
@classmethod
def
download
(
cls
,
url
,
task
,
user
=
None
,
**
params
):
"""Create disk object and download data from url synchronusly.
...
...
@@ -455,15 +468,7 @@ class Disk(TimeStampedModel):
kwargs
=
{
'url'
:
url
,
'parent_id'
:
task
.
request
.
id
,
'disk'
:
disk
.
get_disk_desc
()},
queue
=
queue_name
)
while
True
:
try
:
result
=
remote
.
get
(
timeout
=
5
)
break
except
TimeoutError
as
e
:
if
task
is
not
None
and
task
.
is_aborted
():
AbortableAsyncResult
(
remote
.
id
)
.
abort
()
raise
humanize_exception
(
ugettext_noop
(
"Operation aborted by user."
),
e
)
result
=
cls
.
_run_abortable_task
(
remote
,
task
)
disk
.
size
=
result
[
'size'
]
disk
.
type
=
result
[
'type'
]
disk
.
checksum
=
result
.
get
(
'checksum'
,
None
)
...
...
@@ -472,17 +477,22 @@ class Disk(TimeStampedModel):
return
disk
@classmethod
def
import_disk
(
cls
,
user
,
name
,
download_link
,
t
imeout
=
3600
):
def
import_disk
(
cls
,
user
,
name
,
download_link
,
t
ask
):
params
=
{
'name'
:
name
,
'type'
:
'qcow2-norm'
}
disk
=
cls
.
create
(
user
,
**
params
)
disk
=
cls
.
__create
(
user
=
user
,
params
=
params
)
queue_name
=
disk
.
get_remote_queue_name
(
'storage'
,
priority
=
'slow'
)
remote
=
storage_tasks
.
import_disk
.
apply_async
(
args
=
[
disk
.
get_disk_desc
(),
download_link
],
kwargs
=
{
"disk_desc"
:
disk
.
get_disk_desc
(),
"url"
:
download_link
,
"task"
:
task
.
request
.
id
},
queue
=
queue_name
)
disk_size
=
remote
.
get
(
timeout
=
timeout
)
disk
.
size
=
disk_size
result
=
cls
.
_run_abortable_task
(
remote
,
task
)
disk
.
size
=
result
[
"size"
]
disk
.
checksum
=
result
[
"checksum"
]
disk
.
is_ready
=
True
disk
.
save
()
return
disk
...
...
circle/vm/operations.py
View file @
35fec9da
...
...
@@ -351,6 +351,8 @@ class ImportDiskOperation(InstanceOperation):
description
=
_
(
'Import and attach a disk image to the virtual machine '
'from the user store. The disk image has to be in the '
'root directory of the store.'
)
abortable
=
True
has_percentage
=
True
required_perms
=
(
'storage.import_disk'
,)
accept_states
=
(
'STOPPED'
,
'PENDING'
,
'RUNNING'
)
async_queue
=
'localhost.man.slow'
...
...
@@ -362,10 +364,10 @@ class ImportDiskOperation(InstanceOperation):
except
NoStoreException
:
raise
PermissionDenied
def
_operation
(
self
,
user
,
name
,
disk_path
):
def
_operation
(
self
,
user
,
name
,
disk_path
,
task
):
store
=
Store
(
user
)
download_link
=
store
.
request_download
(
disk_path
)
disk
=
Disk
.
import_disk
(
user
,
name
,
download_link
)
disk
=
Disk
.
import_disk
(
user
,
name
,
download_link
,
task
)
self
.
instance
.
disks
.
add
(
disk
)
...
...
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