summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-06-02 02:29:57 +0000
committerGerrit Code Review <review@openstack.org>2021-06-02 02:29:57 +0000
commit2ad982dd8d9e5448dce511b44836fc63696d96b2 (patch)
tree5b33eb35905f4823898364b141ceeb0b3cbff404
parent5e518c9ff5818af50eb2107229ec3b25740bfd91 (diff)
parent68157a4bfa09e1a977c6e40909dcc0141e7dbf96 (diff)
downloadironic-python-agent-2ad982dd8d9e5448dce511b44836fc63696d96b2.tar.gz
Merge "Increase the memory limit for qemu-img" into stable/train
-rwxr-xr-xironic_python_agent/shell/write_image.sh4
-rw-r--r--releasenotes/notes/up-qemuimg-mem-1536183a02b3a235.yaml7
2 files changed, 9 insertions, 2 deletions
diff --git a/ironic_python_agent/shell/write_image.sh b/ironic_python_agent/shell/write_image.sh
index 0a780490..a89c68df 100755
--- a/ironic_python_agent/shell/write_image.sh
+++ b/ironic_python_agent/shell/write_image.sh
@@ -46,8 +46,8 @@ sgdisk -Z $DEVICE
log "Imaging $IMAGEFILE to $DEVICE"
-# limit the memory usage for qemu-img to 1 GiB
-ulimit -v 1048576
+# limit the memory usage for qemu-img to 2 GiB
+ulimit -v 2097152
qemu-img convert -t directsync -O host_device $IMAGEFILE $DEVICE
sync
diff --git a/releasenotes/notes/up-qemuimg-mem-1536183a02b3a235.yaml b/releasenotes/notes/up-qemuimg-mem-1536183a02b3a235.yaml
new file mode 100644
index 00000000..149c80c9
--- /dev/null
+++ b/releasenotes/notes/up-qemuimg-mem-1536183a02b3a235.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+ - |
+ Increase memory usage limit for ``qemu-img convert`` command to 2 GiB.
+ See `Story 2008667
+ <https://storyboard.openstack.org/#!/story/2008667>`_
+ for details.