Re: [PATCH v1 5/5] events: Unmount all lost mounts at task fail

[Jan Kiszka <jan.kiszka@siemens.com>]

On 07.07.21 18:38, Anton Mikanovich wrote:
> Perform mounts cleanup in case task fail.
> 
> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
> ---
>  meta/classes/isar-events.bbclass | 27 +++++++++++++++++++++++++++
>  1 file changed, 27 insertions(+)
> 
> diff --git a/meta/classes/isar-events.bbclass b/meta/classes/isar-events.bbclass
> index 73419b4..50f5cb3 100644
> --- a/meta/classes/isar-events.bbclass
> +++ b/meta/classes/isar-events.bbclass
> @@ -4,6 +4,25 @@
>  # Copyright (C) 2015-2017 ilbers GmbH
>  # Copyright (c) Siemens AG, 2018
>  
> +def is_mounted(d, mountpoint, subpath=None):
> +    path = d.getVar(mountpoint, True)
> +    if path:
> +        if subpath:
> +            path = os.path.join(path, subpath)
> +        path = os.path.realpath(path)
> +        with open('/proc/mounts') as f:
> +            for line in f.readlines():
> +                if path in line:
> +                    return True
> +    return False
> +
> +def safe_exec(func, d):
> +    try:
> +        if d.getVar(func, False):
> +            bb.build.exec_func(func, d)
> +    except Exception:
> +        pass
> +
>  addhandler build_started
>  
>  python build_started() {
> @@ -35,6 +54,14 @@ python task_failed() {
>      # Avoid false positives if a second target depends on this task and retries
>      # the execution after the first failure.
>      os.remove(task_once_stamp(d))
> +
> +    # Cleanup possible lost mounts
> +    if is_mounted(d, 'BUILDROOT_DEPLOY'):
> +        safe_exec("image_undo_mounts", d)
> +    if is_mounted(d, 'BUILDROOT'):
> +        safe_exec("dpkg_undo_mounts", d)
> +    if is_mounted(d, 'ROOTFSDIR', 'dev'):
> +        safe_exec("rootfs_undo_mounts", d)
>  }
>  task_failed[eventmask] = "bb.build.TaskFailed"
>  
> 

No looping, so everything you miss here will continue to be cleaned up
by build_completed() - so what's the point of these changes?

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux