diff options
| author | Daniel Watkins <oddbloke@ubuntu.com> | 2020-10-20 17:13:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 15:13:37 -0600 |
| commit | 5f8a2bbc5f26c7abafbc9bd3d1b1b655ffdcc1ae (patch) | |
| tree | dd1f2283049c257cae78f7fcb8d68276a77442b7 /cloudinit/config/cc_mounts.py | |
| parent | 468aede1384a5ba25c11a27db4e3e4b3f7b8e8b2 (diff) | |
| download | vyos-cloud-init-5f8a2bbc5f26c7abafbc9bd3d1b1b655ffdcc1ae.tar.gz vyos-cloud-init-5f8a2bbc5f26c7abafbc9bd3d1b1b655ffdcc1ae.zip | |
cc_mounts: correctly fallback to dd if fallocate fails (#585)
`create_swap()` was previously catching and not re-raising the
ProcessExecutionError that indicated swap creation failure; this meant
that the fallback logic could never be triggered.
This commit adds the required re-raise (as well as removing a duplicated
log message).
LP: #1897099
Diffstat (limited to 'cloudinit/config/cc_mounts.py')
| -rw-r--r-- | cloudinit/config/cc_mounts.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py index 54f2f878..c22d1698 100644 --- a/cloudinit/config/cc_mounts.py +++ b/cloudinit/config/cc_mounts.py @@ -255,8 +255,9 @@ def create_swapfile(fname: str, size: str) -> None: try: subp.subp(cmd, capture=True) except subp.ProcessExecutionError as e: - LOG.warning(errmsg, fname, size, method, e) + LOG.info(errmsg, fname, size, method, e) util.del_file(fname) + raise swap_dir = os.path.dirname(fname) util.ensure_dir(swap_dir) @@ -269,9 +270,8 @@ def create_swapfile(fname: str, size: str) -> None: else: try: create_swap(fname, size, "fallocate") - except subp.ProcessExecutionError as e: - LOG.warning(errmsg, fname, size, "dd", e) - LOG.warning("Will attempt with dd.") + except subp.ProcessExecutionError: + LOG.info("fallocate swap creation failed, will attempt with dd") create_swap(fname, size, "dd") if os.path.exists(fname): |