From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6982225001537601536 X-Received: by 2002:a05:600c:b48:: with SMTP id k8mr552642wmr.180.1625675948972; Wed, 07 Jul 2021 09:39:08 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:4fd0:: with SMTP id o16ls3923434wmq.0.canary-gmail; Wed, 07 Jul 2021 09:39:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw9wW4D2dH7dN3455wffjfGc1KH0n7c8vRgF2pzgcdNVw7utHJGi10INJnTnt7VZG4jc6yE X-Received: by 2002:a7b:c1c1:: with SMTP id a1mr28215035wmj.187.1625675948255; Wed, 07 Jul 2021 09:39:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625675948; cv=none; d=google.com; s=arc-20160816; b=txMWbF6665v3ki8NzB/QXBAfKq2xrdH/HhftwAX95kqxhYsW+xrnENVdl9VYOLw3Qh qVm0f8iQkUxwREvpzZE/gdXsRFbbXjZFPMqQBrg0yUXOpeWCZFiYWqlledlM1DXjcM4E 7HqlrhUoxihNsSF9wdsD9IWEm51J5MJaUSHA7jTk9AjSlpPtr0K3TMDZlH+Cv4nwmpkF o8cAeWo8uuUeOKRZWtGpEsS2qO/7fcbJk2gwJWB7HuyE+arJd/AdhHC+/PIJrgFeqyf2 ReXHfbjghb6dFLe4yZ8Ccn/gSY1LixxbJlomYzlcXGFdyZvAQem7CFdAzdCNukTPLmOm +fDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=HQnWegw2QRBKPSDEKHPpI85wm363yMboVW1Vp2vV0Zg=; b=gipnX+/L8fzzui7Auis4Ku9j2KAcLl8DGIBOGshOTvsYT8USutMrYzzURPvshES7GC 7alD8P3eQXmNrwYnyIg6tu6LoiGMYmYXFMj5KqWs9MDK6OL3Yyw2JI0fQFGNtTFZFB1g +I0m84P/U7os4JPmPUmGvAI1F90riMckYz7shbZhiumnlJGrVHJGzBNEeNzeTINsu4TG TR9CBgUuHbxyqMb3PIlJkUhU/jVAr7id6wJg4Xyh1p18dblsuJ0fXUqYR4ibShS3B0Ee Ndq0GOzfGcUJrmE3cTCt75B+oqsXFhoJMW/nXy1QlyoXFaiaTPVxtZF5XJ6kHdonG0Pt rosg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id g22si363885wmh.0.2021.07.07.09.39.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 Jul 2021 09:39:08 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-191-69-214-37.mgts.dynamic.pppoe.byfly.by [37.214.69.191] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 167GcxMT003642 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 7 Jul 2021 18:39:07 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v1 5/5] events: Unmount all lost mounts at task fail Date: Wed, 7 Jul 2021 19:38:51 +0300 Message-Id: <20210707163851.204296-6-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210707163851.204296-1-amikan@ilbers.de> References: <20210707163851.204296-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: oAaahfcDhbCE Perform mounts cleanup in case task fail. Signed-off-by: Anton Mikanovich --- 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" -- 2.25.1