Merge ~paelzer/ubuntu/+source/irqbalance:lp-2046470-fix-log-spam-NOBLE into ubuntu/+source/irqbalance:ubuntu/noble-devel

Proposed by Christian Ehrhardt 
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merged at revision: 2529baa2b3478c6937652898f47e8a471995c08a
Proposed branch: ~paelzer/ubuntu/+source/irqbalance:lp-2046470-fix-log-spam-NOBLE
Merge into: ubuntu/+source/irqbalance:ubuntu/noble-devel
Diff against target: 86 lines (+54/-1)
4 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/patches/lp-2046470-Stop-log-spam-due-to-debug-message-from-scan.patch (+44/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Athos Ribeiro (community) Approve
Canonical Server Reporter Pending
Review via email: mp+458083@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

Thanks, Christian!

This looks reasonable to me (+1).

The only comment I have here is regarding the "Origin" DEP3 header. Since upstream did not merge (or comment) the patch yet, it seems that the PR or commit URL should go in the "Forwarded" field. From the "Origin" field definition, removing the "upstream, " part of it should be enough to comply to the definition as well.

The reason I am pointing to this header is that it could lead to another person touching the package to overlook that patch in case it is rejected or changed by upstream.

I will not block this on that header though. Once you fix it or disagree with the assessment, go ahead and upload this one :)

review: Approve
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote :

Approvers: paelzer, athos-ribeiro
Uploaders: paelzer, athos-ribeiro
MP auto-approved

review: Approve
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Thanks, uploaded

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index c192dd9..6cd1abd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1irqbalance (1.9.3-2ubuntu1) noble; urgency=medium
2
3 * d/p/lp-2046470-Stop-log-spam-due-to-debug-message-from-scan.patch:
4 reduce log spam by debug message (LP: #2046470)
5
6 -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Fri, 05 Jan 2024 14:30:02 +0100
7
1irqbalance (1.9.3-2) unstable; urgency=medium8irqbalance (1.9.3-2) unstable; urgency=medium
29
3 * d/p/filter-console-only-output-when-using-journal-mode.debpatch:10 * d/p/filter-console-only-output-when-using-journal-mode.debpatch:
diff --git a/debian/control b/debian/control
index 8524c3d..38ebba3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
1Source: irqbalance1Source: irqbalance
2Section: utils2Section: utils
3Priority: optional3Priority: optional
4Maintainer: Paride Legovini <paride@debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Paride Legovini <paride@debian.org>
5Build-Depends:6Build-Depends:
6 debhelper-compat (= 13),7 debhelper-compat (= 13),
7 dh-exec,8 dh-exec,
diff --git a/debian/patches/lp-2046470-Stop-log-spam-due-to-debug-message-from-scan.patch b/debian/patches/lp-2046470-Stop-log-spam-due-to-debug-message-from-scan.patch
8new file mode 1006449new file mode 100644
index 0000000..4466e53
--- /dev/null
+++ b/debian/patches/lp-2046470-Stop-log-spam-due-to-debug-message-from-scan.patch
@@ -0,0 +1,44 @@
1From a27df6e7a29fad744494a5a1432bb3ed6799cb7d Mon Sep 17 00:00:00 2001
2From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
3Date: Fri, 5 Jan 2024 14:11:49 +0100
4Subject: [PATCH] Stop log spam due to debug message from scan
5
6Currently systems encounter log spam every 10 seconds due to a
7message meant for debugging now being forwarded to journald.
8Users get three empty lines followed by 78 "-" without any further
9info what this is about.
10
11Due to its original debug-only purpose the message also grabs
12a lot of screen-estate. So while touching it anyway let us also make
13it a bit less agressive (no three lead line breaks, less width),
14now it is like:
15 ----- Enter: scan -----
16
17Fixes: #292
18
19Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
20
21Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/irqbalance/+bug/2046470
22Origin: upstream, https://github.com/Irqbalance/irqbalance/pull/293/commits/a27df6e7a29fad744494a5a1432bb3ed6799cb7d
23Last-Update: 2024-01-05
24
25---
26 irqbalance.c | 2 +-
27 1 file changed, 1 insertion(+), 1 deletion(-)
28
29diff --git a/irqbalance.c b/irqbalance.c
30index f5f2c51..d38c153 100644
31--- a/irqbalance.c
32+++ b/irqbalance.c
33@@ -289,7 +289,7 @@ gboolean force_rescan(gpointer data __attribute__((unused)))
34
35 gboolean scan(gpointer data __attribute__((unused)))
36 {
37- log(TO_CONSOLE, LOG_INFO, "\n\n\n-----------------------------------------------------------------------------\n");
38+ log(TO_CONSOLE, LOG_DEBUG, "----- Enter: %s -----\n", __func__);
39 clear_work_stats();
40 parse_proc_interrupts();
41
42--
432.34.1
44
diff --git a/debian/patches/series b/debian/patches/series
index 41e93c6..27b1cf5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
1filter-console-only-output-when-using-journal-mode.debpatch1filter-console-only-output-when-using-journal-mode.debpatch
2lp-2046470-Stop-log-spam-due-to-debug-message-from-scan.patch

Subscribers

People subscribed via source and target branches