Please consider noflushd 2.7.5-1 for sarge.
Moi!
I've recently uploaded noflushd 2.7.5-1 with two fixes that I consider
appropriate for sarge once it has aged:
* The changes to src/disk_stat.c fix a startup crash of the daemon when
software raids or LVM arrays are present on a system running a 2.6
kernel (cf. #308230 and #308444).
* The trivial change to src/intr_stat.c suppresses some screen output
during startup, unless a debugging option was given. This used to
mess up output of the init script as soon as option -i was given,
and thus violated a 'should' clause in policy. This issue was
reported off the BTS.
It's a new upstream version, formally, but that's because I'm both
upstream and Debian maintainer, and the fixes are not Debian-specific.
Still, I've taken care that the changes remain minimal, in particular
that no autotools-generated files are altered beyond version number
changes. Debdiff attached.
Thanks,
Daniel.
diff -Nru /tmp/DpUA5kehHW/noflushd-2.7.4/ChangeLog /tmp/hDR06J6wKW/noflushd-2.7.5/ChangeLog
--- /tmp/DpUA5kehHW/noflushd-2.7.4/ChangeLog 2004-08-08 17:42:05.000000000 +0200
+++ /tmp/hDR06J6wKW/noflushd-2.7.5/ChangeLog 2005-05-09 00:19:24.000000000 +0200
@@ -1,5 +1,11 @@
noflushd - ChangeLog
+* version 2.7.5 (20050509) [dk]
+
+ - Do not fail with raid and similar meta devices on 2.6 kernels.
+ (Thomas Liske)
+ - Be more silent on startup when monitorring interrupts.
+
* version 2.7.4 (20040808) [dk]
- Document undesirable side-effects with hotplugged drives, and
diff -Nru /tmp/DpUA5kehHW/noflushd-2.7.4/NEWS /tmp/hDR06J6wKW/noflushd-2.7.5/NEWS
--- /tmp/DpUA5kehHW/noflushd-2.7.4/NEWS 2004-08-08 17:42:05.000000000 +0200
+++ /tmp/hDR06J6wKW/noflushd-2.7.5/NEWS 2005-05-09 00:19:24.000000000 +0200
@@ -1,3 +1,7 @@
+* noflushd 2.7.5 (09. May 2005)
+
+ - Fix handling of raid and similar meta devices on 2.6 kernels.
+
* noflushd 2.7.4 (08. Aug 2004)
- Fix lousy spindown times on 2.6 kernels.
diff -Nru /tmp/DpUA5kehHW/noflushd-2.7.4/README /tmp/hDR06J6wKW/noflushd-2.7.5/README
--- /tmp/DpUA5kehHW/noflushd-2.7.4/README 2004-08-08 16:54:16.000000000 +0200
+++ /tmp/hDR06J6wKW/noflushd-2.7.5/README 2005-05-09 00:27:14.000000000 +0200
@@ -1,6 +1,6 @@
NOFLUSHD - An Idle Disk Daemon
- ==================================
- (Version 2.7.4 - August, 8th 2004)
+ ===============================
+ (Version 2.7.5 - May, 9th 2005)
This is noflushd, a daemon that spins down disks that have not been
diff -Nru /tmp/DpUA5kehHW/noflushd-2.7.4/THANKS /tmp/hDR06J6wKW/noflushd-2.7.5/THANKS
--- /tmp/DpUA5kehHW/noflushd-2.7.4/THANKS 2004-03-16 22:04:05.000000000 +0100
+++ /tmp/hDR06J6wKW/noflushd-2.7.5/THANKS 2005-05-09 00:20:43.000000000 +0200
@@ -37,6 +37,8 @@
to track down file accesses that cause a disk to spin up.
Matijs van Zuijlen <Matijs.van.Zuijlen@xs4all.nl> tracked down too aggressive
flushing in noflushd that caused frequent spinups.
+Thomas Liske <thomas@fiasko.dyndns.org> sent in a patch to improve 2.6
+ support with raid devices.
and lots of others who sent in bug reports and suggestions...
diff -Nru /tmp/DpUA5kehHW/noflushd-2.7.4/configure /tmp/hDR06J6wKW/noflushd-2.7.5/configure
--- /tmp/DpUA5kehHW/noflushd-2.7.4/configure 2004-08-08 17:44:41.000000000 +0200
+++ /tmp/hDR06J6wKW/noflushd-2.7.5/configure 2005-05-09 00:33:28.000000000 +0200
@@ -1606,7 +1606,7 @@
# Define the identity of the package.
PACKAGE=noflushd
- VERSION=2.7.4
+ VERSION=2.7.5
cat >>confdefs.h <<_ACEOF
diff -Nru /tmp/DpUA5kehHW/noflushd-2.7.4/configure.in /tmp/hDR06J6wKW/noflushd-2.7.5/configure.in
--- /tmp/DpUA5kehHW/noflushd-2.7.4/configure.in 2004-08-08 17:42:05.000000000 +0200
+++ /tmp/hDR06J6wKW/noflushd-2.7.5/configure.in 2005-05-09 00:27:14.000000000 +0200
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/noflushd.c)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(noflushd,2.7.4)
+AM_INIT_AUTOMAKE(noflushd,2.7.5)
AM_MAINTAINER_MODE
diff -Nru /tmp/DpUA5kehHW/noflushd-2.7.4/debian/changelog /tmp/hDR06J6wKW/noflushd-2.7.5/debian/changelog
--- /tmp/DpUA5kehHW/noflushd-2.7.4/debian/changelog 2004-08-08 17:18:16.000000000 +0200
+++ /tmp/hDR06J6wKW/noflushd-2.7.5/debian/changelog 2005-05-09 00:27:14.000000000 +0200
@@ -1,3 +1,11 @@
+noflushd (2.7.5-1) unstable; urgency=medium
+
+ * New upstream release.
+ - Do not fail with raid devices on 2.6 kernels. Closes: #308230
+ - Do not mess up startup messages when monitorring interrupts.
+
+ -- Daniel Kobras <kobras@debian.org> Mon, 9 May 2005 00:22:53 +0200
+
noflushd (2.7.4-1) unstable; urgency=low
* New upstream version.
diff -Nru /tmp/DpUA5kehHW/noflushd-2.7.4/redhat/noflushd.spec /tmp/hDR06J6wKW/noflushd-2.7.5/redhat/noflushd.spec
--- /tmp/DpUA5kehHW/noflushd-2.7.4/redhat/noflushd.spec 2004-04-09 00:08:40.000000000 +0200
+++ /tmp/hDR06J6wKW/noflushd-2.7.5/redhat/noflushd.spec 2005-05-09 00:27:15.000000000 +0200
@@ -1,4 +1,4 @@
-%define version 2.7.3
+%define version 2.7.5
%define prefix /usr
Summary: Daemon that sends idle disks to sleep
@@ -13,6 +13,10 @@
Vendor: Daniel Kobras <kobras@linux.de>
%changelog
+* Mon May 09 2005 Daniel Kobras <kobras@linux.de>
+
+- New upstream version 2.7.5.
+
* Thu Apr 09 2004 Daniel Kobras <kobras@linux.de>
- New upstream version 2.7.3.
diff -Nru /tmp/DpUA5kehHW/noflushd-2.7.4/src/disk_stat.c /tmp/hDR06J6wKW/noflushd-2.7.5/src/disk_stat.c
--- /tmp/DpUA5kehHW/noflushd-2.7.4/src/disk_stat.c 2004-08-08 17:06:29.000000000 +0200
+++ /tmp/hDR06J6wKW/noflushd-2.7.5/src/disk_stat.c 2005-05-09 00:19:24.000000000 +0200
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: disk_stat.c,v 1.21 2004/08/08 15:06:29 nold Exp $
+ * $Id: disk_stat.c,v 1.22 2005/05/08 22:19:24 nold Exp $
*
*/
@@ -91,7 +91,13 @@
static int old_entry(int major, int minor)
{
int entry;
-
+
+ /* Devices that show up in /proc/partitions but have no
+ * physical counterpart.
+ */
+ if (IS_META(major, minor))
+ return -1;
+
switch (major) {
case IDE0_MAJOR:
entry=0;
@@ -106,14 +112,6 @@
case SCSI_DISK0_MAJOR:
entry=minor>>4;
break;
- /* Devices that show up in /proc/partitions but have no
- * physical counterpart.
- */
- case MD_MAJOR:
- /* fallthrough */
- case LVM_BLK_MAJOR:
- entry=-1;
- break;
default:
entry=4;
}
@@ -336,7 +334,7 @@
disk_io_t di;
/* Filter out meta devices */
- if (major == MD_MAJOR || major == LVM_BLK_MAJOR)
+ if (IS_META(major, 0))
return NULL;
di = __get_entry_new(ds, major, index);
@@ -400,7 +398,7 @@
di->newio.reads = rblk;
di->newio.writes = wblk;
} else {
- BUG("No entry for (%d,%d)", major, index);
+ DEBUG("No entry for (%d,%d)", major, index);
}
}
@@ -514,7 +512,7 @@
di->newio.reads = rblk;
di->newio.writes = wblk;
} else {
- BUG("No entry for (%d,%d)", major, minor);
+ DEBUG("No entry for (%d,%d)", major, minor);
}
}
}
diff -Nru /tmp/DpUA5kehHW/noflushd-2.7.4/src/intr_stat.c /tmp/hDR06J6wKW/noflushd-2.7.5/src/intr_stat.c
--- /tmp/DpUA5kehHW/noflushd-2.7.4/src/intr_stat.c 2003-10-12 17:32:36.000000000 +0200
+++ /tmp/hDR06J6wKW/noflushd-2.7.5/src/intr_stat.c 2005-05-09 00:17:51.000000000 +0200
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: intr_stat.c,v 1.6 2003/10/12 15:32:36 nold Exp $
+ * $Id: intr_stat.c,v 1.7 2005/05/08 22:17:51 nold Exp $
*
*/
@@ -243,7 +243,7 @@
}
irq->active = 1;
global.nb_watch++;
- INFO("Monitoring interrupt #%d \"%s\"", n,
+ DEBUG("Monitoring interrupt #%d \"%s\"", n,
irq->name ? irq->name : UNKNOWN_INTERRUPT);
return 1;
}
Reply to: