From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8EA882E2DE7 for ; Mon, 11 Aug 2025 22:43:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754952192; cv=none; b=Ap5lILX6VXvX6c5pzySxHeIkWSN0fPq3dM68ckuC1+rN4a98azGJ4OsifuBAYsJGLIW2s46IIv6cJZVRY3wdVGq8eS09SnxvlfD2JAO6GSUWMlkpL2+A0MG6LfYx1qmFR3k1XvHSyKHV7kfW42LUJgRluW+TfWWieQiSwmUT0Po= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754952192; c=relaxed/simple; bh=fD6rTM6yr7nQew2iP2WpyfbCb8jpI80toXAa1sZ6/oE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G1AIIHyWgRL5TTirMXpJpCERq3CdgLjyHLXYDWkLWcyueugoE5qfgpkEhhBGL3hwHEFlGwPoyKt06ocf7AgBnDwAZdy61nP2i425xjLAaNnJGaPcC06uvCjpDnMEWcWoE9xsFQmXX5il+K0LNMOWKOvxMKuBU3a75Y8nt1SllDI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=0T/EDklP; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="0T/EDklP" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=bfyqjBynleGFRPYoY7QrDZl1Qvt4cOhW8iT1DLSUTfc=; b=0T/EDklPnf1kSejf5+uCixwD3t JraBvNIBf6YwgXR8XJB0EI1WCZNSiKuAF9GwHvW7o3snizYk0Exjw5D4eKFQe2OwVfOcw3avoPedP iG7yeXuiY/EiUS1Mbo4rso53Pj/T6b0ESLruxGQpvkDcOA+Pny6g+ZRRT014UsSTgBPM0L2ZqKsaZ TRepTh8Y8lkohUWpDXJBerQmb9Lbx9n5Xd/wbWB570eJiYcGSBNaQyQPvbZ2AoJ9I5mSnOA1dch6X JEs7JFoN6RW6PvT95oFY1BRCMweWMzSSnNOX55sR6FE1TXFqvAX+g1eqUdbAbp0lKduqcBcw9LmZA iUr2+1ew==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.98.2 #2 (Red Hat Linux)) id 1ulbEU-00000009J8i-02fW; Mon, 11 Aug 2025 22:43:10 +0000 From: Luis Chamberlain To: Chuck Lever , Daniel Gomez , kdevops@lists.linux.dev Cc: Luis Chamberlain Subject: [PATCH 8/8] monitoring: integrate monitoring collection into fstests workflow Date: Mon, 11 Aug 2025 15:43:07 -0700 Message-ID: <20250811224307.2218478-9-mcgrof@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250811224307.2218478-1-mcgrof@kernel.org> References: <20250811224307.2218478-1-mcgrof@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Luis Chamberlain Fix monitoring data collection to work properly during fstests runs by changing from include_role to import_tasks. The include_role directive with tasks_from parameter wasn't executing properly due to tag filtering during playbook execution, preventing monitoring data from being collected. Using import_tasks ensures the monitoring tasks are statically included at parse time and properly executed when the appropriate tags are present. This allows monitoring to run on all hosts and collect folio migration statistics during test execution. The monitoring documentation has also been updated to reflect that it's now a shared service available to all workflows. Generated-by: Claude AI Signed-off-by: Luis Chamberlain --- Kconfig | 4 ++++ README.md | 1 + playbooks/roles/fstests/tasks/main.yml | 14 ++++++++++++++ 3 files changed, 19 insertions(+) diff --git a/Kconfig b/Kconfig index 988782a9..3f2bc8cf 100644 --- a/Kconfig +++ b/Kconfig @@ -79,6 +79,10 @@ menu "Target workflows" source "kconfigs/workflows/Kconfig" endmenu +menu "Monitors" +source "kconfigs/monitors/Kconfig" +endmenu + menu "Kdevops configuration" source "kconfigs/Kconfig.kdevops" endmenu diff --git a/README.md b/README.md index e695d088..c9f44249 100644 --- a/README.md +++ b/README.md @@ -306,6 +306,7 @@ Below is kdevops' recommended documentation reading. * [kdevops' evolving make help](docs/evolving-make-help.md) * [kdevops configuration](docs/kdevops-configuration.md) * [kdevops mirror support](docs/kdevops-mirror.md) + * [kdevops monitoring services](docs/monitoring.md) * [kdevops first run](docs/kdevops-first-run.md) * [kdevops running make](docs/running-make.md) * [kdevops libvirt storage pool considerations](docs/libvirt-storage-pool.md) diff --git a/playbooks/roles/fstests/tasks/main.yml b/playbooks/roles/fstests/tasks/main.yml index 2665f693..3e2cbf99 100644 --- a/playbooks/roles/fstests/tasks/main.yml +++ b/playbooks/roles/fstests/tasks/main.yml @@ -1235,6 +1235,13 @@ when: - fstests_skip_run|bool +# Start monitoring services before running tests +- import_tasks: ../../monitoring/tasks/monitor_run.yml + when: + - kdevops_run_fstests|bool + - enable_monitoring|default(false)|bool + tags: [ 'oscheck', 'fstests', 'run_tests', 'monitoring', 'monitor_run' ] + # Recent environments runs are showing that environment variables # set below are not propagated. So best to stuff what you need # into the .kdevops_fstests_setup file which is sourced by root. @@ -1281,6 +1288,13 @@ when: - kdevops_run_fstests|bool +# Stop monitoring services and collect data after running tests +- import_tasks: ../../monitoring/tasks/monitor_collect.yml + when: + - kdevops_run_fstests|bool + - enable_monitoring|default(false)|bool + tags: [ 'oscheck', 'fstests', 'run_tests', 'monitoring', 'monitor_collect' ] + - name: Remove watchdog hint that tests have started local_action: file path="{{ fstests_workflow_dir }}/.begin" state=absent tags: [ 'oscheck', 'fstests', 'run_tests' ] -- 2.47.2