Hello community,
here is the log from the commit of package lvm2 for openSUSE:Factory checked in
at 2016-09-17 14:32:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lvm2 (Old)
and /work/SRC/openSUSE:Factory/.lvm2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lvm2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/lvm2/device-mapper.changes 2016-06-02
09:35:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.lvm2.new/device-mapper.changes 2016-09-17
14:32:53.000000000 +0200
@@ -1,0 +2,75 @@
+Fri Sep 9 09:24:19 UTC 2016 - tchva...@suse.com
+
+- This is sync commit from Leap/SLE12 only
+- Add patch pvcreate-enhance-the-error-message.patch bsc#960744
+- Modify GPL-2.0 to GPL-2.0+ and LGPL-2.1 to LGPL-2.1+ to avoid
+ license conflict with thin-provisioning-tools which is using GPL-3.0
+- Also contains fix for bsc#969310
+- Fix clvmd.ocf and cmirrord to remove "-d" option for cmirrod
+ (bsc#971334)
+- Fix clvmd.ocf to add lvmconf --enable-cluster before start daemon
+ when locking_type is not 3 or use_lvmetad is 1 in setting
+ (bsc#970439)
+- Modified spec to enable blkid-wiping (fate#319908)
+- Fix clvmd binary not found in case that users still use RA from
+ ocf:lvm2:clvm (bsc#980200)
+ Add sbindir=$HA_SBIN_DIR for clvmd.ocf and cmirrord.ocf
+- The bsc#979635 wnd bsc#991181 as fixed in past thanks to proper /usr
+ migration code
+- Modified raid10_segtype_default from "mirror" to "raid10"(bsc#982329)
+- Remove lvm2-clvmd/cmirrord.service and related activation services
+ from %service_add _pre/post/preun/postun because we start clvmd
+ /clmirrord and activate via pacemaker and RA. (bsc#980296)
+- Lvchange improve refresh by trying to deactivate snapshot thinLV
+ in case it's preventing merge process change integrated upstream.
+ (bsc#984321)
+- Fixed in past bsc#992843
+- Fixed by upstream bsc#984321
+- Fixed by upstream bsc#970943
+- 69-dm-lvm-metad.rules: Do not process rules for multipath
+ devices (bsc#bsc#990538, bsc#986734)
+ Add: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
+- Rewrite patches to include patch header:
+ * 10-dm.rules-Reset-state-variable-for-spurious-events.patch
+ * device-mapper-link
+ * device-mapper-type_punning.diff
+ * udev_rules-update.diff
+- Sync also lvm.conf
+
+-------------------------------------------------------------------
+Fri Sep 2 08:23:06 UTC 2016 - tchva...@suse.com
+
+- Update to 2.02.164 release, WHATS_NEW for changelog
+ * Mostly because the old tarball was no longer available
+ * Refresh fuzz on patch:
+ + make-mirror-legs-on-different-tag-pvs.patch
+ + cluster_support_mirrord_log.diff
+- Update patch to use correct api:
+ + make-mirror-legs-on-different-tag-pvs.patch
+
+-------------------------------------------------------------------
+Fri Jul 8 13:43:41 UTC 2016 - tchva...@suse.com
+
+- Update to 2.02.160 release, read WHATS_NEW for detailed log.
+ * Most notable is lvconvert refactor/enhancements
+ * Refresh patch:
+ + cluster_support_mirrord_log.diff
+
+-------------------------------------------------------------------
+Tue Jun 7 12:08:24 UTC 2016 - tchva...@suse.com
+
+- Add thin-provisioning-tools to deps to fix configure warnings
+
+-------------------------------------------------------------------
+Tue Jun 7 11:45:56 UTC 2016 - tchva...@suse.com
+
+- Do not run initrd regenerating twice in post
+
+-------------------------------------------------------------------
+Tue Jun 7 11:40:41 UTC 2016 - tchva...@suse.com
+
+- Update to 2.02.155 release, read WHATS_NEW for detailed log.
+ * Mostly few bugfixes around caching
+- Refresh patch pvmove_support_clustered_vg.diff
+
+-------------------------------------------------------------------
lvm2-clvm.changes: same change
lvm2.changes: same change
Old:
----
LVM2.2.02.152.tgz
LVM2.2.02.152.tgz.asc
New:
----
69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
LVM2.2.02.165.tgz
LVM2.2.02.165.tgz.asc
pvcreate-enhance-the-error-message.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ device-mapper.spec ++++++
--- /var/tmp/diff_new_pack.7STwCq/_old 2016-09-17 14:32:55.000000000 +0200
+++ /var/tmp/diff_new_pack.7STwCq/_new 2016-09-17 14:32:55.000000000 +0200
@@ -17,8 +17,8 @@
### COMMON-DEF-BEGIN ###
-%define lvm2_version 2.02.152
-%define device_mapper_version 1.02.124
+%define lvm2_version 2.02.165
+%define device_mapper_version 1.02.134
### COMMON-DEF-END ###
%define libname libdevmapper1_03
%define libname_event libdevmapper-event1_03
@@ -26,7 +26,7 @@
Version: %{device_mapper_version}
Release: 0
Summary: Device Mapper Tools
-License: GPL-2.0 and LGPL-2.1
+License: GPL-2.0+ and LGPL-2.1+
Group: System/Base
Url: http://www.sourceware.org/lvm2/
Source: ftp://sources.redhat.com/pub/lvm2/LVM2.%{lvm2_version}.tgz
@@ -72,10 +72,15 @@
Patch2006: Import-ID_FS_XXX-variables-bnc909358.patch
Patch2007: 10-dm.rules-Reset-state-variable-for-spurious-events.patch
Patch2008: libdm-iface-not-output-error-message-inside-retry-loop.patch
+# bnc#960744
+Patch2009: pvcreate-enhance-the-error-message.patch
+# bnc#990538 bnc#986734
+Patch2010: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
### COMMON-PATCH-END ###
BuildRequires: gcc-c++
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
BuildRequires: suse-module-tools
+BuildRequires: thin-provisioning-tools >= 0.5.6
BuildRequires: pkgconfig(libselinux)
BuildRequires: pkgconfig(libsepol)
BuildRequires: pkgconfig(libudev)
@@ -135,7 +140,6 @@
%patch1017 -p1
%patch1018 -p1
%patch1019 -p1
-
%patch2000 -p1
%patch2001 -p1
%patch2002 -p1
@@ -145,6 +149,8 @@
%patch2006 -p1
%patch2007 -p1
%patch2008 -p1
+%patch2009 -p1
+%patch2010 -p1
### COMMON-PREP-END ###
%build
++++++ lvm2-clvm.spec ++++++
--- /var/tmp/diff_new_pack.7STwCq/_old 2016-09-17 14:32:55.000000000 +0200
+++ /var/tmp/diff_new_pack.7STwCq/_new 2016-09-17 14:32:55.000000000 +0200
@@ -17,14 +17,14 @@
### COMMON-DEF-BEGIN ###
-%define lvm2_version 2.02.152
-%define device_mapper_version 1.02.124
+%define lvm2_version 2.02.165
+%define device_mapper_version 1.02.134
### COMMON-DEF-END ###
Name: lvm2-clvm
Version: %{lvm2_version}
Release: 0
Summary: Clustered LVM2
-License: GPL-2.0 and LGPL-2.1
+License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Clustering/HA
Url: http://sources.redhat.com/cluster/clvm/
Source: ftp://sources.redhat.com/pub/lvm2/LVM2.%{lvm2_version}.tgz
@@ -71,10 +71,15 @@
Patch2006: Import-ID_FS_XXX-variables-bnc909358.patch
Patch2007: 10-dm.rules-Reset-state-variable-for-spurious-events.patch
Patch2008: libdm-iface-not-output-error-message-inside-retry-loop.patch
+# bnc#960744
+Patch2009: pvcreate-enhance-the-error-message.patch
+# bnc#990538 bnc#986734
+Patch2010: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
### COMMON-PATCH-END ###
BuildRequires: libcorosync-devel
BuildRequires: libdlm-devel
BuildRequires: pkgconfig
+BuildRequires: thin-provisioning-tools >= 0.5.6
BuildRequires: pkgconfig(devmapper)
BuildRequires: pkgconfig(libudev)
Requires: corosync
@@ -119,7 +124,6 @@
%patch1017 -p1
%patch1018 -p1
%patch1019 -p1
-
%patch2000 -p1
%patch2001 -p1
%patch2002 -p1
@@ -129,6 +133,8 @@
%patch2006 -p1
%patch2007 -p1
%patch2008 -p1
+%patch2009 -p1
+%patch2010 -p1
### COMMON-PREP-END ###
%build
@@ -187,30 +193,6 @@
rm %{buildroot}%{_unitdir}/lvm2-monitor.service
rm %{buildroot}%{_mandir}/man8/lvm2-activation-generator.8
-%pre
-%service_add_pre lvm2-cluster-activation.service lvm2-clvmd.service
-
-%post
-%service_add_post lvm2-cluster-activation.service lvm2-clvmd.service
-
-%preun
-%service_del_preun lvm2-cluster-activation.service lvm2-clvmd.service
-
-%postun
-%service_del_postun lvm2-cluster-activation.service lvm2-clvmd.service
-
-%pre -n lvm2-cmirrord
-%service_add_pre lvm2-cmirrord.service lvm2-cluster-activation.service
-
-%post -n lvm2-cmirrord
-%service_add_post lvm2-cmirrord.service lvm2-cluster-activation.service
-
-%preun -n lvm2-cmirrord
-%service_del_preun lvm2-cmirrord.service lvm2-cluster-activation.service
-
-%postun -n lvm2-cmirrord
-%service_del_postun lvm2-cmirrord.service lvm2-cluster-activation.service
-
%files
%defattr(-,root,root)
%{_sbindir}/clvmd
++++++ lvm2.spec ++++++
--- /var/tmp/diff_new_pack.7STwCq/_old 2016-09-17 14:32:55.000000000 +0200
+++ /var/tmp/diff_new_pack.7STwCq/_new 2016-09-17 14:32:55.000000000 +0200
@@ -17,8 +17,8 @@
### COMMON-DEF-BEGIN ###
-%define lvm2_version 2.02.152
-%define device_mapper_version 1.02.124
+%define lvm2_version 2.02.165
+%define device_mapper_version 1.02.134
### COMMON-DEF-END ###
%define _udevdir %(pkg-config --variable=udevdir udev)
%define applib liblvm2app2_2
@@ -27,7 +27,7 @@
Version: %{lvm2_version}
Release: 0
Summary: Logical Volume Manager Tools
-License: GPL-2.0 and LGPL-2.1
+License: GPL-2.0+ and LGPL-2.1+
Group: System/Base
Url: http://www.sourceware.org/lvm2/
Source: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
@@ -73,14 +73,18 @@
Patch2006: Import-ID_FS_XXX-variables-bnc909358.patch
Patch2007: 10-dm.rules-Reset-state-variable-for-spurious-events.patch
Patch2008: libdm-iface-not-output-error-message-inside-retry-loop.patch
+# bnc#960744
+Patch2009: pvcreate-enhance-the-error-message.patch
+# bnc#990538 bnc#986734
+Patch2010: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
### COMMON-PATCH-END ###
BuildRequires: gcc-c++
BuildRequires: libaio-devel
BuildRequires: libselinux-devel
-BuildRequires: pkg-config
BuildRequires: pkgconfig
BuildRequires: readline-devel
BuildRequires: systemd
+BuildRequires: thin-provisioning-tools >= 0.5.6
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(udev)
@@ -144,7 +148,6 @@
%patch1017 -p1
%patch1018 -p1
%patch1019 -p1
-
%patch2000 -p1
%patch2001 -p1
%patch2002 -p1
@@ -154,6 +157,8 @@
%patch2006 -p1
%patch2007 -p1
%patch2008 -p1
+%patch2009 -p1
+%patch2010 -p1
### COMMON-PREP-END ###
%build
@@ -250,7 +255,6 @@
%service_add_post blk-availability.service lvm2-monitor.service
lvm2-lvmetad.socket lvm2-lvmetad.service
# Use %%tmpfiles_create when 13.2 is oldest in support scope
/usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/lvm2.conf || :
-%{?regenerate_initrd_post}
%posttrans
%{?regenerate_initrd_posttrans}
++++++ 10-dm.rules-Reset-state-variable-for-spurious-events.patch ++++++
--- /var/tmp/diff_new_pack.7STwCq/_old 2016-09-17 14:32:55.000000000 +0200
+++ /var/tmp/diff_new_pack.7STwCq/_new 2016-09-17 14:32:55.000000000 +0200
@@ -1,9 +1,24 @@
+From de73c1ab474661307d87b3bcfe442fd9f3e31233 Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke <h...@suse.de>
+Date: Fri, 19 Aug 2016 16:16:13 +0200
+Subject: [PATCH] 10-dm.rules: Reset state variables for spurious events
+
+When spurious events are generated we need to ensure to always
+present the same information than the original event; otherwise
+systemd might be thinking the device to be non-functional and
+will take unwanted action (like unmounting it).
+
References: bsc#932300
+
+Signed-off-by: Hannes Reinecke <h...@suse.com>
---
-Index: LVM2.2.02.152/udev/10-dm.rules.in
+ udev/10-dm.rules.in | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+Index: LVM2.2.02.165/udev/10-dm.rules.in
===================================================================
---- LVM2.2.02.152.orig/udev/10-dm.rules.in
-+++ LVM2.2.02.152/udev/10-dm.rules.in
+--- LVM2.2.02.165.orig/udev/10-dm.rules.in
++++ LVM2.2.02.165/udev/10-dm.rules.in
@@ -138,6 +138,11 @@ ENV{DM_UDEV_RULES_VSN}="2"
ENV{DM_UDEV_DISABLE_DM_RULES_FLAG}!="1", ENV{DM_NAME}=="?*",
SYMLINK+="(DM_DIR)/$env{DM_NAME}"
++++++ 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch ++++++
>From e8d52bf13bc4529172632c49c84a80e315741862 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <h...@suse.de>
Date: Fri, 19 Aug 2016 16:19:55 +0200
Subject: 69-dm-lvm-metad.rules: Do not process rules for multipath devices
When the device is a multipath device lvm metad should not process
it; doing so will reset the 'SYSTEMD_READY' flag and the multipath
setup will not work correctly.
References: bsc#990538, bsc#986734
Signed-off-by: Hannes Reinecke <h...@suse.com>
---
udev/69-dm-lvm-metad.rules.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/udev/69-dm-lvm-metad.rules.in b/udev/69-dm-lvm-metad.rules.in
index f0bfc1e..793a53d 100644
--- a/udev/69-dm-lvm-metad.rules.in
+++ b/udev/69-dm-lvm-metad.rules.in
@@ -17,6 +17,7 @@
SUBSYSTEM!="block", GOTO="lvm_end"
(LVM_EXEC_RULE)
+ENV{DM_MULTIPATH_DEVICE_PATH}=="1", GOTO="lvm_end"
ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="lvm_end"
# If the PV label got lost, inform lvmetad immediately.
--
2.6.6
++++++ LVM2.2.02.152.tgz -> LVM2.2.02.165.tgz ++++++
++++ 48750 lines of diff (skipped)
++++++ cluster_support_mirrord_log.diff ++++++
--- /var/tmp/diff_new_pack.7STwCq/_old 2016-09-17 14:32:56.000000000 +0200
+++ /var/tmp/diff_new_pack.7STwCq/_new 2016-09-17 14:32:56.000000000 +0200
@@ -9,10 +9,10 @@
tools/lvconvert.c | 9 ---
7 files changed, 109 insertions(+), 81 deletions(-)
-Index: LVM2.2.02.139/daemons/cmirrord/Makefile.in
+Index: LVM2.2.02.164/daemons/cmirrord/Makefile.in
===================================================================
---- LVM2.2.02.139.orig/daemons/cmirrord/Makefile.in
-+++ LVM2.2.02.139/daemons/cmirrord/Makefile.in
+--- LVM2.2.02.164.orig/daemons/cmirrord/Makefile.in
++++ LVM2.2.02.164/daemons/cmirrord/Makefile.in
@@ -26,7 +26,7 @@ TARGETS = cmirrord
include $(top_builddir)/make.tmpl
@@ -22,10 +22,10 @@
LMLIBS += $(CPG_LIBS) $(SACKPT_LIBS)
CFLAGS += $(CPG_CFLAGS) $(SACKPT_CFLAGS) $(EXTRA_EXEC_CFLAGS)
LDFLAGS += $(EXTRA_EXEC_LDFLAGS)
-Index: LVM2.2.02.139/daemons/cmirrord/cluster.c
+Index: LVM2.2.02.164/daemons/cmirrord/cluster.c
===================================================================
---- LVM2.2.02.139.orig/daemons/cmirrord/cluster.c
-+++ LVM2.2.02.139/daemons/cmirrord/cluster.c
+--- LVM2.2.02.164.orig/daemons/cmirrord/cluster.c
++++ LVM2.2.02.164/daemons/cmirrord/cluster.c
@@ -22,6 +22,7 @@
#include <errno.h>
#include <signal.h>
@@ -282,10 +282,10 @@
return 0;
}
-Index: LVM2.2.02.139/daemons/cmirrord/functions.c
+Index: LVM2.2.02.164/daemons/cmirrord/functions.c
===================================================================
---- LVM2.2.02.139.orig/daemons/cmirrord/functions.c
-+++ LVM2.2.02.139/daemons/cmirrord/functions.c
+--- LVM2.2.02.164.orig/daemons/cmirrord/functions.c
++++ LVM2.2.02.164/daemons/cmirrord/functions.c
@@ -19,6 +19,7 @@
#include <sys/stat.h>
#include <time.h>
@@ -347,7 +347,7 @@
return 0;
fail:
-@@ -644,7 +658,10 @@ static int clog_dtr(struct dm_ulog_reque
+@@ -650,7 +664,10 @@ static int clog_dtr(struct dm_ulog_reque
LOG_DBG("[%s] Cluster log removed", SHORT_UUID(lc->uuid));
@@ -358,7 +358,7 @@
if (lc->disk_fd != -1 && close(lc->disk_fd))
LOG_ERROR("Failed to close disk log: %s",
strerror(errno));
-@@ -716,8 +733,13 @@ int cluster_postsuspend(char *uuid, uint
+@@ -722,8 +739,13 @@ int cluster_postsuspend(char *uuid, uint
lc->resume_override = 0;
/* move log to pending list */
@@ -372,7 +372,7 @@
return 0;
}
-@@ -821,9 +843,9 @@ no_disk:
+@@ -827,9 +849,9 @@ no_disk:
if (commit_log && (lc->disk_fd >= 0)) {
rq->error = write_log(lc);
if (rq->error)
@@ -384,7 +384,7 @@
lc->touched = 0;
}
out:
-@@ -905,8 +927,13 @@ int local_resume(struct dm_ulog_request
+@@ -911,8 +933,13 @@ int local_resume(struct dm_ulog_request
}
/* move log to official list */
@@ -398,7 +398,7 @@
}
return 0;
-@@ -1929,7 +1956,6 @@ void log_debug(void)
+@@ -1935,7 +1962,6 @@ void log_debug(void)
LOG_ERROR("");
LOG_ERROR("LOG COMPONENT DEBUGGING::");
@@ -406,7 +406,7 @@
LOG_ERROR("Pending log list:");
dm_list_iterate_items(lc, &log_pending_list) {
LOG_ERROR("%s", lc->uuid);
-@@ -1939,6 +1965,7 @@ void log_debug(void)
+@@ -1945,6 +1971,7 @@ void log_debug(void)
print_bits(lc->clean_bits, 1);
}
@@ -414,10 +414,10 @@
dm_list_iterate_items(lc, &log_list) {
LOG_ERROR("%s", lc->uuid);
LOG_ERROR(" recoverer : %" PRIu32, lc->recoverer);
-Index: LVM2.2.02.139/daemons/cmirrord/local.c
+Index: LVM2.2.02.164/daemons/cmirrord/local.c
===================================================================
---- LVM2.2.02.139.orig/daemons/cmirrord/local.c
-+++ LVM2.2.02.139/daemons/cmirrord/local.c
+--- LVM2.2.02.164.orig/daemons/cmirrord/local.c
++++ LVM2.2.02.164/daemons/cmirrord/local.c
@@ -29,13 +29,13 @@
static int cn_fd = -1; /* Connector (netlink) socket fd */
@@ -441,10 +441,10 @@
memset(send_buf, 0, sizeof(send_buf));
-Index: LVM2.2.02.139/lib/metadata/mirror.c
+Index: LVM2.2.02.164/lib/metadata/mirror.c
===================================================================
---- LVM2.2.02.139.orig/lib/metadata/mirror.c
-+++ LVM2.2.02.139/lib/metadata/mirror.c
+--- LVM2.2.02.164.orig/lib/metadata/mirror.c
++++ LVM2.2.02.164/lib/metadata/mirror.c
@@ -1973,10 +1973,6 @@ int add_mirror_log(struct cmd_context *c
unsigned old_log_count;
int r = 0;
@@ -483,10 +483,10 @@
/* For corelog mirror, activation code depends on
* the global mirror_in_sync status. As we are adding
-Index: LVM2.2.02.139/lib/mirror/mirrored.c
+Index: LVM2.2.02.164/lib/mirror/mirrored.c
===================================================================
---- LVM2.2.02.139.orig/lib/mirror/mirrored.c
-+++ LVM2.2.02.139/lib/mirror/mirrored.c
+--- LVM2.2.02.164.orig/lib/mirror/mirrored.c
++++ LVM2.2.02.164/lib/mirror/mirrored.c
@@ -293,12 +293,15 @@ static int _add_log(struct dm_pool *mem,
return 0;
}
@@ -504,23 +504,23 @@
log_flags |= DM_CORELOG;
}
-Index: LVM2.2.02.139/tools/lvconvert.c
+Index: LVM2.2.02.164/tools/lvconvert.c
===================================================================
---- LVM2.2.02.139.orig/tools/lvconvert.c
-+++ LVM2.2.02.139/tools/lvconvert.c
-@@ -1222,15 +1222,6 @@ static int _lvconvert_mirrors_parse_para
- *new_log_count = arg_int_value(cmd, mirrorlog_ARG,
- arg_is_set(cmd, corelog_ARG) ?
MIRROR_LOG_CORE : DEFAULT_MIRRORLOG);
+--- LVM2.2.02.164.orig/tools/lvconvert.c
++++ LVM2.2.02.164/tools/lvconvert.c
+@@ -1309,15 +1309,6 @@ static int _lvconvert_mirrors_parse_para
+
+ *new_log_count = arg_int_value(cmd, mirrorlog_ARG, lp->corelog ?
MIRROR_LOG_CORE : DEFAULT_MIRRORLOG);
- /*
- * No mirrored logs for cluster mirrors until
- * log daemon is multi-threaded.
- */
- if ((*new_log_count == MIRROR_LOG_MIRRORED) && vg_is_clustered(lv->vg))
{
-- log_error("Log type, \"mirrored\", is unavailable to cluster
mirrors");
+- log_error("Log type, \"mirrored\", is unavailable to cluster
mirrors.");
- return 0;
- }
-
- log_verbose("Setting logging type to %s",
get_mirror_log_name(*new_log_count));
+ log_verbose("Setting logging type to %s.",
get_mirror_log_name(*new_log_count));
/*
++++++ clvmd.ocf ++++++
--- /var/tmp/diff_new_pack.7STwCq/_old 2016-09-17 14:32:56.000000000 +0200
+++ /var/tmp/diff_new_pack.7STwCq/_new 2016-09-17 14:32:56.000000000 +0200
@@ -31,9 +31,12 @@
: ${OCF_RESKEY_daemon_timeout:="80"}
: ${OCF_RESKEY_daemon_options:="-d0"}
+sbindir=$HA_SBIN_DIR
+
# Common variables
-DAEMON="/usr/sbin/clvmd"
-CMIRRORD="/usr/sbin/cmirrord"
+DAEMON="${sbindir}/clvmd"
+CMIRRORD="${sbindir}/cmirrord"
+LVMCONF="${sbindir}/lvmconf"
status_daemons()
{
@@ -100,7 +103,7 @@
return $OCF_ERR_INSTALLED
fi
- start_daemon "$CMIRRORD" "$OCF_RESKEY_daemon_options"; rc=$?
+ start_daemon "$CMIRRORD"; rc=$?
if [ $rc != 0 ]; then
ocf_log err "Could not start $CMIRRORD"
return $OCF_ERR_GENERIC
@@ -198,6 +201,11 @@
clvmd_validate
ocf_log info "Starting $OCF_RESOURCE_INSTANCE"
+ # autoset locking type to clusted when lvmconf tool is available
+ if [ -x "$LVMCONF" ]; then
+ $LVMCONF --enable-cluster > /dev/null 2>&1
+ fi
+
status_clvmd; rc=$?
if [ $rc == $OCF_NOT_RUNNING ]; then
bringup_clvmd; rc=$?
@@ -294,7 +302,7 @@
Options to clvmd. Refer to clvmd.8 for detailed descriptions.
</longdesc>
<shortdesc lang="en">Daemon Options</shortdesc>
- <content type="string" default="-d2"/>
+ <content type="string" default="-d0"/>
</parameter>
++++++ cmirrord.ocf ++++++
--- /var/tmp/diff_new_pack.7STwCq/_old 2016-09-17 14:32:56.000000000 +0200
+++ /var/tmp/diff_new_pack.7STwCq/_new 2016-09-17 14:32:56.000000000 +0200
@@ -29,10 +29,11 @@
# Parameter defaults
: ${OCF_RESKEY_CRM_meta_globally_unique:="false"}
: ${OCF_RESKEY_daemon_timeout:="80"}
-: ${OCF_RESKEY_daemon_options:="-d0"}
+
+sbindir=$HA_SBIN_DIR
# Common variables
-DAEMON="/usr/sbin/cmirrord"
+DAEMON="${sbindir}/cmirrord"
status_daemon()
{
@@ -50,7 +51,7 @@
return $OCF_ERR_INSTALLED
fi
- start_daemon "$DAEMON" "$OCF_RESKEY_daemon_options"; rc=$?
+ start_daemon "$DAEMON"; rc=$?
if [ $rc != 0 ]; then
ocf_log err "Could not start $DAEMON"
return $OCF_ERR_GENERIC
++++++ device-mapper-link.patch ++++++
--- /var/tmp/diff_new_pack.7STwCq/_old 2016-09-17 14:32:56.000000000 +0200
+++ /var/tmp/diff_new_pack.7STwCq/_new 2016-09-17 14:32:56.000000000 +0200
@@ -1,17 +1,22 @@
-Make sure
+From 90d6f1d65de4c314af1aab1e0deddcb0d64bbd06 Mon Sep 17 00:00:00 2001
+From: Neil Brown <ne...@suse.de>
+Date: Fri, 19 Aug 2016 16:13:09 +0200
+Subject: [PATCH] Always create /dev/device-mapper link
+
+Make sure
/dev/device-mapper
exists as a link to /dev/mapper/control
Resolves: bnc#724578
Signed-off-by: NeilBrown <ne...@suse.de>
---
- udev/10-dm.rules.in | 2 +-
+ udev/10-dm.rules.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: LVM2.2.02.152/udev/10-dm.rules.in
+Index: LVM2.2.02.165/udev/10-dm.rules.in
===================================================================
---- LVM2.2.02.152.orig/udev/10-dm.rules.in
-+++ LVM2.2.02.152/udev/10-dm.rules.in
+--- LVM2.2.02.165.orig/udev/10-dm.rules.in
++++ LVM2.2.02.165/udev/10-dm.rules.in
@@ -28,7 +28,7 @@
# Also, keep in mind that recent rules may also require recent
# subsystem-specific binaries.
++++++ device-mapper-type_punning.diff ++++++
--- /var/tmp/diff_new_pack.7STwCq/_old 2016-09-17 14:32:56.000000000 +0200
+++ /var/tmp/diff_new_pack.7STwCq/_new 2016-09-17 14:32:56.000000000 +0200
@@ -1,3 +1,6 @@
+From: Hannes Reinecke <h...@suse.com>
+Subject: Use type-punning for device-mapper type
+
---
lib/device/device.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
++++++ lvm.conf ++++++
++++ 624 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/lvm2/lvm.conf
++++ and /work/SRC/openSUSE:Factory/.lvm2.new/lvm.conf
++++++ make-mirror-legs-on-different-tag-pvs.patch ++++++
--- /var/tmp/diff_new_pack.7STwCq/_old 2016-09-17 14:32:56.000000000 +0200
+++ /var/tmp/diff_new_pack.7STwCq/_new 2016-09-17 14:32:56.000000000 +0200
@@ -25,11 +25,11 @@
man/lvcreate.8.in | 4 ++++
5 files changed, 60 insertions(+)
-Index: LVM2.2.02.139/conf/example.conf.in
+Index: LVM2.2.02.165/conf/example.conf.in
===================================================================
---- LVM2.2.02.139.orig/conf/example.conf.in
-+++ LVM2.2.02.139/conf/example.conf.in
-@@ -359,6 +359,23 @@ allocation {
+--- LVM2.2.02.165.orig/conf/example.conf.in
++++ LVM2.2.02.165/conf/example.conf.in
+@@ -372,6 +372,23 @@ allocation {
# or erased unless the --wipesignatures option is used directly.
wipe_signatures_when_zeroing_new_lvs = 1
@@ -53,13 +53,13 @@
# Configuration option allocation/mirror_logs_require_separate_pvs.
# Mirror logs and images will always use different PVs.
# The default setting changed in version 2.02.85.
-Index: LVM2.2.02.139/lib/config/config_settings.h
+Index: LVM2.2.02.165/lib/config/config_settings.h
===================================================================
---- LVM2.2.02.139.orig/lib/config/config_settings.h
-+++ LVM2.2.02.139/lib/config/config_settings.h
-@@ -449,6 +449,9 @@ cfg(allocation_mirror_logs_require_separ
- "Mirror logs and images will always use different PVs.\n"
- "The default setting changed in version 2.02.85.\n")
+--- LVM2.2.02.165.orig/lib/config/config_settings.h
++++ LVM2.2.02.165/lib/config/config_settings.h
+@@ -473,6 +473,9 @@ cfg(allocation_raid_stripe_all_devices_C
+ "when the command does not specify the number of stripes to use.\n"
+ "This was the default behaviour until release 2.02.162.\n")
+cfg(allocation_mirror_legs_require_separate_pvs_CFG,
"mirror_legs_require_separate_pvs", allocation_CFG_SECTION, 0, CFG_TYPE_BOOL,
DEFAULT_MIRROR_LEGS_REQUIRE_SEPARATE_PVS, vsn(2, 2, 98), NULL, 0, NULL,
+ "Mirror legs will always use different PVs.\n")
@@ -67,11 +67,11 @@
cfg(allocation_cache_pool_metadata_require_separate_pvs_CFG,
"cache_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, 0,
CFG_TYPE_BOOL, DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2,
106), NULL, 0, NULL,
"Cache pool metadata and data will always use different PVs.\n")
-Index: LVM2.2.02.139/lib/config/defaults.h
+Index: LVM2.2.02.165/lib/config/defaults.h
===================================================================
---- LVM2.2.02.139.orig/lib/config/defaults.h
-+++ LVM2.2.02.139/lib/config/defaults.h
-@@ -144,6 +144,7 @@
+--- LVM2.2.02.165.orig/lib/config/defaults.h
++++ LVM2.2.02.165/lib/config/defaults.h
+@@ -158,6 +158,7 @@
#define DEFAULT_MAX_LV 0
#define DEFAULT_ALLOC_POLICY ALLOC_NORMAL
#define DEFAULT_MIRROR_LOGS_REQUIRE_SEPARATE_PVS 0
@@ -79,11 +79,11 @@
#define DEFAULT_MAXIMISE_CLING 1
#define DEFAULT_CLUSTERED 0
-Index: LVM2.2.02.139/lib/metadata/lv_manip.c
+Index: LVM2.2.02.165/lib/metadata/lv_manip.c
===================================================================
---- LVM2.2.02.139.orig/lib/metadata/lv_manip.c
-+++ LVM2.2.02.139/lib/metadata/lv_manip.c
-@@ -1550,6 +1550,9 @@ struct alloc_handle {
+--- LVM2.2.02.165.orig/lib/metadata/lv_manip.c
++++ LVM2.2.02.165/lib/metadata/lv_manip.c
+@@ -1519,6 +1519,9 @@ struct alloc_handle {
unsigned maximise_cling;
unsigned mirror_logs_separate; /* Force mirror logs on separate PVs? */
@@ -93,7 +93,7 @@
/*
* RAID devices require a metadata area that accompanies each
-@@ -2608,6 +2611,32 @@ static int _limit_to_one_area_per_tag(st
+@@ -2633,6 +2636,32 @@ static int _limit_to_one_area_per_tag(st
}
/*
@@ -117,7 +117,7 @@
+ for (i = ix_start; i < ix_end; i++)
+ if(_pvs_have_matching_tag(ah->cling_tag_list_cn,
+ alloc_state->areas[i].pva->map->pv,
-+ pva->map->pv))
++ pva->map->pv, 0))
+ return i;
+ return -1;
+}
@@ -126,7 +126,7 @@
* Returns 1 regardless of whether any space was found, except on error.
*/
static int _find_some_parallel_space(struct alloc_handle *ah,
-@@ -2737,6 +2766,10 @@ static int _find_some_parallel_space(str
+@@ -2762,6 +2791,10 @@ static int _find_some_parallel_space(str
continue;
case USE_AREA:
@@ -137,7 +137,7 @@
/*
* Except with ALLOC_ANYWHERE, replace
first area with this
* one which is smaller but still big
enough.
-@@ -3220,6 +3253,7 @@ static struct alloc_handle *_alloc_init(
+@@ -3243,6 +3276,7 @@ static struct alloc_handle *_alloc_init(
ah->parity_count = parity_count;
ah->region_size = region_size;
ah->alloc = alloc;
@@ -145,7 +145,7 @@
/*
* For the purposes of allocation, area_count and parity_count are
-@@ -3231,6 +3265,7 @@ static struct alloc_handle *_alloc_init(
+@@ -3254,6 +3288,7 @@ static struct alloc_handle *_alloc_init(
ah->area_multiple = _calc_area_multiple(segtype, area_count +
parity_count, stripes);
//FIXME: s/mirror_logs_separate/metadata_separate/ so it can be used by
others?
ah->mirror_logs_separate = find_config_tree_bool(cmd,
allocation_mirror_logs_require_separate_pvs_CFG, NULL);
@@ -153,11 +153,11 @@
if (mirrors || stripes)
total_extents = new_extents;
-Index: LVM2.2.02.139/man/lvcreate.8.in
+Index: LVM2.2.02.165/man/lvcreate.8.in
===================================================================
---- LVM2.2.02.139.orig/man/lvcreate.8.in
-+++ LVM2.2.02.139/man/lvcreate.8.in
-@@ -404,6 +404,10 @@ Using \fBcore\fP means the mirror is reg
+--- LVM2.2.02.165.orig/man/lvcreate.8.in
++++ LVM2.2.02.165/man/lvcreate.8.in
+@@ -418,6 +418,10 @@ Using \fBcore\fP means the mirror is reg
from the first device each time the logical volume is activated,
like after every reboot.
.br
++++++ pvcreate-enhance-the-error-message.patch ++++++
>From b8b35c35a17b95e83817f262d70cb7a7d45cb192 Mon Sep 17 00:00:00 2001
From: Liuhua Wang <lw...@suse.com>
Date: Mon, 29 Feb 2016 20:08:00 +0800
Subject: [PATCH] pvcreate enhance the error message
Signed-off-by: Liuhua Wang(lw...@suse.com)
References: bsc#960744
---
lib/metadata/metadata.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index 19741ba..9f098ca 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -1483,7 +1483,8 @@ static int _pvcreate_check(struct cmd_context *cmd, const
char *name,
filter_refresh_needed = scan_needed = 1;
if (!dev) {
- log_error("Device %s not found (or ignored by filtering).",
name);
+ log_error("Device %s not found (or ignored by filtering). "
+ "Please run with -vvv option for more details", name);
goto out;
}
--
1.8.4.5
++++++ pvmove_support_clustered_vg.diff ++++++
--- /var/tmp/diff_new_pack.7STwCq/_old 2016-09-17 14:32:56.000000000 +0200
+++ /var/tmp/diff_new_pack.7STwCq/_new 2016-09-17 14:32:56.000000000 +0200
@@ -2,9 +2,11 @@
lib/activate/activate.c | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
---- LVM2.2.02.98.orig/lib/activate/activate.c
-+++ LVM2.2.02.98/lib/activate/activate.c
-@@ -569,6 +569,26 @@ int module_present(struct cmd_context *c
+Index: LVM2.2.02.155/lib/activate/activate.c
+===================================================================
+--- LVM2.2.02.155.orig/lib/activate/activate.c
++++ LVM2.2.02.155/lib/activate/activate.c
+@@ -621,6 +621,26 @@ int module_present(struct cmd_context *c
return ret;
}
@@ -28,13 +30,13 @@
+ return ret;
+}
+
- int target_present(struct cmd_context *cmd, const char *target_name,
- int use_modprobe)
- {
-@@ -577,6 +597,16 @@ int target_present(struct cmd_context *c
- if (!activation())
+ int target_present_version(struct cmd_context *cmd, const char *target_name,
+ int use_modprobe,
+ uint32_t *maj, uint32_t *min, uint32_t *patchlevel)
+@@ -629,6 +649,15 @@ int target_present_version(struct cmd_co
+ log_error(INTERNAL_ERROR "Target present version called when
activation is disabled.");
return 0;
-
+ }
+ if (!strncmp(target_name, "log-userspace", 13)) {
+ /*
+ When the target_name is log-userspace, it also means
@@ -44,7 +46,6 @@
+ log_error("cmirrord is required, but not running now.");
+ return_0;
+ }
-+
#ifdef MODPROBE_CMD
if (use_modprobe) {
- if (target_version(target_name, &maj, &min, &patchlevel))
+ if (target_version(target_name, maj, min, patchlevel))
++++++ udev_rules-update.diff ++++++
--- /var/tmp/diff_new_pack.7STwCq/_old 2016-09-17 14:32:56.000000000 +0200
+++ /var/tmp/diff_new_pack.7STwCq/_new 2016-09-17 14:32:56.000000000 +0200
@@ -1,8 +1,19 @@
-Index: LVM2.2.02.110/udev/10-dm.rules.in
-===================================================================
---- LVM2.2.02.110.orig/udev/10-dm.rules.in
-+++ LVM2.2.02.110/udev/10-dm.rules.in
-@@ -101,6 +101,10 @@ TEST=="dm", ENV{DM_NAME}="$attr{dm/name}
+From a2fb79f7316871fb834b1181633292b3ac8dc46c Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke <h...@suse.de>
+Date: Fri, 19 Aug 2016 16:13:48 +0200
+Subject: [PATCH] update lvm udev rules
+
+References: bnc#78902 bnc#789019 bnc#789020
+---
+ udev/10-dm.rules.in | 4 ++++
+ udev/13-dm-disk.rules.in | 9 ++++++---
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/udev/10-dm.rules.in b/udev/10-dm.rules.in
+index 46a6869..7da0cc4 100644
+--- a/udev/10-dm.rules.in
++++ b/udev/10-dm.rules.in
+@@ -101,6 +101,10 @@ TEST=="dm", ENV{DM_NAME}="$attr{dm/name}",
ENV{DM_UUID}="$attr{dm/uuid}", ENV{DM
TEST!="dm", IMPORT{program}="(DM_EXEC)/dmsetup info -j %M -m %m -c
--nameprefixes --noheadings --rows -o name,uuid,suspended"
ENV{DM_SUSPENDED}!="?*", IMPORT{program}="(DM_EXEC)/dmsetup info -j %M -m %m
-c --nameprefixes --noheadings --rows -o suspended"
@@ -13,10 +24,10 @@
# dmsetup tool provides suspended state information in textual
# form with values "Suspended"/"Active". We translate it to
# 0/1 respectively to be consistent with sysfs values.
-Index: LVM2.2.02.110/udev/13-dm-disk.rules.in
-===================================================================
---- LVM2.2.02.110.orig/udev/13-dm-disk.rules.in
-+++ LVM2.2.02.110/udev/13-dm-disk.rules.in
+diff --git a/udev/13-dm-disk.rules.in b/udev/13-dm-disk.rules.in
+index 4b64dd6..dca9c5c 100644
+--- a/udev/13-dm-disk.rules.in
++++ b/udev/13-dm-disk.rules.in
@@ -14,14 +14,17 @@ ACTION!="add|change", GOTO="dm_end"
ENV{DM_UDEV_RULES_VSN}!="?*", GOTO="dm_end"
ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}=="1", GOTO="dm_end"
@@ -38,3 +49,6 @@
ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*",
SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*",
SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
+--
+2.6.6
+
