Attachment 450697 Details for Bug 630434

[patch] Patch fixing missing inclusion of iSCSI stack, when having "onboot" configured iSCSI sessions.

open-iscsi-2.0.871-0.29.1-mkinitrd-iscsi.patch (text/plain), 9.46 KB, created by Dennis Olsson on 2011-09-14 12:56:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dennis Olsson

Created: 2011-09-14 12:56:49 UTC

Size: 9.46 KB

patch

obsolete

>diff -Naur open-iscsi-2.0.871-0.29.1/etc/init.d/boot.open-iscsi open-iscsi-2.0.871-0.29.1-fixed/etc/init.d/boot.open-iscsi
>--- open-iscsi-2.0.871-0.29.1/etc/init.d/boot.open-iscsi	2011-07-25 13:03:01.000000000 +0000
>+++ open-iscsi-2.0.871-0.29.1-fixed/etc/init.d/boot.open-iscsi	2011-09-13 18:48:05.000000000 +0000
>@@ -1,77 +0,0 @@
>-#!/bin/bash
>-#
>-# /etc/init.d/iscsi
>-#
>-### BEGIN INIT INFO
>-# Provides:          iscsiboot
>-# Required-Start:
>-# Should-Start:      boot.multipath
>-# Required-Stop:
>-# Should-Stop:       boot.multipath
>-# Default-Start:     B
>-# Default-Stop:      
>-# Short-Description: iSCSI initiator daemon root-fs support
>-# Description:       Starts the iSCSI initiator daemon if the
>-#                    root-filesystem is on an iSCSI device
>-#               
>-### END INIT INFO
>-
>-ISCSIADM=/sbin/iscsiadm
>-CONFIG_FILE=/etc/iscsid.conf
>-DAEMON=/sbin/iscsid
>-ARGS="-c $CONFIG_FILE"
>-
>-# Source LSB init functions
>-. /etc/rc.status
>-
>-#
>-# This service is run right after booting. So all targets activated
>-# during mkinitrd run should not be removed when the open-iscsi
>-# service is stopped.
>-#
>-iscsi_mark_root_nodes()
>-{
>-    $ISCSIADM -m session 2> /dev/null | while read t num i target ; do
>-	ip=${i%%:*}
>-	STARTUP=`$ISCSIADM -m node -p $ip -T $target 2> /dev/null | grep "node.conn\[0\].startup" | cut -d' ' -f3`
>-	if [ "$STARTUP" -a "$STARTUP" != "onboot" ] ; then
>-	    $ISCSIADM -m node -p $ip -T $target -o update -n node.conn[0].startup -v onboot
>-	fi
>-    done
>-}
>-
>-# Reset status of this service
>-rc_reset
>-
>-# We only need to start this for root on iSCSI
>-if ! grep -q iscsi_tcp /proc/modules ; then
>-    rc_failed 6
>-    rc_exit
>-fi
>-
>-case "$1" in
>-    start)
>-	echo -n "Starting iSCSI initiator for the root device: "
>-	startproc $DAEMON $ARGS
>-	rc_status -v
>-	iscsi_mark_root_nodes
>-	;;
>-    stop|restart|reload)
>-	rc_failed 0
>-	;;
>-    status)
>-	echo -n "Checking for iSCSI initiator service: "
>-	if checkproc $DAEMON ; then
>-	    rc_status -v
>-	else
>-	    rc_failed 3
>-	    rc_status -v
>-	fi
>-	;;
>-    *)
>-	echo "Usage: $0 {start|stop|status|restart|reload}"
>-	exit 1
>-	;;
>-esac
>-rc_exit
>-
>diff -Naur open-iscsi-2.0.871-0.29.1/etc/init.d/open-iscsi open-iscsi-2.0.871-0.29.1-fixed/etc/init.d/open-iscsi
>--- open-iscsi-2.0.871-0.29.1/etc/init.d/open-iscsi	2011-07-25 13:03:01.000000000 +0000
>+++ open-iscsi-2.0.871-0.29.1-fixed/etc/init.d/open-iscsi	2011-09-14 10:32:48.435371980 +0000
>@@ -5,6 +5,7 @@
> ### BEGIN INIT INFO
> # Provides:          iscsi
> # Required-Start:    $network
>+# X-Start-Before:    $remote_fs
> # Should-Start:      iscsitarget multipathd
> # Required-Stop:     $network
> # Should-Stop:       multipathd
>@@ -386,14 +387,17 @@
> iscsi_list_all_nodes()
> {
>     # Check for active sessions
>-    if $ISCSIADM -m session > /dev/null; then
>-	return 0
>+    if [[ -n "$($ISCSIADM -m session 2>&1 >/dev/null)" ]]
>+    then
>+	echo "No active connections."
>+    else
>+	echo "Active connections:"
>+	$ISCSIADM -m session |
>+	    while read proto num PORTAL TARGET
>+	    do
>+		echo -e "\t$TARGET at ${PORTAL%,*}"
>+	    done
>     fi
>-    echo "Active connections:"
>-    $ISCSIADM -m session | while read proto num PORTAL TARGET ; do
>-	PORTAL=${PORTAL%,*}
>-	echo -e "\t$TARGET at $PORTAL"
>-    done
> }
> 
> case "$1" in
>diff -Naur open-iscsi-2.0.871-0.29.1/lib/mkinitrd/scripts/setup-iscsi.sh open-iscsi-2.0.871-0.29.1-fixed/lib/mkinitrd/scripts/setup-iscsi.sh
>--- open-iscsi-2.0.871-0.29.1/lib/mkinitrd/scripts/setup-iscsi.sh	2011-07-25 13:03:01.000000000 +0000
>+++ open-iscsi-2.0.871-0.29.1-fixed/lib/mkinitrd/scripts/setup-iscsi.sh	2011-09-13 18:29:11.000000000 +0000
>@@ -2,70 +2,138 @@
> #
> #%stage: device
> #
>-check_iscsi_root() {
>-    local devname=$1
>-    local sysfs_path
>-
>-    sysfs_path=$(/sbin/udevadm info -q path -n $devname 2> /dev/null)
>-    if [ -z "$sysfs_path" ] ; then
>-	sysfs_path="/block${devname##/dev}"
>-    fi
>-    if [ ! -d /sys$sysfs_path ] ; then
>-	return;
>+function verify_path()
>+{
>+    local devname="$1" path="$2"
>+
>+    if [[ ! -d "${path}" ]]
>+    then
>+	if [[ "${path}" =~ .+\ .+ ]]
>+	then
>+	    error 2 "iSCSI device ${devname} is connected to more than one iSCSI target!"
>+	    # NEVER REACHED!!
>+	else
>+	    # Does not seem to be an iSCSI attached device
>+	    return 1
>+	fi
>     fi
>+    return 0
>+}
> 
>-    pushd /sys$sysfs_path > /dev/null
>-    if [ ! -d device ] ; then
>-	cd ..
>+function check_iscsi()
>+{
>+    local devname="$1" retval=1
>+    local sysfs_path=$(/sbin/udevadm info -q path -n "${devname}" 2>/dev/null) ip target startup
>+
>+    # Do we have a valid device?
>+    [[ -z "${sysfs_path}" ]] && sysfs_path="/block${devname##/dev}"
>+    sysfs_path="/sys${sysfs_path}"
>+    [[ ! -d "${sysfs_path}" ]] && return 1		# Nope, return false
>+
>+    # Do we have a valid device link?
>+    [[ ! -d "${sysfs_path}/device" ]] && sysfs_path="${sysfs_path%/*}"
>+    [[ ! -d "${sysfs_path}/device" ]] && return 1	# Nope, return false
>+
>+    # Is device an iSCSI device?
>+    sysfs_path="${sysfs_path}/device/../.."
>+
>+    ip="$(echo ${sysfs_path}/connection*)"
>+    verify_path "${devname}" "${ip}" || return 1	# Nope, return false
>+
>+    ip="${ip}/iscsi_connection/${ip##*/}/persistent_"
>+    [[ ! -r "${ip}address" || ! -r "${ip}port" ]] &&
>+	error 2 "iSCSI device ${devname} connected to iSCSI target without any persistent_{address,port}!"
>+    ip="$(cat "${ip}address"):$(cat "${ip}port")"
>+
>+    target=$(echo ${sysfs_path}/iscsi_session/*)
>+    verify_path "${devname}" "${target}" || return 1	# Nope, return false
>+
>+    target="${target}/targetname"
>+    [[ ! -r "${target}" ]] &&
>+	error 2 "iSCSI device ${devname} connected to iSCSI target without any targetname!"
>+    target="$(cat ${target})"
>+
>+    # Yes, figure out whether it has been correctly configured!
>+    [[ ! -x "${_iadm_}" ]] &&
>+	error 2 "iSCSI device ${devname} connected to iSCSI target, but no ${_iadm_} command available!"
>+
>+    startup="$(
>+	${_iadm_} -m node -p "${ip}" -T "${target}" 2>/dev/null | grep 'node.conn\[0\].startup'
>+    )"
>+    startup="${startup##* }"
>+    startup="${startup%% *}"
>+    if [[ "${startup}" != "onboot" ]]
>+    then
>+	[[ -z "${startup}" ]] && return 1	# Oops, no parameter - not an iSCSI, return false
>+
>+	## Either:
>+	#echo >&2 "WARNING: iSCSI device ${devname} is using 'node.conn[0].startup = ${startup}',"
>+	#echo >&2 "WARNING: setting it to 'onboot' instead."
>+	#${_iadm_} -m node -p "${ip}" -T "${target}" -o update -n 'node.conn[0].startup' -v onboot
>+
>+	## or:
>+	echo >&2 "WARNING: iSCSI device ${devname} is using 'node.conn[0].startup = ${startup}'!"
>+	echo >&2 "WARNING: System not bootable with this setting, need to be set to 'onboot' instead, using:"
>+	echo >&2 "
>+	${_iadm_} -m node -p '${ip}' -T '${target}' -o update -n 'node.conn[0].startup' -v onboot"
>     fi
> 
>-    if [ ! -d device ] ; then
>-	# no device link; return
>-	popd > /dev/null
>-	return;
>-    fi
>+    # Yes, is attached to an iSCSI device
>+    return 0
>+}
> 
>-    cd -P device
>-    cd ../..
>+_iadm_="/sbin/iscsiadm"
> 
>-    if [ -d connection* ]; then
>-	cd -P connection*
>-	cid=${PWD#*connection}
>-	sid=${cid%%:*}
>-	if [ -d /sys/class/iscsi_session/session$sid ]; then
>-	    cd -P /sys/class/iscsi_session/session$sid
>-	    echo $(basename $PWD)
>-	fi
>-    fi
>-    popd > /dev/null
>-}
>+# Are system device(s) attached to iSCSI devices?
>+# In case they are, ensure
>+#	(1) that the iSCSI gets included in the "initrd"
>+# and
>+#	(2) that the iSCSI sessions have been configured with "node.conn[0].startup = onboot".
>+for bd in $blockdev
>+do
>+    update_blockdev $bd
>+    check_iscsi $bd && root_iscsi=1
>+done
> 
>-for bd in $blockdev; do
>+# Are any of the defined file partitions to be mounted at system boot attached to iSCSI devices?
>+# In case they are, ensure
>+#	(1) that the iSCSI gets included in the "initrd"
>+# and
>+#	(2) that the iSCSI sessions have been configured with "node.conn[0].startup = onboot".
>+for bd in $(awk '/^[[:space:]]*(\/dev\/|(LABEL|UUID)=)/ { print $1 }' /etc/fstab)
>+do
>+    bd="${bd/LABEL=//dev/disk/by-label/}"
>+    bd="${bd/UUID=//dev/disk/by-uuid/}"
>     update_blockdev $bd
>-    sid=$(check_iscsi_root $bd)
>-    if [ "$sid" ]; then
>-    	root_iscsi=1
>-    	iscsi_sessions="$iscsi_sessions ${sid#session}"
>-    fi
>+    check_iscsi $bd && root_iscsi=1
> done
> 
>+# Include the iSCSI stack, when at least one active iSCSI session has been configured with
>+# "node.conn[0].startup = onboot", even if it was not used for a system device or mounted
>+# partition.
>+if [[ -x "${_iadm_}" ]]
>+then
>+    for node in $(${_iadm_} -m node 2>/dev/null | sed -e 's/ /,/g')
>+    do
>+	[[ "$(
>+		${_iadm_} -m node -T "${node##*,}" -p "${node%%,*}" 2>/dev/null |
>+		grep "node.conn\[0\].startup"
>+	    )" =~ [[:space:]]*=[[:space:]]*onboot ]] && root_iscsi=1
>+    done
>+fi
>+
>+unset _iadm_
>+
> save_var root_iscsi
>-save_var iscsi_sessions
> 
>-if [ "${root_iscsi}" ]; then
>-    for session in $iscsi_sessions; do
>-	eval TargetName${session}=$(cat /sys/class/iscsi_session/session${session}/targetname)
>-	eval TargetAddress${session}=$(cat /sys/class/iscsi_connection/connection${session}:0/address)
>-	eval TargetPort${session}=$(cat /sys/class/iscsi_connection/connection${session}:0/port)
>-
>-	save_var TargetName${session}
>-	save_var TargetAddress${session}
>-	save_var TargetPort${session}
>-    done
>-    # copy the iscsi configuration
>+if [[ -z "${root_iscsi}" ]]
>+then
>+    # Copy the iscsi configuration
>     cp -rp /etc/iscsi etc/
>+
>     # Use default interface
>     interface="default"
> 
>-    save_var TargetPort 3260 # in case the port was not defined via command line we assign a default port
>+    # In case target port was not defined via command line, assign default port
>+    save_var TargetPort 3260
> fi

Actions: View | Diff

Attachments on bug 630434: 386537 | 386539 | 450674 | 450695 | 450697 | 450703 | 485398 | 485399 | 485400