From 62e5817dcbdb249e1779cbc0d139b0247d14bed7 Mon Sep 17 00:00:00 2001 From: Nathaniel Clark Date: Wed, 24 Oct 2018 15:49:39 -0400 Subject: [PATCH] LU-11563 build: Only add l_tunedisk udev rule to server Split LU-9551 patch off into server only udev rules. It just spits errors on the client since l_tunedisk is a server-side only tool. Lustre-change: https://review.whamcloud.com/33466 Lustre-commit: 0d11a314787bc795797a016262e9bcfe86e2193e Test-Parameters: trivial Signed-off-by: Nathaniel Clark Change-Id: Iee426588bcce611dc913cf89a4bcb733c364482b Reviewed-by: John L. Hammond Reviewed-by: Jay J Lan Reviewed-on: https://review.whamcloud.com/33688 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre.spec.in | 3 +++ lustre/conf/99-lustre-server.rules | 3 +++ lustre/conf/99-lustre.rules | 3 --- lustre/conf/Makefile.am | 5 +++-- 4 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 lustre/conf/99-lustre-server.rules diff --git a/lustre.spec.in b/lustre.spec.in index c7fbf80..f43c7f7 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -462,6 +462,9 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files %{_includedir}/lustre %endif %{_sysconfdir}/udev/rules.d/99-lustre.rules +%if %{with servers} +%{_sysconfdir}/udev/rules.d/99-lustre-server.rules +%endif %config(noreplace) %{_sysconfdir}/ldev.conf %if %{with lnet_dlc} %config(noreplace) %{_sysconfdir}/lnet.conf diff --git a/lustre/conf/99-lustre-server.rules b/lustre/conf/99-lustre-server.rules new file mode 100644 index 0000000..fdd21ec --- /dev/null +++ b/lustre/conf/99-lustre-server.rules @@ -0,0 +1,3 @@ +# Ensure block devices re-added to the system allow for large writes (LU-9551) +ACTION=="add|change", SUBSYSTEM=="block", RUN+="/usr/sbin/l_tunedisk /dev/%k" + diff --git a/lustre/conf/99-lustre.rules b/lustre/conf/99-lustre.rules index be1bcf5..7a0c6c7 100644 --- a/lustre/conf/99-lustre.rules +++ b/lustre/conf/99-lustre.rules @@ -1,4 +1 @@ KERNEL=="obd", MODE="0666" - -# Ensure block devices re-added to the system allow for large writes (LU-9551) -ACTION=="add|change", SUBSYSTEM=="block", RUN+="/usr/sbin/l_tunedisk /dev/%k" diff --git a/lustre/conf/Makefile.am b/lustre/conf/Makefile.am index 562a352..f46c125 100644 --- a/lustre/conf/Makefile.am +++ b/lustre/conf/Makefile.am @@ -34,7 +34,7 @@ EXTRA_DIST = lustre.dtd slapd-lustre.conf lustre2ldif.xsl top.ldif \ 99-lustre.rules lustre ldev.conf ko2iblnd.conf lsvcgss \ - lnet_routes.conf lnet.conf + lnet_routes.conf lnet.conf 99-lustre-server.rules ldapconfdir = $(sysconfdir)/openldap sysconf_DATA = ldev.conf @@ -48,8 +48,9 @@ endif udevrulesdir = $(sysconfdir)/udev/rules.d udevrules_DATA = 99-lustre.rules -if RHEL if SERVER +udevrules_DATA += 99-lustre-server.rules +if RHEL sysconfigdir = $(sysconfdir)/sysconfig sysconfig_DATA = lustre lsvcgss endif -- 1.8.3.1