From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7183020631148986368 X-Received: by 2002:a17:902:eb0a:b0:192:6e41:c972 with SMTP id l10-20020a170902eb0a00b001926e41c972mr1824638plb.115.1672427322049; Fri, 30 Dec 2022 11:08:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:249:b0:226:42ea:28cc with SMTP id t9-20020a17090a024900b0022642ea28ccls720393pje.0.-pod-preprod-gmail; Fri, 30 Dec 2022 11:08:41 -0800 (PST) X-Google-Smtp-Source: AMrXdXuu4ahJOdTIziGb7CjP2xTzsrfD4C0srLQW8rbrkefzHHvaRVQRAVrU+WmPCEAFb5fKOXpg X-Received: by 2002:a05:6a20:9591:b0:ad:7428:d326 with SMTP id iu17-20020a056a20959100b000ad7428d326mr44612034pzb.30.1672427321195; Fri, 30 Dec 2022 11:08:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672427321; cv=none; d=google.com; s=arc-20160816; b=a5QWgeFhbARAG4F/72X026jILOIrBtPR9Gd6KJXG8l8m6MkiyVYLWi49IwRp9vMUuz Ltvf5t/t1Ns6SxBfy2ABsW/UMMw/9lcVCv4Y9d13m6MlgeIxfB9pd67aZFuzk9jX9kwp 6m00TjeJ2fETvWhPnwWnnS4u3sKUHHBcoAzCUHDXJHxVJA3pSLhxjeMclFRicMegmFq6 tQl+ryr8/9/+raRY2VkUuUuZcBQLpoe52pUIwM1RXKc8LFxlFvu9QGkJ9wqEr357oG7S nvE/jUTtsD7HgzLap75Kgn4F4qO+DtS6FtYwIZSJJcLTL+xDuu2zjES2z5aNEhkkROH5 sgsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=S4x9garkm3QRwU9X8OWF7k4kvmOKsytEKQVcAiFB1a0=; b=sjdD9Qkg7BE3qmJMVhVZgNNi3n1jdILUs7d6sw8H2ACi7tqUtlERIiXUF+gKhk2ePX S87wXTSl6gZTW+L7BhBLMZFCi4xg+DZvej/oOZtw2wmD4USsIPwglJIRS1hBEU4YwCOl 8+3HzI92UBdHBBUHyY/HK3YSYZ582WZJ5hpR9adS67X14VgIM36i5znVSNMVDwWZtzp0 riFO+GRDmlNk17S3D1zbSDi9zURBd7UTHL0a8mUsSivi4gcpEg6ChoXUr7fZh61BzFMK U/m+k/l8re+dJwdWMv8QWkdyEe/Sxr87ImOqXG5mg+HPKkRbXJl0QJCofYv2MIy1AX5k 2Kiw== 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 m9-20020a638c09000000b004772aed5c8bsi1527916pgd.1.2022.12.30.11.08.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Dec 2022 11:08:41 -0800 (PST) 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 ([194.49.52.150]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 2BUJ8WNG014232 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 30 Dec 2022 20:08:38 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 4/4] events: Cleanup lost schroot sessions if any Date: Fri, 30 Dec 2022 22:08:24 +0300 Message-Id: <20221230190824.12256-5-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221230190824.12256-1-amikan@ilbers.de> References: <20221230190824.12256-1-amikan@ilbers.de> 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: +xceMxhZE7w0 In case the user will only open imager schroot session but not close it we need to find and clean it up. Signed-off-by: Anton Mikanovich --- meta/classes/isar-events.bbclass | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/meta/classes/isar-events.bbclass b/meta/classes/isar-events.bbclass index f52b2349..5343d4b1 100644 --- a/meta/classes/isar-events.bbclass +++ b/meta/classes/isar-events.bbclass @@ -51,6 +51,22 @@ python build_completed() { basepath = tmpdir + '/work/' + build_uuid = d.getVar('ISAR_BUILD_UUID', True) + sessions = subprocess.run('schroot -l --all-sessions | grep isar | grep %s' % build_uuid, + shell=True, stdout=subprocess.PIPE).stdout.decode('utf-8') + for line in sessions.splitlines(): + session_id = line.split(':', 1)[1] + bb.debug(1, 'Closing imager session %s' % session_id) + id = subprocess.run("schroot -d / -r -c %s -- printenv -0 SCHROOT_ALIAS_NAME" % session_id, + shell=True, check=True, stdout=subprocess.PIPE).stdout.decode('utf-8') + if id: + subprocess.run('schroot --recover-session -c %s' % session_id, shell=True, check=True) + subprocess.run('schroot -e -c %s' % session_id, shell=True, check=True) + if 'id' in locals(): + d.setVar('SBUILD_CHROOT', id) + bb.build.exec_func('remove_mounts', d) + bb.build.exec_func('schroot_delete_configs', d) + with open('/proc/mounts') as f: for line in f.readlines(): if basepath in line: -- 2.17.1