From 489e9cccfd8aa6b314b03a58fbc0380eb7208a6c Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Mon, 15 Mar 2010 18:40:14 +0000 Subject: [PATCH] latest fixes incl. reducing locked memory usage --- .cvsignore | 2 +- LVM2.2.02.61.tgz.asc | 7 ------- LVM2.2.02.62.tgz.asc | 7 +++++++ lvm2.spec | 42 ++++++++++++++++++++++++++++++++++++++---- sources | 2 +- upstream | 2 +- 6 files changed, 48 insertions(+), 14 deletions(-) delete mode 100644 LVM2.2.02.61.tgz.asc create mode 100644 LVM2.2.02.62.tgz.asc diff --git a/.cvsignore b/.cvsignore index 52082f5..0c29abc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -LVM2.2.02.61.tgz +LVM2.2.02.62.tgz diff --git a/LVM2.2.02.61.tgz.asc b/LVM2.2.02.61.tgz.asc deleted file mode 100644 index c954830..0000000 --- a/LVM2.2.02.61.tgz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.1 (GNU/Linux) - -iD8DBQBLeeN/IoGRwVZ+LBcRAmV8AJ0QfyMXg7c1aDHl1NrGMnWPbC+PIgCgzGtG -MdxQbJ/pP53MzEQXKAS1ICs= -=9GZ3 ------END PGP SIGNATURE----- diff --git a/LVM2.2.02.62.tgz.asc b/LVM2.2.02.62.tgz.asc new file mode 100644 index 0000000..7a4a352 --- /dev/null +++ b/LVM2.2.02.62.tgz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.1 (GNU/Linux) + +iD8DBQBLllQSIoGRwVZ+LBcRAjr0AKDIr78odIH+LEBTLUwojwdC+5hyswCdFZ4K +NRauqXPOtb2XT0OwL5+oHZQ= +=J0xw +-----END PGP SIGNATURE----- diff --git a/lvm2.spec b/lvm2.spec index e4dc704..8419939 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -1,14 +1,21 @@ -%define device_mapper_version 1.02.44 +%define device_mapper_version 1.02.45 +%define enable_cluster 1 + +%if %{enable_cluster} %define corosync_version 1.2.0-1 %define openais_version 1.1.1-1 %define clusterlib_version 3.0.6-1 +%define configure_cluster --with-cluster=internal --with-clvmd=cman,openais,corosync --enable-cmirrord +%else +%define configure_cluster --with-cluster=internal --with-clvmd=none --disable-cmirrord +%endif # Do not reset Release to 1 unless both lvm2 and device-mapper # versions are increased together. Summary: Userland logical volume management tools Name: lvm2 -Version: 2.02.61 +Version: 2.02.62 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base @@ -19,9 +26,11 @@ Patch0: lvm2-set-default-preferred_names.patch BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel BuildRequires: ncurses-devel BuildRequires: readline-devel +%if %{enable_cluster} BuildRequires: corosynclib-devel >= %{corosync_version} BuildRequires: openaislib-devel >= %{openais_version} BuildRequires: clusterlib-devel >= %{clusterlib_version} +%endif BuildRequires: module-init-tools BuildRequires: pkgconfig BuildRequires: libudev-devel @@ -54,7 +63,7 @@ or more physical volumes and creating one or more logical volumes %define _udevbasedir /lib/udev %define _udevdir %{_udevbasedir}/rules.d -%configure --enable-lvm1_fallback --enable-fsadm --with-clvmd=cman,openais,corosync --with-cluster=internal --with-pool=internal --with-user= --with-group= --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-udevdir=%{_udevdir} --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd --enable-udev_sync --enable-cmirrord +%configure --enable-lvm1_fallback --enable-fsadm --with-pool=internal --with-user= --with-group= --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-udevdir=%{_udevdir} --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd --enable-udev_sync %{configure_cluster} make %{?_smp_mflags} @@ -67,8 +76,10 @@ install -m 0700 -d $RPM_BUILD_ROOT/var/lock/lvm install -m 0600 /dev/null $RPM_BUILD_ROOT/etc/lvm/cache/.cache mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d +%if %{enable_cluster} install scripts/clvmd_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/init.d/clvmd install scripts/cmirrord_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/init.d/cmirrord +%endif install -m 0755 scripts/lvm2_monitoring_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/init.d/lvm2-monitor install -m 0755 scripts/lvmconf.sh $RPM_BUILD_ROOT/sbin/lvmconf @@ -133,6 +144,7 @@ fi %{_sbindir}/vgs %{_sbindir}/vgscan %{_sbindir}/vgsplit +%{_sbindir}/lvmconf %{_mandir}/man5/lvm.conf.5.gz %{_mandir}/man8/fsadm.8.gz %{_mandir}/man8/lvchange.8.gz @@ -236,6 +248,8 @@ This package contains shared lvm2 libraries for applications. ############################################################################## # Cluster subpackage ############################################################################## +%if %{enable_cluster} + %package cluster Summary: Cluster extensions for userland logical volume management tools License: GPLv2 @@ -250,6 +264,7 @@ Requires: openais >= %{openais_version} Requires: cman >= %{clusterlib_version} %description cluster + Extensions to LVM2 to support clusters. %post cluster @@ -266,13 +281,16 @@ fi %files cluster %defattr(-,root,root,-) %attr(755,root,root) /usr/sbin/clvmd -%{_sbindir}/lvmconf %{_mandir}/man8/clvmd.8.gz /etc/rc.d/init.d/clvmd +%endif + ############################################################################## # Cluster mirror subpackage ############################################################################## +%if %{enable_cluster} + %package -n cmirror Summary: Daemon for device-mapper-based clustered mirrors Group: System Environment/Base @@ -298,6 +316,8 @@ fi %{_mandir}/man8/cmirrord.8.gz /etc/rc.d/init.d/cmirrord +%endif + ############################################################################## # Device-mapper subpackages ############################################################################## @@ -423,6 +443,20 @@ the device-mapper event library. %changelog +* Mon Mar 15 2010 Alasdair Kergon - 2.02.62-1 +- Rewrite clvmd init script. +- Add default alternative to mlockall using mlock to reduce pinned memory size. +- Add use_mlockall and mlock_filter to activation section of lvm.conf. +- Handle misaligned devices that report alignment_offset of -1. +- Extend core allocation code in preparation for mirrored log areas. +- No longer fall back to looking up active devices by name if uuid not found. +- Don't touch /dev in vgmknodes if activation is disabled. +- Add --showkeys parameter description to dmsetup man page. +- Add --help option as synonym for help command. +- Add lvm2app functions lvm_{vg|lv}_{get|add|remove}_tag() functions. +- Refactor snapshot-merge deptree and device removal to support info-by-uuid. +- Change spec file to support excluding cluster components from the build. + * Tue Feb 16 2010 Alasdair Kergon - 2.02.61-1 - Add %ORIGIN support to lv{create,extend,reduce,resize} --extents. - Accept a list of LVs with 'lvconvert --merge @tag' using process_each_lv. diff --git a/sources b/sources index dc22ca8..d0d36cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0fdac768c78d96525d47b5a3df4c67de LVM2.2.02.61.tgz +72e3d66dc42aaf67dca475196a113528 LVM2.2.02.62.tgz diff --git a/upstream b/upstream index 52082f5..0c29abc 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -LVM2.2.02.61.tgz +LVM2.2.02.62.tgz