From patchwork Mon Dec 30 15:55:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: paul X-Patchwork-Id: 36089 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6925A27BBEB; Mon, 30 Dec 2024 15:56:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2F0BD27BBE2 for ; Mon, 30 Dec 2024 15:56:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tSI7j-0008Vx-2w; Mon, 30 Dec 2024 10:56:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tSI7g-0008Ui-6l for guix-patches@gnu.org; Mon, 30 Dec 2024 10:56:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tSI7f-0004Ze-US for guix-patches@gnu.org; Mon, 30 Dec 2024 10:56:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=CLytuVJRgtRsbgPWZ4kn6UxgAerM92TWaV5gvel1yZA=; b=FXKteb1IbuYtYR0y3ZjojINxGQT7PBkksoUlSmheYnKsHWhVpLeWGZjncT236xqPtuYjWr+4ROCBPjweuxD/9+Ll2ydoKi8jKy6UJptKwW4KW1MQtdnrQKENBAfojP8au5QTmfIFpcT74QoDwLDshG3Z9UPVQohITt36BcqcilAtBtrAEOPYsJchelZgF7C8Gk5K81UtZeU5lVge5h7oTVN46BfAAUN/bJR8C9UezcY6oEmPig8DQLCsmCUgb47fPsDeBYkutDVV99ku1bwXsl2yWqrPItfTYydxIikksUnq3/0uKg9ZPMqlZCYM1X0FOo2FJPVu2SXsPXB37jZXxw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tSI7f-0000ou-8C for guix-patches@gnu.org; Mon, 30 Dec 2024 10:56:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75203] [PATCH 1/2] services: tests: Add delay for rootless Podman system test. References: <1881b153-9191-4322-8c71-195b5eef5651@autistici.org> In-Reply-To: <1881b153-9191-4322-8c71-195b5eef5651@autistici.org> Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Dec 2024 15:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75203 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 75203@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 75203-submit@debbugs.gnu.org id=B75203.17355741603130 (code B ref 75203); Mon, 30 Dec 2024 15:56:03 +0000 Received: (at 75203) by debbugs.gnu.org; 30 Dec 2024 15:56:00 +0000 Received: from localhost ([127.0.0.1]:59579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSI7b-0000oO-Vf for submit@debbugs.gnu.org; Mon, 30 Dec 2024 10:56:00 -0500 Received: from devianza.investici.org ([198.167.222.108]:43633) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSI7W-0000nu-7i for 75203@debbugs.gnu.org; Mon, 30 Dec 2024 10:55:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1735574146; bh=CLytuVJRgtRsbgPWZ4kn6UxgAerM92TWaV5gvel1yZA=; h=From:To:Cc:Subject:Date:From; b=digj25eunod13ztbkN0oK4WI3oFI8mU3JG8+aR9+wrutHRcpuojFv3XVfA0UpKURY KMI3jSXNui647U7MCryjDJJZyMtBZxyUQxCcQ+7Lc9Ku+iH7EkI+D7FNFspZs+ETpK cG7QZAOM8pb8fN0LzZcWNgq8LXOG7hEYRDWeINYk= Received: from mx2.investici.org (unknown [127.0.0.1]) by devianza.investici.org (Postfix) with ESMTP id 4YMLKt44vhz6vHF; Mon, 30 Dec 2024 15:55:46 +0000 (UTC) Received: from [198.167.222.108] (mx2.investici.org [198.167.222.108]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4YMLKt316bz6v8V; Mon, 30 Dec 2024 15:55:46 +0000 (UTC) Date: Mon, 30 Dec 2024 16:55:21 +0100 Message-ID: <6ef8d0e4837ab1e623afc117d94062085ef2abe8.1735574122.git.goodoldpaul@autistici.org> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Giacomo Leidi X-ACL-Warn: , Giacomo Leidi via Guix-patches X-Patchwork-Original-From: Giacomo Leidi via Guix-patches via From: paul Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/tests/containers.scm (run-rootless-podman-test): Add 60 seconds long delay before tests are actually run. Change-Id: Ifcf70f7258f9e0886bf829884d7daedc9803352b --- gnu/tests/containers.scm | 3 +++ 1 file changed, 3 insertions(+) base-commit: 18463019a24a7c5acc9c2f3ddf3c0ba04a36db96 diff --git a/gnu/tests/containers.scm b/gnu/tests/containers.scm index ba2fb22df6..047010037e 100644 --- a/gnu/tests/containers.scm +++ b/gnu/tests/containers.scm @@ -109,6 +109,9 @@ (define (run-rootless-podman-test oci-tarball) (('service response-parts ...) #t))) marionette)) + ;; Allow services to start on slower machines + (sleep 60) + (test-equal "/sys/fs/cgroup/cgroup.subtree_control content is sound" (list "cpu" "cpuset" "memory" "pids") (marionette-eval From patchwork Mon Dec 30 15:55:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: paul X-Patchwork-Id: 36090 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7969A27BBEB; Mon, 30 Dec 2024 15:56:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 324F127BBE2 for ; Mon, 30 Dec 2024 15:56:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tSI7i-0008Vk-FU; Mon, 30 Dec 2024 10:56:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tSI7f-0008UR-E0 for guix-patches@gnu.org; Mon, 30 Dec 2024 10:56:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tSI7e-0004ZH-V0 for guix-patches@gnu.org; Mon, 30 Dec 2024 10:56:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=KlFKZwcGlyOoUx2MPf1s6+9XS0yZ33UYPrTPvjkXgv4=; b=JIQL5DTFgD9dwdA+Xn0IE9BDa5008jJryyb90+j9u5XqLCFkZXf4DexBmIqyLYgD66irSqOIPCFdO1hsUxjdXFMNOukf6g38ojCBmTDsklrhw+cKBE3Lo2oJeYpw52wHHKZetWYDv3hhKDdAggSz7A0b6xqWWGp04WMWBoueLuklkAPjbsUMTDCEXb0l8zx3vBEHmphfJfaHJp7gvGWVWbhK5P2or4I3+JpxLtCDbhEI8X7nKHpKHUHV8bivc1vJGgrSIINKfgsz/S5U9L3pguVddbCHk0qbw0JXQmzTJ7NWrucARRB24TvdVagN7EY9v8IFxUsVx3hYMlQ5QCjZDQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tSI7e-0000on-PS for guix-patches@gnu.org; Mon, 30 Dec 2024 10:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75203] [PATCH 2/2] services: rootless-podman: Enable I/O delegation. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Dec 2024 15:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75203 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 75203@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 75203-submit@debbugs.gnu.org id=B75203.17355741563111 (code B ref 75203); Mon, 30 Dec 2024 15:56:02 +0000 Received: (at 75203) by debbugs.gnu.org; 30 Dec 2024 15:55:56 +0000 Received: from localhost ([127.0.0.1]:59577 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSI7X-0000o4-IU for submit@debbugs.gnu.org; Mon, 30 Dec 2024 10:55:55 -0500 Received: from devianza.investici.org ([198.167.222.108]:57143) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSI7U-0000nk-O4 for 75203@debbugs.gnu.org; Mon, 30 Dec 2024 10:55:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1735574151; bh=KlFKZwcGlyOoUx2MPf1s6+9XS0yZ33UYPrTPvjkXgv4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tNoRLfQLro8F9FJzdRAcVB1r6uyp1sX1PwR+q4pxTopIVwYrvqIdOQJvRIGYGfKLD eLSn2Ez4mifyzsUqJJVXsYLhVJOOlv/XaRLyrqUe3eXbhN8+gis680E7FYTlfscTE6 hSG6ZLu/g1KAqvp6wrShol0RZzoddXduaUV8JsME= Received: from mx2.investici.org (unknown [127.0.0.1]) by devianza.investici.org (Postfix) with ESMTP id 4YMLKz3Kgtz6vHK; Mon, 30 Dec 2024 15:55:51 +0000 (UTC) Received: from [198.167.222.108] (mx2.investici.org [198.167.222.108]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4YMLKz26jtz6v8V; Mon, 30 Dec 2024 15:55:51 +0000 (UTC) Date: Mon, 30 Dec 2024 16:55:22 +0100 Message-ID: <12e82593ce1847876ab020ac1b9097ec58284d0f.1735574122.git.goodoldpaul@autistici.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <6ef8d0e4837ab1e623afc117d94062085ef2abe8.1735574122.git.goodoldpaul@autistici.org> References: <6ef8d0e4837ab1e623afc117d94062085ef2abe8.1735574122.git.goodoldpaul@autistici.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Giacomo Leidi X-ACL-Warn: , Giacomo Leidi via Guix-patches X-Patchwork-Original-From: Giacomo Leidi via Guix-patches via From: paul Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Based on https://rootlesscontaine.rs/getting-started/common/cgroup2/#enabling-cpu-cpuset-and-io-delegation , this patch enables I/O delegation for cgroups v2 enabled users. * gnu/services/containers.scm (cgroups-limits-entrypoint): Enable I/O controller delegation. * gnu/tests/containers.scm: Test it. Change-Id: I7caba33695f11830bea477c4ab3afb89cfaa2fa5 --- gnu/services/containers.scm | 2 +- gnu/tests/containers.scm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/services/containers.scm b/gnu/services/containers.scm index d8f533f44c..cb4b617e4b 100644 --- a/gnu/services/containers.scm +++ b/gnu/services/containers.scm @@ -169,7 +169,7 @@ (define cgroups-limits-entrypoint #~(system* (string-append #+bash-minimal "/bin/bash") "-c" (string-append "echo Setting cgroups v2 limits && " - "echo +cpu +cpuset +memory +pids" + "echo +cpu +cpuset +io +memory +pids" " >> /sys/fs/cgroup/cgroup.subtree_control")))) (define (rootless-podman-cgroups-limits-service config) diff --git a/gnu/tests/containers.scm b/gnu/tests/containers.scm index 047010037e..ec8a9ad440 100644 --- a/gnu/tests/containers.scm +++ b/gnu/tests/containers.scm @@ -113,7 +113,7 @@ (define (run-rootless-podman-test oci-tarball) (sleep 60) (test-equal "/sys/fs/cgroup/cgroup.subtree_control content is sound" - (list "cpu" "cpuset" "memory" "pids") + (list "cpu" "cpuset" "io" "memory" "pids") (marionette-eval `(begin (use-modules (srfi srfi-1)