i-t: don't brokenly set the scheduler for root pool vdev's disks
This effectively reverts4fc411f7a3
(part of #6807) andf6fbe25664
(#9042) ‒ the code itself and latter PR cite symmetry with whole-disk-vdev behaviour (presumably because rootfs vdevs are rarely whole disks), but the code is broken for NVME devices (indeed, it'd strip the controller number instead of the (potential) partition number, turning "nvme0n1p1" into "nvmen1p1", which would then subsequently fail the sysfs existence check); it could be fixed to handle those (and any others) rather easily by dereferencing /sys/class/block/$devname, but this isn't the place for setting this ‒ as noted in the commit that removed setting the scheduler by default (9e17e6f254
) ‒ use an udev rule Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Closes #11838
This commit is contained in:
parent
55419e0a72
commit
aa5a4eb5d0
|
@ -890,30 +890,6 @@ mountroot()
|
||||||
ZFS_RPOOL="${pool}"
|
ZFS_RPOOL="${pool}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Set the no-op scheduler on the disks containing the vdevs of
|
|
||||||
# the root pool. For single-queue devices, this scheduler is
|
|
||||||
# "noop", for multi-queue devices, it is "none".
|
|
||||||
# ZFS already does this for wholedisk vdevs (for all pools), so this
|
|
||||||
# is only important for partitions.
|
|
||||||
"${ZPOOL}" status -L "${ZFS_RPOOL}" 2> /dev/null |
|
|
||||||
awk '/^\t / && !/(mirror|raidz)/ {
|
|
||||||
dev=$1;
|
|
||||||
sub(/[0-9]+$/, "", dev);
|
|
||||||
print dev
|
|
||||||
}' |
|
|
||||||
while read -r i
|
|
||||||
do
|
|
||||||
SCHEDULER=/sys/block/$i/queue/scheduler
|
|
||||||
if [ -e "${SCHEDULER}" ]
|
|
||||||
then
|
|
||||||
# Query to see what schedulers are available
|
|
||||||
case "$(cat "${SCHEDULER}")" in
|
|
||||||
*noop*) echo noop > "${SCHEDULER}" ;;
|
|
||||||
*none*) echo none > "${SCHEDULER}" ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------
|
# ----------------------------------------------------------------
|
||||||
# P R E P A R E R O O T F I L E S Y S T E M
|
# P R E P A R E R O O T F I L E S Y S T E M
|
||||||
|
|
Loading…
Reference in New Issue