From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7116443733323677696 X-Received: by 2002:a05:6512:e83:b0:489:c6fe:e121 with SMTP id bi3-20020a0565120e8300b00489c6fee121mr10086478lfb.100.1657564286827; Mon, 11 Jul 2022 11:31:26 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a7d6:0:b0:25d:302b:5ef8 with SMTP id x22-20020a2ea7d6000000b0025d302b5ef8ls103174ljp.8.gmail; Mon, 11 Jul 2022 11:31:25 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uVw9LtlZQGotMZs8LWH8muJCxHVCGh1Yp8gkmL9UJYv1637QkntsdzLVI7PlbqkbE2wPX6 X-Received: by 2002:a05:651c:a0c:b0:25d:7468:f9b6 with SMTP id k12-20020a05651c0a0c00b0025d7468f9b6mr1386752ljq.306.1657564285659; Mon, 11 Jul 2022 11:31:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657564285; cv=none; d=google.com; s=arc-20160816; b=lhVlt3oSEZIg53zVMuHkIv1T1TDzdQbeaUgIsQ5w6H4xUJKWSQNzdxJbEge1w2Se+O dpaX5QBVu/mU/bOYTpPLrhMrixwDnKWHTJcGDQoelhufaegbwmpxtBoTSTnzXBAgy/H5 ve58s3ZV3Kliu7XySM81bOlhygmrzeT/MrQWhvrcD0iSYLPi8+HiCzXNytiADFp/XrWr X8GmnvHqhtBiEOT+QJ5Gh0YlhAIkVUlrXsj4jKdr5nYOUPHHOePiUIBxgfhLERJwDDS6 Qe3CdkE4N+bYvrs+q4xux71tkJoLDfA/fUy1pxoukHCdTUmlFoYutdrevXdtqwdebaEL wkBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from; bh=OKMFKf5/N83yhBls7fUZNgF6hXTJpbtKfaE8xov13wA=; b=fkyzI6OwafJCIS0klr2Vl9ixsGwMUh5Mwg5MbvVCUtSZzfAIVXyQL0dWnJFitdnGbI E+vlBb68SNPKdDHQ2AB1PFxOIxMCc7sDjhIsrQlnBX0jNK8jvAn02X+TaW/AbDCWKsxJ +ivegdnRzJDUbKZKL2qMHR73hh6SiFECKRaCT3Varxei5kt5d7LeEuPvRe3otHXqwDwl Tm8BlmMiYd+EWwuiifJ1RldT9RUdpV7WfS3Rr8hmpbKv32eMpx8gdb7FnHajfNAW1eXw e/XqpANyNjdP+lRCvx5YkZZjH6P+kO0BFEV3OP0TSj8TK+xmFB06e4r+z53Om+qFfuUc GjwQ== 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 k7-20020a2ea267000000b0025d5ca4448esi257437ljm.3.2022.07.11.11.31.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Jul 2022 11:31:25 -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 alena-nb.promwad.com (mm-243-40-214-37.mgts.dynamic.pppoe.byfly.by [37.214.40.243] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 26BIVJ4K008867 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 Jul 2022 20:31:20 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich , Felix Moessbauer Subject: [RFC] add uuid to schroot folder Date: Mon, 11 Jul 2022 21:31:11 +0300 Message-Id: <20220711183111.3860-1-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 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: /qS8OoTSE4qG PIDs are not unique across containers. When running the build in a container (e.g. the kas container), the PID of bitbake is likely the same across multiple simultaneously running builds. This is especially the case for CI runners, where it is common that multiple jobs run in parallel. This patch adds an additional UUID component stored till the end of the build in bitbake persistend storage. Signed-off-by: Anton Mikanovich Signed-off-by: Felix Moessbauer --- meta/classes/base.bbclass | 14 ++++++++++++++ meta/classes/isar-events.bbclass | 3 +++ meta/classes/sbuild.bbclass | 2 +- meta/conf/bitbake.conf | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 4ec2c81..1d954de 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -278,3 +278,17 @@ def base_set_filespath(path, d): if p != "": filespath.append(os.path.join(p, o)) return ":".join(filespath) + +def calculate_build_uuid(d): + import uuid + + uuid_data = bb.persist_data.persist('BB_ISAR_UUID_DATA', d) + if "uuid" not in uuid_data or not uuid_data["uuid"]: + # Generate new UUID + uuid_data["uuid"] = str(uuid.uuid4()) + + return uuid_data["uuid"] + +# Unique ID for this build, used to avoid name clashes on external mountpoints +# When running parallel builds in different PID namespaces +ISAR_BUILD_UUID = "${@ calculate_build_uuid(d)}" diff --git a/meta/classes/isar-events.bbclass b/meta/classes/isar-events.bbclass index 92aff20..f52b234 100644 --- a/meta/classes/isar-events.bbclass +++ b/meta/classes/isar-events.bbclass @@ -60,6 +60,9 @@ python build_completed() { stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, ) + + # Cleanup build UUID, the next bitbake run will generate new one + bb.persist_data.persist('BB_ISAR_UUID_DATA', d).clear() } build_completed[eventmask] = "bb.event.BuildCompleted" diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass index f9bfaaf..7c39954 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -23,7 +23,7 @@ python __anonymous() { d.setVar('SCHROOT_DEP', dep) } -SBUILD_CHROOT ?= "${DEBDISTRONAME}-${SCHROOT_USER}-${@os.getpid()}" +SBUILD_CHROOT ?= "${DEBDISTRONAME}-${SCHROOT_USER}-${ISAR_BUILD_UUID}-${@os.getpid()}" SBUILD_CONF_DIR ?= "${SCHROOT_CONF}/${SBUILD_CHROOT}" SCHROOT_CONF_FILE ?= "${SCHROOT_CONF}/chroot.d/${SBUILD_CHROOT}" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 6451cb5..cadfbdd 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -104,7 +104,7 @@ BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DI WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \ BB_WORKERCONTEXT BB_LIMITEDDEPS DEPLOY_DIR BUILDCHROOT_DIR \ REPO_ISAR_DIR REPO_ISAR_DB_DIR REPO_BASE_DIR REPO_BASE_DB_DIR LAYERDIR_core \ - SCRIPTSDIR TOPDIR" + SCRIPTSDIR TOPDIR ISAR_BUILD_UUID" BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \ SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \ -- 2.17.1