Merge lp:~logan/ubuntu/raring/zfs-fuse/debian-merge into lp:ubuntu/raring/zfs-fuse

[Logan Rosen]

[Didier Roche-Tolomelli (didrocks)]

Looking good and building fine. Nice work! :)

review: Approve

=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2012-12-17 23:05:53 +0000
@@ -0,0 +1,1 @@
+debian/patches

=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2012-12-17 23:05:53 +0000
@@ -0,0 +1,1 @@
+series

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-06-14 12:02:37 +0000
+++ .pc/applied-patches	2012-12-17 23:05:53 +0000
@@ -7,3 +7,6 @@
 fix-segfault.patch
 fix-ec_atomic_cas.patch
 fix-malloc-for-newer-glibc.patch
+zfs-fuse.automated.scrub.cron.d.patch
+hanoi.cron.daily.patch
+flush.patch

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-14 12:02:37 +0000
+++ debian/changelog	2012-12-17 23:05:53 +0000
@@ -1,3 +1,27 @@
+zfs-fuse (0.7.0-10ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/patches/fix-malloc-for-newer-glibc.patch: Newer GLibC changes the
+      way __malloc_initialize_hook is initialized, so patch malloc.c
+      accordingly. Fixes FTBFS.
+
+ -- Logan Rosen <[e-mail]>  Mon, 17 Dec 2012 17:52:00 -0500
+
+zfs-fuse (0.7.0-10) unstable; urgency=low
+
+  * Fix "issues forbidden SG_IO ioctl on partitions" (Closes: #657166)
+
+ -- Asias He <[e-mail]>  Fri, 31 Aug 2012 15:30:05 +0800
+
+zfs-fuse (0.7.0-9) unstable; urgency=low
+
+  * Fix "automated monthly scrubs" (Closes: #650955)
+  * Fix "Automated ZFS snapshots using Hanoi algorithm" (Closes: #651873)
+  * Fix "/proc/$pid/oom_adj is deprecated, please use
+    /proc/$pid/oom_score_adj instead." issue
+
+ -- Asias He <[e-mail]>  Fri, 17 Aug 2012 11:50:57 +0800
+
 zfs-fuse (0.7.0-8ubuntu1) quantal; urgency=low
 
   * Newer GLibC changes the way __malloc_initialize_hook is initialized,

=== modified file 'debian/docs'
--- debian/docs	2011-09-18 19:16:36 +0000
+++ debian/docs	2012-12-17 23:05:53 +0000
@@ -5,3 +5,5 @@
 TESTING
 TODO
 contrib/zfs_pool_alert
+contrib/zfs-fuse.automated.scrub.cron.d
+contrib/hanoi.cron.daily

=== added file 'debian/patches/flush.patch'
--- debian/patches/flush.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/flush.patch	2012-12-17 23:05:53 +0000
@@ -0,0 +1,21 @@
+diff --git a/src/lib/libzpool/flushwc.c b/src/lib/libzpool/flushwc.c
+index 344a61f..d625db2 100644
+--- a/src/lib/libzpool/flushwc.c
++++ b/src/lib/libzpool/flushwc.c
+@@ -130,12 +130,16 @@ static int flushATAwc(int fd) {
+  */
+ int flushwc(vnode_t *vn) {
+   int major_number;
++  int minor_number;
+ 
+   if(!S_ISBLK(vn->v_stat.st_mode))
+     // We can only flush the write cache of a block device.
+     return ENOTSUP;
+ 
+   major_number = major(vn->v_stat.st_rdev);
++  minor_number = minor(vn->v_stat.st_rdev);
++  if (minor_number % 16 != 0)
++	  return ENOTSUP;
+ 
+   switch(major_number) {
+   case SCSI_DISK0_MAJOR:

=== added file 'debian/patches/hanoi.cron.daily.patch'
--- debian/patches/hanoi.cron.daily.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/hanoi.cron.daily.patch	2012-12-17 23:05:53 +0000
@@ -0,0 +1,77 @@
+diff --git a/contrib/hanoi.cron.daily b/contrib/hanoi.cron.daily
+new file mode 100644
+index 0000000..a92b021
+--- /dev/null
++++ b/contrib/hanoi.cron.daily
+@@ -0,0 +1,68 @@
++#!/bin/bash
++
++# This algorithm implements a variation of the Towers of Hanoi rotation method
++# (see http://en.wikipedia.org/wiki/Backup_rotation_scheme#Towers_of_Hanoi).
++#
++# Unlike traditional ToH rotation, which uses a finite set of physical tapes,
++# we operate on a set of snapshots whose size doesn't necessarily have to be
++# bounded. Note that the number of snapshots only grows logarithmically with
++# time, which makes it very hard to fill your hard disk (even when running
++# unbounded).
++#
++# The result is that once we've run this for long enough, we'll find that for
++# recent dates (e.g. last few days) almost all snapshots are available, and the
++# older the date we're searching the more spread available snapshots will be.
++
++set -e
++
++. /etc/default/zfs
++
++# Does $1 belong to class $2 ?
++isclass ()
++{
++	if [ "$2" == "$AUTOSNAP_MAX_SNAPSHOTS" ] ; then
++		# Special-case. Treat all snapshots as if they belong to
++		# this class (in addition to their real class).
++		return 0
++	fi
++	local remainder=$((2 ** ($2 - 1)))
++	local divisor=$((${remainder} * 2))
++	[ $(($1 % ${divisor})) == ${remainder} ]
++}
++
++classify ()
++{
++	local creation="$1"
++	local creation_in_days="$(($(LANG=C date +%s -d "@${creation}") / 86400))"
++	local class="1"
++	# Find the class ${creation_in_days} belongs to.
++	while ! isclass "${creation_in_days}" "${class}" ; do
++		class=$((${class}+1))
++	done
++	echo "${class}"
++}
++
++for fs in $AUTOSNAP_FILESYSTEMS ; do
++	# Create today's snapshot.
++	echo zfs snapshot ${fs}@autosnap-$(date +%F)
++	zfs snapshot ${fs}@autosnap-$(date +%F)
++
++	# Remove any snapshots in the same class as today's addition.
++	LANG=C zfs list -r ${fs} -t snapshot -H -o name,creation \
++	| grep @autosnap- \
++	| while read name creation_human ; do
++		creation="$(LANG=C date +%s -d "${creation_human}")"
++		echo "$(classify "${creation}") ${creation} ${name}"
++		done \
++	| sort -nr \
++	| while read class creation name ; do
++		echo ${class} ${name}
++		if [ ${class} == "${previous_class}" ] ; then
++			echo zfs destroy "${name}"
++			zfs destroy "${name}"
++		fi
++		previous_class="${class}"
++		done
++done
++
++exit 0
+-- 
+1.7.10.4
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-06-14 12:02:37 +0000
+++ debian/patches/series	2012-12-17 23:05:53 +0000
@@ -7,3 +7,6 @@
 fix-segfault.patch
 fix-ec_atomic_cas.patch
 fix-malloc-for-newer-glibc.patch
+zfs-fuse.automated.scrub.cron.d.patch
+hanoi.cron.daily.patch
+flush.patch

=== added file 'debian/patches/zfs-fuse.automated.scrub.cron.d.patch'
--- debian/patches/zfs-fuse.automated.scrub.cron.d.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/zfs-fuse.automated.scrub.cron.d.patch	2012-12-17 23:05:53 +0000
@@ -0,0 +1,19 @@
+diff --git a/contrib/zfs-fuse.automated.scrub.cron.d b/contrib/zfs-fuse.automated.scrub.cron.d
+new file mode 100644
+index 0000000..29f8d36
+--- /dev/null
++++ b/contrib/zfs-fuse.automated.scrub.cron.d
+@@ -0,0 +1,10 @@
++#
++# Copyright © martin f. krafft <[e-mail]>
++# distributed under the terms of the Artistic Licence 2.0
++#
++
++# By default, run at 00:57 on every Sunday, but do nothing unless the day of
++# the month is less than or equal to 7. Thus, only run on the first Sunday of
++# each month. crontab(5) sucks, unfortunately, in this regard; therefore this
++# hack (see #380425).
++57 0 * * 0 root if [ $(date +\%d) -le 7 ]; then zpool list -H -o name | xargs zpool scrub; fi
+-- 
+1.7.10.4
+

=== modified file 'debian/zfs-fuse.init'
--- debian/zfs-fuse.init	2012-06-05 09:34:39 +0000
+++ debian/zfs-fuse.init	2012-12-17 23:05:53 +0000
@@ -116,7 +116,12 @@
     then
         log_end_msg 0
         log_action_begin_msg "Immunizing $NAME against OOM kills and sendsigs signals"
-        echo -17 > /proc/$(cat /var/run/$NAME.pid)/oom_adj
+        if [ -f "/proc/$(cat /var/run/$NAME.pid)/oom_score_adj" ]
+        then
+            echo -1000 > "/proc/$(cat /var/run/$NAME.pid)/oom_score_adj"
+        else
+            echo -17 > "/proc/$(cat /var/run/$NAME.pid)/oom_adj"
+        fi
         ES_TO_REPORT=$?
         if [ "$ES_TO_REPORT" = 0 ] ; then
           log_action_end_msg 0

=== modified file 'src/lib/libzpool/flushwc.c'
--- src/lib/libzpool/flushwc.c	2011-09-18 19:16:36 +0000
+++ src/lib/libzpool/flushwc.c	2012-12-17 23:05:53 +0000
@@ -130,12 +130,16 @@
  */
 int flushwc(vnode_t *vn) {
   int major_number;
+  int minor_number;
 
   if(!S_ISBLK(vn->v_stat.st_mode))
     // We can only flush the write cache of a block device.
     return ENOTSUP;
 
   major_number = major(vn->v_stat.st_rdev);
+  minor_number = minor(vn->v_stat.st_rdev);
+  if (minor_number % 16 != 0)
+	  return ENOTSUP;
 
   switch(major_number) {
   case SCSI_DISK0_MAJOR: