pool/lvm2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 263930 from Base:System

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/263930
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lvm2?expand=0&rev=77
This commit is contained in:
Dominique Leuenberger 2014-12-05 20:07:30 +00:00 committed by Git OBS Bridge
commit 6792989e0f
10 changed files with 93 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
LVM2.2.02.111.tgz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6d8f3e72fe07f614315d8e0c2d9f93c5fc7a4360d14e4f9b805750e21593dd24
size 1487810

7
LVM2.2.02.111.tgz.asc
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iEYEABECAAYFAlQDxEEACgkQIoGRwVZ+LBdgbACfRZSdijneiht0fIZCLz3BhpGn
BXIAoIshSUrdKDUuNd94SIeAtZVbmVpi
=w0Qo
-----END PGP SIGNATURE-----

3
LVM2.2.02.114.tgz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:de9cb0acfb9c5a6afa6184160c9e066f19043677f91a72c741d153efcd2874a5
size 1524844

7
LVM2.2.02.114.tgz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iEYEABECAAYFAlR5ALcACgkQIoGRwVZ+LBfcYACfcsCo+Im/tR2gbHDpSA5Qg9Vo
iqIAoOjwTzT8Mcwgz7cpUdl7iLhoaola
=BmR+
-----END PGP SIGNATURE-----

10
cluster_support_mirrord_log.diff
View File

@ -453,7 +453,7 @@ Subject: Parallelize dispatching
- if (vg_is_clustered(lv->vg)) {
- /* FIXME: move this test out of this function */
- /* Skip test for pvmove mirrors, it can use local mirror */
- if (!(lv->status & (PVMOVE | LOCKED)) &&
- if (!lv_is_pvmove(lv) && !lv_is_locked(lv) &&
- lv_is_active(lv) &&
- !lv_is_active_exclusive_locally(lv) && /* lv_is_active_remotely */
- !_cluster_mirror_is_available(lv)) {
@ -495,18 +495,18 @@ Subject: Parallelize dispatching
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -1364,15 +1364,6 @@ static int _lvconvert_mirrors_parse_para
return 0;
}
*new_log_count = arg_int_value(cmd, mirrorlog_ARG,
arg_is_set(cmd, corelog_ARG) ? MIRROR_LOG_CORE : DEFAULT_MIRRORLOG);
- /*
- * No mirrored logs for cluster mirrors until
- * log daemon is multi-threaded.
- */
- if ((*new_log_count == 2) && vg_is_clustered(lv->vg)) {
- if ((*new_log_count == MIRROR_LOG_MIRRORED) && vg_is_clustered(lv->vg)) {
- log_error("Log type, \"mirrored\", is unavailable to cluster mirrors");
- return 0;
- }
-
log_verbose("Setting logging type to %s", mirrorlog);
log_verbose("Setting logging type to %s", get_mirror_log_name(*new_log_count));
/*

39
cmirrord-fix-s390-endian-issue.patch
View File

@ -1,39 +0,0 @@
Index: LVM2.2.02.98/daemons/cmirrord/compat.c
===================================================================
--- LVM2.2.02.98.orig/daemons/cmirrord/compat.c
+++ LVM2.2.02.98/daemons/cmirrord/compat.c
@@ -126,13 +126,13 @@ static int v5_endian_to_network(struct c
u_rq->error = xlate32(u_rq->error);
u_rq->seq = xlate32(u_rq->seq);
- u_rq->request_type = xlate32(u_rq->request_type);
- u_rq->data_size = xlate64(u_rq->data_size);
-
rq->originator = xlate32(rq->originator);
v5_data_endian_switch(rq, 1);
+ u_rq->request_type = xlate32(u_rq->request_type);
+ u_rq->data_size = xlate32(u_rq->data_size);
+
return size;
}
@@ -167,7 +167,7 @@ static int v5_endian_from_network(struct
u_rq->error = xlate32(u_rq->error);
u_rq->seq = xlate32(u_rq->seq);
u_rq->request_type = xlate32(u_rq->request_type);
- u_rq->data_size = xlate64(u_rq->data_size);
+ u_rq->data_size = xlate32(u_rq->data_size);
rq->originator = xlate32(rq->originator);
@@ -187,7 +187,7 @@ int clog_request_from_network(void *data
switch (version) {
case 5: /* Upstream */
- if (version == unconverted_version)
+ if (version == vp[0])
return 0;
break;
case 4: /* RHEL 5.[45] */

8
lvm2.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Dec 3 03:23:47 UTC 2014 - jeffm@suse.com
- Update to 2.02.114
- Removed cmirrord-fix-s390-endian-issue.patch
- Renumbered patches to allow for upstream patches to be applied
before local ones.
-------------------------------------------------------------------
Wed Nov 19 22:40:13 UTC 2014 - dimstar@opensuse.org

105
lvm2.spec
View File

@ -16,8 +16,8 @@
#
%define lvm2_version 2.02.111
%define device_mapper_version 1.02.90
%define lvm2_version 2.02.114
%define device_mapper_version 1.02.92
%define thin_provisioning_version 0.4.1
Url: http://www.sourceware.org/lvm2/
@ -49,53 +49,54 @@ Source14: baselibs.conf
Source16: csm-converter.tar.gz
Source50: thin-provisioning-tools-v%{thin_provisioning_version}.tar.gz
Patch1: improve_probing.diff
Patch2: no-inc-audit.diff
Patch3: no_buildroot_shared.diff
Patch4: sys_mount_instead_linux_fs.diff
# Upstream patches first
# (currently none)
# SUSE patches 1000- for LVM, 2000- for device mapper
Patch1001: improve_probing.diff
Patch1002: no-inc-audit.diff
Patch1003: no_buildroot_shared.diff
Patch1004: sys_mount_instead_linux_fs.diff
#suse
Patch5: display-dm-name-for-lv-name.diff
Patch6: device-mapper-type_punning.diff
Patch1005: display-dm-name-for-lv-name.diff
Patch1006: device-mapper-type_punning.diff
#fate312248, patch6,7
Patch7: make-mirror-legs-on-different-tag-pvs.patch
Patch8: improve-mirror-legs-on-different-tag-pvs.patch
Patch1007: make-mirror-legs-on-different-tag-pvs.patch
Patch1008: improve-mirror-legs-on-different-tag-pvs.patch
#fate#315092
Patch9: cmirrord_improvment_performance.patch
Patch1009: cmirrord_improvment_performance.patch
#fate#314367, patch10,11
Patch10: cluster_support_mirrord_log.diff
Patch11: lvconvert-cluster-mirrored-disk-failed.patch
Patch1010: cluster_support_mirrord_log.diff
Patch1011: lvconvert-cluster-mirrored-disk-failed.patch
#forward-port from sle11
Patch12: suppress_format1_size_warning.diff
Patch13: pvmove_support_clustered_vg.diff
Patch1012: suppress_format1_size_warning.diff
Patch1013: pvmove_support_clustered_vg.diff
# Never upstream
Patch14: cmirrord_remove_date_time_from_compilation.patch
Patch1014: cmirrord_remove_date_time_from_compilation.patch
#suse, bnc873538
Patch15: fix-closedown-before-thread-finish.patch
Patch1015: fix-closedown-before-thread-finish.patch
#suse, bnc#870824
Patch16: use-mirrortype-asdefault-whenclvmdrunning.patch
Patch1016: use-mirrortype-asdefault-whenclvmdrunning.patch
Patch17: version-plugins-in-libdir
#suse, bnc#890452,bnc#893684
Patch18: cmirrord-fix-s390-endian-issue.patch
Patch1017: version-plugins-in-libdir
# device-mapper patches
#suse, bnc#707253(also merged patch for bnc#479104)
Patch200: device-mapper-dmsetup-export.patch
Patch201: device-mapper-gcc-warnings.patch
Patch202: device-mapper-static.patch
Patch203: device-mapper-link
Patch2000: device-mapper-dmsetup-export.patch
Patch2001: device-mapper-gcc-warnings.patch
Patch2002: device-mapper-static.patch
Patch2003: device-mapper-link
#suse, bnc#78902,bnc#789019,bnc#789020
Patch204: udev_rules-update.diff
Patch2004: udev_rules-update.diff
#suse, bnc#875233
Patch205: udev-Check-for-DM_NR_VALID_PATHS.patch
Patch2005: udev-Check-for-DM_NR_VALID_PATHS.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Not a real replacement but we drop evms
@ -120,31 +121,30 @@ Volume Manager.
%prep
%setup -q -n LVM2.%{version} -a 50 -a 16
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch1001 -p1
%patch1002 -p1
%patch1003 -p1
%patch1004 -p1
%patch1005 -p1
%patch1006 -p1
%patch1007 -p1
%patch1008 -p1
%patch1009 -p1
%patch1010 -p1
%patch1011 -p1
%patch1012 -p1
%patch1013 -p1
%patch1014 -p1
%patch1015 -p1
%patch1016 -p1
%patch1017 -p1
%patch200 -p1
%patch201 -p1
%patch202 -p1
%patch203 -p1
%patch204 -p1
%patch205 -p1
%patch2000 -p1
%patch2001 -p1
%patch2002 -p1
%patch2003 -p1
%patch2004 -p1
%patch2005 -p1
%build
#set path so that thin_check can be found
@ -386,6 +386,7 @@ popd
%{_mandir}/man8/pvresize.8.gz
%{_mandir}/man8/pvs.8.gz
%{_mandir}/man8/pvscan.8.gz
%{_mandir}/man7/lvmcache.7.gz
%{_mandir}/man8/vgcfgbackup.8.gz
%{_mandir}/man8/vgcfgrestore.8.gz
%{_mandir}/man8/vgchange.8.gz

14
make-mirror-legs-on-different-tag-pvs.patch
View File

@ -59,8 +59,8 @@ Signed-off-by: Guangliang Zhao <gzhao@suse.com>
cfg(allocation_mirror_logs_require_separate_pvs_CFG, "mirror_logs_require_separate_pvs", allocation_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_MIRROR_LOGS_REQUIRE_SEPARATE_PVS, vsn(2, 2, 85), NULL)
+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)
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)
cfg(allocation_cache_pool_cachemode_CFG, "cache_pool_cachemode", allocation_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_CACHE_POOL_CACHEMODE, vsn(2, 2, 113), NULL)
cfg_runtime(allocation_cache_pool_chunk_size_CFG, "cache_pool_chunk_size", allocation_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_INT, vsn(2, 2, 106), NULL)
cfg(allocation_thin_pool_metadata_require_separate_pvs_CFG, "thin_pool_metadata_require_separate_pvs", allocation_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_THIN_POOL_METADATA_REQUIRE_SEPARATE_PVS, vsn(2, 2, 89), NULL)
--- a/lib/config/defaults.h
+++ b/lib/config/defaults.h
@@ -125,6 +125,7 @@
@ -147,13 +147,13 @@ Signed-off-by: Guangliang Zhao <gzhao@suse.com>
--- a/man/lvcreate.8.in
+++ b/man/lvcreate.8.in
@@ -284,6 +284,10 @@ will create a persistent log that is its
When the legacy "mirror" segment type is used, the optional argument
\fB\-\-corelog\fP is equivalent to \fB\-\-mirrorlog\fP \fIcore\fP.
+
Using \fIcore\fP means the mirror is regenerated by copying the data
from the first device each time the logical volume is activated,
like after every reboot.
+.br
+Every leg of the mirrored logical volume could be placed on the pvs with
+same tag, see details(mirror_legs_require_separate_pvs) in lvm.conf.
+
.br
Using \fImirrored\fP will create a persistent log that is itself mirrored.
.TP
.BR \-\-metadataprofile " " \fIProfileName
Uses and attaches the ProfileName configuration profile to the logical

30
use-mirrortype-asdefault-whenclvmdrunning.patch
View File

@ -30,25 +30,15 @@
+ return (lock.l_type == F_UNLCK) ? 0 : 1;
+}
+
static int _lvcreate_params(struct lvcreate_params *lp,
struct lvcreate_cmdline_params *lcp,
struct cmd_context *cmd,
@@ -860,14 +882,16 @@ static int _lvcreate_params(struct lvcre
/* Set default segtype - remember, '-m 0' implies stripe. */
if (arg_count(cmd, mirrors_ARG) &&
- arg_uint_value(cmd, mirrors_ARG, 0))
+ arg_uint_value(cmd, mirrors_ARG, 0)) {
if (arg_uint_value(cmd, arg_count(cmd, stripes_long_ARG) ?
stripes_long_ARG : stripes_ARG, 1) > 1) {
segtype_str = find_config_tree_str(cmd, global_raid10_segtype_default_CFG, NULL);;
} else {
segtype_str = find_config_tree_str(cmd, global_mirror_segtype_default_CFG, NULL);
}
- else if (arg_count(cmd, thin_ARG) || arg_count(cmd, thinpool_ARG))
static int _lvcreate_params(struct cmd_context *cmd,
int argc, char **argv,
struct lvcreate_params *lp,
@@ -860,6 +882,8 @@ static int _lvcreate_params(struct lvcre
mirror_default_cfg = (arg_uint_value(cmd, stripes_ARG, 1) > 1)
? global_raid10_segtype_default_CFG : global_mirror_segtype_default_CFG;
segtype_str = find_config_tree_str(cmd, mirror_default_cfg, NULL);
+ if(clvmd_daemon_is_running())
+ segtype_str = "mirror";
+ } else if (arg_count(cmd, thin_ARG) || arg_count(cmd, thinpool_ARG))
segtype_str = "thin";
else if (arg_count(cmd, cache_ARG) || arg_count(cmd, cachepool_ARG))
segtype_str = "cache";
} else
segtype_str = "striped";