From 0469456b352530d9f507f2515e674bfb03671f48 Mon Sep 17 00:00:00 2001 From: Marian Csontos Date: Tue, 30 Jul 2019 16:33:40 +0200 Subject: [PATCH] New upstream release v2.03.05 --- .gitignore | 1 + LVM2.2.02.185.tgz.asc | 17 -- LVM2.2.03.05.tgz.asc | 17 ++ ...pes-stripesize-in-mirror-conversions.patch | 22 ++ ...ion-for-differing-PV-and-device-size.patch | 51 +++++ ...ine-when-device-has-a-different-size.patch | 61 +++++ lvm2-lvmetad-timeout.patch | 16 -- lvm2-set-default-preferred_names.patch | 25 ++- lvm2.spec | 209 +++++------------- sources | 2 +- upstream | 2 +- 11 files changed, 222 insertions(+), 201 deletions(-) delete mode 100644 LVM2.2.02.185.tgz.asc create mode 100644 LVM2.2.03.05.tgz.asc create mode 100644 lvm2-2_03_06-lvconvert-allow-stripes-stripesize-in-mirror-conversions.patch create mode 100644 lvm2-2_03_06-md-component-detection-for-differing-PV-and-device-size.patch create mode 100644 lvm2-2_03_06-pvscan-fix-PV-online-when-device-has-a-different-size.patch delete mode 100644 lvm2-lvmetad-timeout.patch diff --git a/.gitignore b/.gitignore index cc81ec7..6fc0f7c 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ /LVM2.2.02.183.tgz /LVM2.2.02.184.tgz /LVM2.2.02.185.tgz +/LVM2.2.03.05.tgz diff --git a/LVM2.2.02.185.tgz.asc b/LVM2.2.02.185.tgz.asc deleted file mode 100644 index 92f0ea2..0000000 --- a/LVM2.2.02.185.tgz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIcBAABAgAGBQJc2SMtAAoJELkRJDHlCQOfS5gQANuzrwesLOu1zZ/GWQ7kOC0D -Drr8Polhj6SMmfNQnK89F8QbHbtUWfO19NeDt9noJRLNKijhVbtlPrcP8VF4nOeY -iFj3HGguqMFHDtNo/NjugB80ZbQ8EslZfn7vIvH1fzU2RUBRC+1lseaxeEZvSUG+ -qpPjWmYVM6e0XOj6MGFfrWLJpMXftipKRyBgqcoK4cp0FBMnzWNSXxbrGsuAy7wt -BJhYu/Y+bFaPe4C12mlzrnroIq735DNbBrEbBnoJ9wp0TLpNGGmFC/aeUvwJT1o5 -uf7dAkvNohWe8cZ4FHG3GS7tJ+gebt/btRHiF/oNitEYoHyBPAAUZ5Cfq6YF0EWy -t8untOphvQdMceHrKybkqvcn1DmF8PeZjxhQ8tqqtp+BWgdlGCjPOX2hm4qa9hZS -v5852llvXE8HQ6GUGycoeeZrSA2s5kmWTNov7hWZ94VaQ+D6V6aRlGvcPvPIycJb -b9wbkjb364IjtTcWEbfUIRHvsRjQzx5kngbhxA7E/GAqH96X7uklTLNa1xGx4fxc -uP9Go376m0PeRJ8MOIuypjIrvbVsyvz7Em8DobDbVmUry1IAu1Kv8/vUG4VRp4xL -aah3pNgMdcpXe8EXzNhkvn6Jt3TlDVk5Y+Uq6mpKlTftBrVMzAAVVeXJ+lR1QM1r -c6womN+/sfhuOYDVXvxI -=8VFY ------END PGP SIGNATURE----- diff --git a/LVM2.2.03.05.tgz.asc b/LVM2.2.03.05.tgz.asc new file mode 100644 index 0000000..89e77ec --- /dev/null +++ b/LVM2.2.03.05.tgz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAABAgAGBQJdBJ/2AAoJELkRJDHlCQOfLpcP/3eY1mo/MlhPwxsz23a8v7sW +0NYZKqTC0N+xOc0lZ4kwDl1ru/b59T5gGwDinmXCqjP41fvT1PZlFklrsffyCI7i +jy1QO/a06r+w8xTmdwHL08tuhkO6gh8+BKsBChYsJhdGrgBibNRO9HvIlU8LpLFs +i96GXbjoZZ3irKxy+1OxCFer1Hd2ISbBBq/YHnGlA1h24awBsiL4YDNMxC+pIEiV +nqlypDFqeNe29y/IRWrq8D3WxOm5YK40lzTi59blvl5OAIZLnhtRKm+roGTuoML5 +V/ZKbTYxr/LTclUS5cIkSxQEiJxNq0TIP8zVspgAroQFKx5JX8C40bzWEDTVnrsx +3wfJWN0jPyBwPox8/QjqScE1MJ+5G8iUOxbf/SuIpp103eBJ4RR+HzaQeig7BgP/ +cpk80CZwKzlKTMYedmuAE4WK5igqncrdoW2AbtVvVQLUk7cp3tdLvxMyH2z+jv5D +DCpWHqc5eB+sMmD4+Vjp6Mrg2ViSEMdAmorTX0TPrd5meos39Ged3SUZ5v0M7N0q +Lhj2jT2oqPGXKp6/7HLGd4do7zBqX4oaJ1DcfhsEi2kEBIUYdE5o9qlqn22QacpJ +N/waVKjEjmi1AiMiAaZAP/WuutH3UJmpdRZn1Qvd+Xlx1Iw0YbY/8S9NAtKazzFq +iF8g3kZyRIcBfvq94k5q +=NABD +-----END PGP SIGNATURE----- diff --git a/lvm2-2_03_06-lvconvert-allow-stripes-stripesize-in-mirror-conversions.patch b/lvm2-2_03_06-lvconvert-allow-stripes-stripesize-in-mirror-conversions.patch new file mode 100644 index 0000000..c669bf2 --- /dev/null +++ b/lvm2-2_03_06-lvconvert-allow-stripes-stripesize-in-mirror-conversions.patch @@ -0,0 +1,22 @@ + tools/command-lines.in | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/tools/command-lines.in b/tools/command-lines.in +index 73a1e64..f914650 100644 +--- a/tools/command-lines.in ++++ b/tools/command-lines.in +@@ -343,13 +343,11 @@ DESC: Convert LV to striped. + RULE: all not lv_is_locked lv_is_pvmove + + lvconvert --type mirror LV +-OO: --mirrors SNumber, --regionsize RegionSize, --interval Number, --mirrorlog MirrorLog, OO_LVCONVERT ++OO: --mirrors SNumber, --stripes_long Number, --stripesize SizeKB, --regionsize RegionSize, --interval Number, --mirrorlog MirrorLog, OO_LVCONVERT + OP: PV ... + ID: lvconvert_raid_types + DESC: Convert LV to type mirror (also see type raid1), +-DESC: (also see lvconvert --mirrors). + RULE: all not lv_is_locked lv_is_pvmove +-FLAGS: SECONDARY_SYNTAX + + # When LV is already raid, this changes the raid layout + # (changing layout of raid0 and raid1 not allowed.) diff --git a/lvm2-2_03_06-md-component-detection-for-differing-PV-and-device-size.patch b/lvm2-2_03_06-md-component-detection-for-differing-PV-and-device-size.patch new file mode 100644 index 0000000..d99d156 --- /dev/null +++ b/lvm2-2_03_06-md-component-detection-for-differing-PV-and-device-size.patch @@ -0,0 +1,51 @@ + lib/metadata/metadata.c | 26 ++++++++++++++++++++++++-- + 1 file changed, 24 insertions(+), 2 deletions(-) + +diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c +index 039a7d6..8dc8ca5 100644 +--- a/lib/metadata/metadata.c ++++ b/lib/metadata/metadata.c +@@ -3507,19 +3507,41 @@ static void _set_pv_device(struct format_instance *fid, + struct physical_volume *pv) + { + char buffer[64] __attribute__((aligned(8))); ++ struct cmd_context *cmd = fid->fmt->cmd; ++ struct device *dev; + uint64_t size; + +- if (!(pv->dev = lvmcache_device_from_pvid(fid->fmt->cmd, &pv->id, &pv->label_sector))) { ++ if (!(dev = lvmcache_device_from_pvid(cmd, &pv->id, &pv->label_sector))) { + if (!id_write_format(&pv->id, buffer, sizeof(buffer))) + buffer[0] = '\0'; + +- if (fid->fmt->cmd && !fid->fmt->cmd->pvscan_cache_single) ++ if (cmd && !cmd->pvscan_cache_single) + log_warn("WARNING: Couldn't find device with uuid %s.", buffer); + else + log_debug_metadata("Couldn't find device with uuid %s.", buffer); + } + + /* ++ * If the device and PV are not the size, it's a clue that we might ++ * be reading an MD component (but not necessarily). Skip this check: ++ * . if md component detection is disabled ++ * . if we are already doing full a md check in label scan ++ * . if md_component_checks is auto, not none (full means use_full_md_check is set) ++ */ ++ if (dev && (pv->size != dev->size) && cmd && ++ cmd->md_component_detection && ++ !cmd->use_full_md_check && ++ !strcmp(cmd->md_component_checks, "auto")) { ++ if (dev_is_md_component(dev, NULL, 1)) { ++ log_warn("WARNING: device %s is an md component, not setting device for PV.", ++ dev_name(dev)); ++ dev = NULL; ++ } ++ } ++ ++ pv->dev = dev; ++ ++ /* + * A previous command wrote the VG while this dev was missing, so + * the MISSING flag was included in the PV. + */ diff --git a/lvm2-2_03_06-pvscan-fix-PV-online-when-device-has-a-different-size.patch b/lvm2-2_03_06-pvscan-fix-PV-online-when-device-has-a-different-size.patch new file mode 100644 index 0000000..ae06be5 --- /dev/null +++ b/lvm2-2_03_06-pvscan-fix-PV-online-when-device-has-a-different-size.patch @@ -0,0 +1,61 @@ + tools/pvscan.c | 40 ++++++++++------------------------------ + 1 file changed, 10 insertions(+), 30 deletions(-) + +diff --git a/tools/pvscan.c b/tools/pvscan.c +index d41345f..db813ad 100644 +--- a/tools/pvscan.c ++++ b/tools/pvscan.c +@@ -621,6 +621,16 @@ static int _online_pvscan_one(struct cmd_context *cmd, struct device *dev, + set_pv_devices(baton.fid, baton.vg); + } + ++ /* This check repeated because set_pv_devices can do new md check. */ ++ if (dev->flags & DEV_IS_MD_COMPONENT) { ++ log_print("pvscan[%d] PV %s ignore MD component, ignore metadata.", getpid(), dev_name(dev)); ++ if (baton.vg) ++ release_vg(baton.vg); ++ else ++ fmt->ops->destroy_instance(baton.fid); ++ return 1; ++ } ++ + if (baton.vg && vg_is_shared(baton.vg)) { + log_print("pvscan[%d] PV %s ignore shared VG.", getpid(), dev_name(dev)); + release_vg(baton.vg); +@@ -638,36 +648,6 @@ static int _online_pvscan_one(struct cmd_context *cmd, struct device *dev, + return 1; + } + +- /* +- * Do not consider a device online (for purposes of autoactivation) +- * if its size does not match the PV size recorded in the metadata. +- * It may mean that it's not the correct dev for the PV, e.g. it +- * could be an md component device that's not been filtered. +- */ +- if (baton.vg && cmd->check_pv_dev_sizes) { +- struct pv_list *pvl; +- uint64_t dev_size = 0; +- uint64_t meta_pv_size = 0; +- +- dm_list_iterate_items(pvl, &baton.vg->pvs) { +- if (pvl->pv->dev != dev) +- continue; +- +- if (!dev_get_size(dev, &dev_size)) +- stack; +- meta_pv_size = pv_size(pvl->pv); +- break; +- } +- +- if (dev_size != meta_pv_size) { +- log_print("pvscan[%d] PV %s ignore for size %llu not matching device %llu.", +- getpid(), dev_name(dev), +- (unsigned long long)meta_pv_size, (unsigned long long)dev_size); +- release_vg(baton.vg); +- return 1; +- } +- } +- + ret = _online_pv_found(cmd, dev, dev_args, baton.vg, found_vgnames); + + /* diff --git a/lvm2-lvmetad-timeout.patch b/lvm2-lvmetad-timeout.patch deleted file mode 100644 index dc5eb75..0000000 --- a/lvm2-lvmetad-timeout.patch +++ /dev/null @@ -1,16 +0,0 @@ - scripts/lvm2_lvmetad_systemd_red_hat.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/lvm2_lvmetad_systemd_red_hat.service.in b/scripts/lvm2_lvmetad_systemd_red_hat.service.in -index 8f4c60d..a1cedd2 100644 ---- a/scripts/lvm2_lvmetad_systemd_red_hat.service.in -+++ b/scripts/lvm2_lvmetad_systemd_red_hat.service.in -@@ -9,7 +9,7 @@ Conflicts=shutdown.target - [Service] - Type=simple - NonBlocking=true --ExecStart=@SBINDIR@/lvmetad -f -+ExecStart=@SBINDIR@/lvmetad -f -t 3600 - Environment=SD_ACTIVATION=1 - Restart=on-abort - PIDFile=@LVMETAD_PIDFILE@ diff --git a/lvm2-set-default-preferred_names.patch b/lvm2-set-default-preferred_names.patch index 1c44605..95259f4 100644 --- a/lvm2-set-default-preferred_names.patch +++ b/lvm2-set-default-preferred_names.patch @@ -1,26 +1,33 @@ - conf/example.conf.in | 2 +- + conf/example.conf.in | 7 ++++--- lib/config/config_settings.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/conf/example.conf.in b/conf/example.conf.in -index c0afcb7..ec12918 100644 +index a5eba01..8fa126b 100644 --- a/conf/example.conf.in +++ b/conf/example.conf.in -@@ -106,7 +106,7 @@ devices { - # Example +@@ -118,11 +118,12 @@ devices { + # Prefer the name with the least number of slashes. + # Prefer a name that is a symlink. + # Prefer the path with least value in lexicographical order. +- # +- # Example ++ # ++ # Example: # preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ] # - # This configuration option does not have a default value defined. -+ preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ] ++ # This configuration option has an automatic default value. ++ # preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ] # Configuration option devices/filter. # Limit the block devices that are used by LVM commands. diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h -index 9017043..c06b6f0 100644 +index efa86e7..b3b6c77 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h -@@ -205,7 +205,7 @@ cfg(devices_external_device_info_source_CFG, "external_device_info_source", devi - " compiled with udev support.\n" +@@ -269,7 +269,7 @@ cfg(devices_hints_CFG, "hints", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_ + " Use no hints.\n" "#\n") -cfg_array(devices_preferred_names_CFG, "preferred_names", devices_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_UNDEFINED , CFG_TYPE_STRING, NULL, vsn(1, 2, 19), NULL, 0, NULL, diff --git a/lvm2.spec b/lvm2.spec index c84cdf8..722bf98 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -1,16 +1,16 @@ -%global device_mapper_version 1.02.158 +%global device_mapper_version 1.02.163 %global enable_cache 1 %global enable_cluster 1 %global enable_cmirror 1 %global enable_lvmdbusd 1 -%global enable_lvmetad 1 %global enable_lvmlockd 1 %global enable_lvmpolld 1 -%global enable_python 0 %global enable_thin 1 %global enable_dmfilemapd 1 %global enable_testsuite 1 +%global enable_vdo 1 +%global enable_writecache 1 %global system_release_version 23 %global systemd_version 189-3 @@ -19,7 +19,7 @@ %global bash_version 4.0 %global corosync_version 1.99.9-1 %global resource_agents_version 3.9.5-12 -%global dlm_version 4.0.6-2 +%global dlm_version 4.0.9-1 %global libselinux_version 1.30.19-4 %global persistent_data_version 0.7.0-0.1.rc6 %global sanlock_version 3.3.0-2 @@ -40,12 +40,12 @@ %endif %if %{enable_cluster} - %global configure_cluster --with-cluster=internal --with-clvmd=corosync + %global configure_cluster --with-cluster=internal %if %{enable_cmirror} %global configure_cmirror --enable-cmirrord %endif %else - %global configure_cluster --with-cluster=internal --with-clvmd=none + %global configure_cluster --with-cluster=internal %endif # Do not reset Release to 1 unless both lvm2 and device-mapper @@ -56,14 +56,16 @@ Name: lvm2 %if 0%{?rhel} Epoch: %{rhel} %endif -Version: 2.02.185 -Release: 2%{?dist} +Version: 2.03.05 +Release: 1%{?dist} License: GPLv2 URL: http://sourceware.org/lvm2 #Source0: ftp://sourceware.org/pub/lvm2/releases/LVM2.%%{version}.tgz Source0: ftp://sourceware.org/pub/lvm2/releases/LVM2.%{version}.tgz Patch0: lvm2-set-default-preferred_names.patch -Patch1: lvm2-lvmetad-timeout.patch +Patch1: lvm2-2_03_06-md-component-detection-for-differing-PV-and-device-size.patch +Patch2: lvm2-2_03_06-pvscan-fix-PV-online-when-device-has-a-different-size.patch +Patch3: lvm2-2_03_06-lvconvert-allow-stripes-stripesize-in-mirror-conversions.patch BuildRequires: gcc %if %{enable_testsuite} @@ -72,7 +74,7 @@ BuildRequires: gcc-c++ BuildRequires: libselinux-devel >= %{libselinux_version}, libsepol-devel BuildRequires: libblkid-devel >= %{util_linux_version} BuildRequires: ncurses-devel -BuildRequires: readline-devel +BuildRequires: compat-readline5-devel BuildRequires: libaio-devel %if %{enable_cluster} BuildRequires: corosynclib-devel >= %{corosync_version} @@ -84,11 +86,9 @@ BuildRequires: module-init-tools BuildRequires: pkgconfig BuildRequires: systemd-devel BuildRequires: systemd-units -%if %{enable_python} || %{enable_lvmdbusd} +%if %{enable_lvmdbusd} BuildRequires: python3-devel BuildRequires: python3-setuptools -%endif -%if %{enable_lvmdbusd} BuildRequires: python3-dbus BuildRequires: python3-pyudev %endif @@ -122,7 +122,9 @@ or more physical volumes and creating one or more logical volumes %prep %setup -q -n LVM2.%{version} %patch0 -p1 -b .preferred_names -%patch1 -p1 -b .lvmetad_timeout +%patch1 -p1 -b .md_component_detection_diff_PV_and_dev_size +%patch2 -p1 -b .fix_PV_activation_diff_PV_and_dev_size +%patch3 -p1 -b .allow_mirror_conversion_with_stripes %build %global _default_pid_dir /run @@ -142,14 +144,9 @@ or more physical volumes and creating one or more logical volumes %global configure_thin --with-thin=internal %endif -%if %{enable_lvmetad} -%global configure_lvmetad --enable-lvmetad -%endif - %if %{enable_lockd_dlm} -%global configure_lockd_dlm --enable-lvmlockd-dlm +%global configure_lockd_dlm --enable-lvmlockd-dlm --enable-lvmlockd-dlmcontrol %endif - %if %{enable_lockd_sanlock} %global configure_lockd_sanlock --enable-lvmlockd-sanlock %endif @@ -162,15 +159,24 @@ or more physical volumes and creating one or more logical volumes %global configure_lvmdbusd --enable-dbus-service --enable-notify-dbus %endif -%if %{enable_python} -%global configure_python --enable-python3-bindings -%endif - %if %{enable_dmfilemapd} %global configure_dmfilemapd --enable-dmfilemapd %endif -%configure --with-default-dm-run-dir=%{_default_dm_run_dir} --with-default-run-dir=%{_default_run_dir} --with-default-pid-dir=%{_default_pid_dir} --with-default-locking-dir=%{_default_locking_dir} --with-usrlibdir=%{_libdir} --enable-fsadm --enable-write_install --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd --enable-blkid_wiping %{?configure_python} %{?configure_cluster} %{?configure_cmirror} %{?configure_udev} %{?configure_thin} %{?configure_lvmetad} %{?configure_cache} %{?configure_lvmpolld} %{?configure_lockd_dlm} %{?configure_lockd_sanlock} %{?configure_lvmdbusd} %{?configure_dmfilemapd} +%if %{enable_vdo} +%global configure_vdo --with-vdo=internal --with-vdo-format=%{_bindir}/vdoformat +%endif + +%if %{enable_writecache} +%global configure_writecache --with-writecache=internal +%endif + +# NOTE: Using CFLAGS and LDFLAGS would override the fedora default flags, thus +# using paths here... +export CPATH="%{_includedir}/readline5" +export LIBRARY_PATH="%{_libdir}/readline5" + +%configure --with-default-dm-run-dir=%{_default_dm_run_dir} --with-default-run-dir=%{_default_run_dir} --with-default-pid-dir=%{_default_pid_dir} --with-default-locking-dir=%{_default_locking_dir} --with-usrlibdir=%{_libdir} --enable-fsadm --enable-write_install --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-cmdlib --enable-dmeventd --enable-blkid_wiping %{?configure_cluster} %{?configure_cmirror} %{?configure_udev} %{?configure_thin} %{?configure_cache} %{?configure_lvmpolld} %{?configure_lockd_dlm} %{?configure_lockd_sanlock} %{?configure_lvmdbusd} %{?configure_dmfilemapd} %{?configure_writecache} %{?configure_vdo} --disable-silent-rules make %{?_smp_mflags} @@ -192,14 +198,6 @@ if [ "$1" = "1" ] ; then systemctl enable lvm2-monitor.service systemctl start lvm2-monitor.service >/dev/null 2>&1 || : fi -%if %{enable_lvmetad} -%systemd_post lvm2-lvmetad.socket -# lvm2-lvmetad.socket is always enabled and started and ready to serve if lvmetad is used -# replace direct systemctl calls with systemd rpm macro once this is provided in the macro: -# http://cgit.freedesktop.org/systemd/systemd/commit/?id=57ab2eabb8f92fad5239c7d4492e9c6e23ee0678 -systemctl enable lvm2-lvmetad.socket -systemctl start lvm2-lvmetad.socket >/dev/null 2>&1 || : -%endif %if %{enable_lvmpolld} %systemd_post lvm2-lvmpolld.socket @@ -212,9 +210,6 @@ systemctl start lvm2-lvmpolld.socket >/dev/null 2>&1 || : %preun %systemd_preun blk-availability.service lvm2-monitor.service -%if %{enable_lvmetad} -%systemd_preun lvm2-lvmetad.service lvm2-lvmetad.socket -%endif %if %{enable_lvmpolld} %systemd_preun lvm2-lvmpolld.service lvm2-lvmpolld.socket @@ -222,9 +217,6 @@ systemctl start lvm2-lvmpolld.socket >/dev/null 2>&1 || : %postun %systemd_postun lvm2-monitor.service -%if %{enable_lvmetad} -%systemd_postun_with_restart lvm2-lvmetad.service -%endif %if %{enable_lvmpolld} %systemd_postun_with_restart lvm2-lvmpolld.service @@ -246,12 +238,8 @@ systemctl start lvm2-lvmpolld.socket >/dev/null 2>&1 || : %defattr(555,root,root,-) %{_sbindir}/fsadm %{_sbindir}/lvm -%{_sbindir}/lvmconf %{_sbindir}/lvmconfig %{_sbindir}/lvmdump -%if %{enable_lvmetad} -%{_sbindir}/lvmetad -%endif %if %{enable_lvmpolld} %{_sbindir}/lvmpolld %endif @@ -305,6 +293,7 @@ systemctl start lvm2-lvmpolld.socket >/dev/null 2>&1 || : %{_mandir}/man7/lvmraid.7.gz %{_mandir}/man7/lvmreport.7.gz %{_mandir}/man7/lvmthin.7.gz +%{_mandir}/man7/lvmvdo.7.gz %{_mandir}/man7/lvmsystemid.7.gz %{_mandir}/man8/fsadm.8.gz %{_mandir}/man8/lvchange.8.gz @@ -317,7 +306,6 @@ systemctl start lvm2-lvmpolld.socket >/dev/null 2>&1 || : %{_mandir}/man8/lvm-config.8.gz %{_mandir}/man8/lvmconfig.8.gz %{_mandir}/man8/lvm-dumpconfig.8.gz -%{_mandir}/man8/lvmconf.8.gz %{_mandir}/man8/lvmdiskscan.8.gz %{_mandir}/man8/lvmdump.8.gz %{_mandir}/man8/lvm-fullreport.8.gz @@ -358,10 +346,7 @@ systemctl start lvm2-lvmpolld.socket >/dev/null 2>&1 || : %{_mandir}/man8/vgscan.8.gz %{_mandir}/man8/vgsplit.8.gz %{_udevdir}/11-dm-lvm.rules -%if %{enable_lvmetad} -%{_mandir}/man8/lvmetad.8.gz %{_udevdir}/69-dm-lvm-metad.rules -%endif %if %{enable_lvmpolld} %{_mandir}/man8/lvmpolld.8.gz %{_mandir}/man8/lvm-lvpoll.8.gz @@ -378,6 +363,9 @@ systemctl start lvm2-lvmpolld.socket >/dev/null 2>&1 || : %{_sysconfdir}/lvm/profile/cache-mq.profile %{_sysconfdir}/lvm/profile/cache-smq.profile %{_sysconfdir}/lvm/profile/lvmdbusd.profile +%if %{enable_vdo} +%{_sysconfdir}/lvm/profile/vdo-small.profile +%endif %dir %{_sysconfdir}/lvm/backup %dir %{_sysconfdir}/lvm/cache %dir %{_sysconfdir}/lvm/archive @@ -386,12 +374,8 @@ systemctl start lvm2-lvmpolld.socket >/dev/null 2>&1 || : %{_tmpfilesdir}/%{name}.conf %{_unitdir}/blk-availability.service %{_unitdir}/lvm2-monitor.service -%attr(555, -, -) %{_prefix}/lib/systemd/system-generators/lvm2-activation-generator -%if %{enable_lvmetad} -%{_unitdir}/lvm2-lvmetad.socket -%{_unitdir}/lvm2-lvmetad.service %{_unitdir}/lvm2-pvscan@.service -%endif +%attr(555, -, -) %{_prefix}/lib/systemd/system-generators/lvm2-activation-generator %if %{enable_lvmpolld} %{_unitdir}/lvm2-lvmpolld.socket %{_unitdir}/lvm2-lvmpolld.service @@ -412,17 +396,11 @@ Requires: pkgconfig This package contains files needed to develop applications that use the lvm2 libraries. -NOTE: lvm2app is deprecated. Migration to D-Bus API provided by -%{name}-dbusd is recommended. - %files devel %defattr(444,root,root,-) -%{_libdir}/liblvm2app.so %{_libdir}/liblvm2cmd.so %{_libdir}/libdevmapper-event-lvm2.so -%{_includedir}/lvm2app.h %{_includedir}/lvm2cmd.h -%{_libdir}/pkgconfig/lvm2app.pc %package libs Summary: Shared libraries for lvm2 @@ -438,7 +416,6 @@ This package contains shared lvm2 libraries for applications. %{!?_licensedir:%global license %%doc} %license COPYING.LIB %defattr(555,root,root,-) -%{_libdir}/liblvm2app.so.* %{_libdir}/liblvm2cmd.so.* %{_libdir}/libdevmapper-event-lvm2.so.* %dir %{_libdir}/device-mapper @@ -457,31 +434,6 @@ This package contains shared lvm2 libraries for applications. %{_libdir}/libdevmapper-event-lvm2vdo.so %{_libdir}/device-mapper/libdevmapper-event-lvm2vdo.so -%if %{enable_python} - -%package -n python3-lvm-deprecated -Summary: Python 3 module to access LVM (Deprecated) -License: LGPLv2 -Provides: python3-lvm = %{?epoch}:%{version}-%{release} -%{?python_provide:%python_provide python3-lvm} -# For compatibility with old name: -Provides: %{name}-python3-libs = %{?epoch}:%{version}-%{release} -Obsoletes: %{name}-python3-libs < %{?epoch}:%{version}-%{release} -Requires: %{name}-libs = %{?epoch}:%{version}-%{release} - -%description -n python3-lvm-deprecated -Deprecated python 3 module to allow the creation and -use of LVM logical volumes, physical volumes, and -volume groups. - -Migration to D-Bus API provided by %{name}-dbusd is recommended. - -%files -n python3-lvm-deprecated -%{python3_sitearch}/*.so -%{python3_sitearch}/*.egg-info - -%endif - ############################################################################## # LVM locking daemon ############################################################################## @@ -504,13 +456,13 @@ Requires(postun): systemd-units >= %{systemd_version} LVM commands use lvmlockd to coordinate access to shared storage. %post lockd -%systemd_post lvm2-lvmlockd.service lvm2-lvmlocking.service +%systemd_post lvmlockd.service lvmlocks.service %preun lockd -%systemd_preun lvm2-lvmlockd.service lvm2-lvmlocking.service +%systemd_preun lvmlockd.service lvmlocks.service %postun lockd -%systemd_postun lvm2-lvmlockd.service lvm2-lvmlocking.service +%systemd_postun lvmlockd.service lvmlocks.service %files lockd %defattr(444,root,root,-) @@ -518,75 +470,8 @@ LVM commands use lvmlockd to coordinate access to shared storage. %%attr(555, -, -) %{_sbindir}/lvmlockctl %{_mandir}/man8/lvmlockd.8.gz %{_mandir}/man8/lvmlockctl.8.gz -%{_unitdir}/lvm2-lvmlockd.service -%{_unitdir}/lvm2-lvmlocking.service - -%endif - -############################################################################## -# Cluster subpackage -# The 'clvm' OCF script to manage clvmd instance is part of resource-agents. -############################################################################## -%if %{enable_cluster} - -%package cluster -Summary: Cluster extensions for userland logical volume management tools -License: GPLv2 -Requires: lvm2 = %{?epoch}:%{version}-%{release} -Requires(preun): device-mapper >= %{?epoch}:%{device_mapper_version} -Requires(preun): lvm2 >= 2.02 -Requires: corosync >= %{corosync_version} -Requires: dlm >= %{dlm_version} -Requires: resource-agents >= %{resource_agents_version} - -%description cluster - -Extensions to LVM2 to support clusters. - -%post cluster -if [ -e %{_default_pid_dir}/clvmd.pid ]; then - /usr/sbin/clvmd -S || echo "Failed to restart clvmd daemon. Please, try manual restart." -fi - -%preun cluster -if [ "$1" = "0" ]; then - /sbin/lvmconf --disable-cluster -fi - -%files cluster -%defattr(555,root,root,-) -%{_sbindir}/clvmd -%attr(444, -, -) %{_mandir}/man8/clvmd.8.gz - -############################################################################## -# Cluster-standalone subpackage -############################################################################## -%package cluster-standalone -Summary: Additional files to support clustered LVM2 in standalone mode -License: GPLv2 -Requires: lvm2-cluster = %{?epoch}:%{version}-%{release} - -%description cluster-standalone - -Additional files needed to run clustered LVM2 daemon and clustered volume -activation in standalone mode as services without cluster resource manager -involvement (e.g. pacemaker). - -%post cluster-standalone -%systemd_post lvm2-clvmd.service lvm2-cluster-activation.service - -%preun cluster-standalone -%systemd_preun lvm2-clvmd.service lvm2-cluster-activation.service - -%postun cluster-standalone -%systemd_postun lvm2-clvmd.service lvm2-cluster-activation.service - -%files cluster-standalone -%defattr(555,root,root,-) -%{_prefix}/lib/systemd/lvm2-cluster-activation -%defattr(444,root,root,-) -%{_unitdir}/lvm2-clvmd.service -%{_unitdir}/lvm2-cluster-activation.service +%{_unitdir}/lvmlockd.service +%{_unitdir}/lvmlocks.service %endif @@ -615,7 +500,7 @@ Daemon providing device-mapper-based mirrors in a shared-storage cluster. # Cmirror-standalone subpackage ############################################################################## %package -n cmirror-standalone -Summary: Additional files to support DM based clustered mirrors in standalone mode +Summary: Additional files to support device-mapper-based clustered mirrors in standalone mode License: GPLv2 Requires: cmirror >= %{?epoch}:%{version}-%{release} @@ -649,6 +534,7 @@ involvement (e.g. pacemaker). %package dbusd Summary: LVM2 D-Bus daemon License: GPLv2 +BuildArch: noarch Requires: lvm2 >= %{?epoch}:%{version}-%{release} Requires: dbus Requires: python3-dbus @@ -844,6 +730,15 @@ An extensive functional testsuite for LVM2. %endif %changelog +* Wed Jul 31 2019 Marian Csontos - 2.03.05-1 +- IMPORTANT: Prohibit mirrored 'mirror' log via lvcreate and lvconvert. Use RAID1. +- IMPORTANT: Dropped deprecated liblvm2app. +- IMPORTANT: clvmd dropped. Use lvmlockd for cluster locking. +- Dropped lvmetad. +- Deduplication and compression - support for VDO volumes. +- Add device hints to reduce scanning. +- See WHATS_NEW and WHATS_NEW_DM in the documentation directory for more. + * Thu Jul 25 2019 Fedora Release Engineering - 2.02.185-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 4abbc8e..866dd99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (LVM2.2.02.185.tgz) = f421505551aec2a09bc862f2fcc1ee825bc4d94c53a01d13265631e99308d60fbca40112be5bc7824cce3ef223c0775d2f6c345f6a3f227229a0566c903841bf +SHA512 (LVM2.2.03.05.tgz) = 3b00f53771e99faa6459ae73353bff06ae37c64bd2659586ec25d0bb43bc3ff8ba5f713c68617fd7662a5f6cb65bca1ad0aea554819048d79c1cce20bf67c50a diff --git a/upstream b/upstream index 472bdc0..b2edc06 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -LVM2.2.02.185.tgz +LVM2.2.03.05.tgz