diff options
| author | Eric Harney <eharney@redhat.com> | 2019-10-29 11:50:19 -0400 |
|---|---|---|
| committer | Keigo Noha <knoha@redhat.com> | 2020-01-31 01:14:14 +0000 |
| commit | d3865ecd75f083a9d478f29cd674a1de112cb8a2 (patch) | |
| tree | 291737a1a8d1c9dcef3ec9e0dc3175ffe0c70e92 | |
| parent | 772897cad777716e55216f59d0e11ec191b31c80 (diff) | |
| download | cinder-d3865ecd75f083a9d478f29cd674a1de112cb8a2.tar.gz | |
Increase cpu limit for image conversion
The 8 second timeout is not always sufficient for
large images.
Bump to 30s, which matches what Nova currently
uses for this same limit.
Change-Id: I0c26c400f08d91c8c125c69e06e4c90302bcdbb1
Closes-Bug: #1705340
(cherry picked from commit 3566c5145ad676c7eb5952807f3ef1c44c142b74)
(cherry picked from commit fa6f7d3d319647bee17ebc9a390ae26c14f3650f)
(cherry picked from commit 186fb25d049a2136eb71f9fece81903450b22890)
(cherry picked from commit ce951a3b586bc51a77422c3079637198f14ecb44)
| -rw-r--r-- | cinder/image/image_utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cinder/image/image_utils.py b/cinder/image/image_utils.py index b02ba86bb..d69ac20d0 100644 --- a/cinder/image/image_utils.py +++ b/cinder/image/image_utils.py @@ -58,7 +58,7 @@ CONF = cfg.CONF CONF.register_opts(image_helper_opts) QEMU_IMG_LIMITS = processutils.ProcessLimits( - cpu_time=8, + cpu_time=30, address_space=1 * units.Gi) VALID_DISK_FORMATS = ('raw', 'vmdk', 'vdi', 'qcow2', |