Merge lp:~serge-hallyn/ubuntu/natty/initramfs-tools/retrymount into lp:ubuntu/natty/initramfs-tools

[Serge Hallyn]

Sorry, I'd like to propose this for 'upstream' but didn't see
a mailing list to send a patch to. Please let me know if you'd
like me to send it elsewhere/differently.

[Colin Watson (cjwatson)]

Upstream is Debian; perhaps you could file a Debian bug report on
initramfs-tools with this patch?

A poll/retry loop is generally a suboptimal way to do this kind of
thing; what we really want is to wait for udev to tell us that it has
finished with the event that triggered renaming of the device. Perhaps
you could talk with Surbhi about the plans for making the initramfs more
event-based.

[Serge Hallyn (serge-hallyn)]

Quoting Colin Watson (<email address hidden>):
> Upstream is Debian; perhaps you could file a Debian bug report on
> initramfs-tools with this patch?

Will do.

> A poll/retry loop is generally a suboptimal way to do this kind of
> thing; what we really want is to wait for udev to tell us that it has
> finished with the event that triggered renaming of the device. Perhaps
> you could talk with Surbhi about the plans for making the initramfs more
> event-based.

Gladly - on which mailing list should I talk to Surbhi?

thanks,
-serge

[Colin Watson (cjwatson)]

I'm sure private mail would be fine. (LP user csurbhi)

[Jeff Bailey (jbailey)]

Thanks, Colin.

Is there anything I should do to keep people from looking at the launchpad
project?

On Thu, Nov 18, 2010 at 11:46 AM, Colin Watson <email address hidden>wrote:

> Upstream is Debian; perhaps you could file a Debian bug report on
> initramfs-tools with this patch?
>
> A poll/retry loop is generally a suboptimal way to do this kind of
> thing; what we really want is to wait for udev to tell us that it has
> finished with the event that triggered renaming of the device. Perhaps
> you could talk with Surbhi about the plans for making the initramfs more
> event-based.
> --
>
> https://code.launchpad.net/~serge-hallyn/ubuntu/natty/initramfs-tools/retrymount/+merge/41191
> You are requested to review the proposed merge of
> lp:~serge-hallyn/ubuntu/natty/initramfs-tools/retrymount into
> lp:ubuntu/initramfs-tools.
>

--
Jeff Bailey - http://www.raspberryginger.com/jbailey/
"This specification should be read like all other specifications. First, it
should be read cover-to-cover, multiple times. Then, it should be read
backwards at least once. Then it should be read by picking random sections
from the contents list and following all the cross-references."
 - HTML5

Unmerged revisions

230. By Serge Hallyn on 2010-11-18

Add retries to mountroot(). This is particularly needed when we
use multipath, because it is possible that mountroot() will race
with udev's renaming of /dev/disk/by-uuid/{rootfs-uuid} from
/dev/sd?? to /dev/mapper/something. After multipath has grabbed
the /dev/sd?? and until udev completes the rename, mounting
/dev/disk/by-uuid/{rootfs-uuid} will fail with -EBUSY.

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-06 17:53:20 +0000
+++ debian/changelog	2010-11-18 16:27:43 +0000
@@ -1,3 +1,14 @@
+initramfs-tools (0.98.1ubuntu8) natty; urgency=low
+
+  * Add retries to mountroot().  This is particularly needed when we
+    use multipath, because it is possible that mountroot() will race
+    with udev's renaming of /dev/disk/by-uuid/{rootfs-uuid} from
+    /dev/sd?? to /dev/mapper/something.  After multipath has grabbed
+    the /dev/sd?? and until udev completes the rename, mounting
+    /dev/disk/by-uuid/{rootfs-uuid} will fail with -EBUSY.
+
+ -- Serge Hallyn <[e-mail]>  Thu, 18 Nov 2010 10:11:48 -0600
+
 initramfs-tools (0.98.1ubuntu7) natty; urgency=low
 
   * mdadm autoassembly works by matching hostname with what is stored in the

=== modified file 'scripts/local'
--- scripts/local	2010-07-05 11:52:28 +0000
+++ scripts/local	2010-11-18 16:27:43 +0000
@@ -86,10 +86,19 @@
 	# FIXME This has no error checking
 	[ -n "${FSTYPE}" ] && modprobe ${FSTYPE}
 
-	# FIXME This has no error checking
 	# Mount root
-	mount ${roflag} ${FSTYPE:+-t ${FSTYPE} }${ROOTFLAGS} ${ROOT} ${rootmnt}
-	mountroot_status="$?"
+	tries=0
+	ret=1
+	while [ $tries -lt 10 -a $ret -ne 0 ]; do
+		mount ${roflag} ${FSTYPE:+-t ${FSTYPE} }${ROOTFLAGS} ${ROOT} ${rootmnt}
+		ret=$?
+		if [ $ret -ne 0 ]; then
+			echo "failed attempt $tries to mount $ROOT as root"
+			sleep 1
+			tries=$((tries+1))
+		fi
+	done
+	mountroot_status=$ret
 	if [ "$LOOP" ]; then
 		if [ "$mountroot_status" != 0 ]; then
 			if [ ${FSTYPE} = ntfs ] || [ ${FSTYPE} = vfat ]; then