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

Accepting request 424412 from home:scarabeus_iv:branches:Base:System

Browse Source 
- 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 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 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

OBS-URL: https://build.opensuse.org/request/show/424412
OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=156
This commit is contained in:
Marcus Meissner 2016-09-07 06:55:17 +00:00 committed by Git OBS Bridge
parent 5768ee5ddf
commit 5d063b296c
12 changed files with 93 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
LVM2.2.02.160.tgz
View File

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

7
LVM2.2.02.160.tgz.asc
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iEYEABECAAYFAld9KnQACgkQIoGRwVZ+LBcr5ACeJuqICKIQB2fhfBXI6+nehtx7
PkcAoME7FVFpC/MdOzKklBHlncQoE7eV
=GIsb
-----END PGP SIGNATURE-----

3
LVM2.2.02.164.tgz Normal file
View File

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

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

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iEYEABECAAYFAlextAMACgkQIoGRwVZ+LBe1ogCg42bB5ZlNV+h1BIO8vXYcEdtk
/8gAoI+N8gCE0MM7Z1fgg7f6iSRnbAnJ
=dl73
-----END PGP SIGNATURE-----

48
cluster_support_mirrord_log.diff
View File

@ -9,10 +9,10 @@ Subject: Parallelize dispatching
tools/lvconvert.c | 9 --- tools/lvconvert.c | 9 ---
7 files changed, 109 insertions(+), 81 deletions(-) 7 files changed, 109 insertions(+), 81 deletions(-)
Index: LVM2.2.02.160/daemons/cmirrord/Makefile.in Index: LVM2.2.02.164/daemons/cmirrord/Makefile.in
=================================================================== ===================================================================
--- LVM2.2.02.160.orig/daemons/cmirrord/Makefile.in --- LVM2.2.02.164.orig/daemons/cmirrord/Makefile.in
+++ LVM2.2.02.160/daemons/cmirrord/Makefile.in +++ LVM2.2.02.164/daemons/cmirrord/Makefile.in
@@ -26,7 +26,7 @@ TARGETS = cmirrord @@ -26,7 +26,7 @@ TARGETS = cmirrord
include $(top_builddir)/make.tmpl include $(top_builddir)/make.tmpl
@ -22,10 +22,10 @@ Index: LVM2.2.02.160/daemons/cmirrord/Makefile.in
LMLIBS += $(CPG_LIBS) $(SACKPT_LIBS) LMLIBS += $(CPG_LIBS) $(SACKPT_LIBS)
CFLAGS += $(CPG_CFLAGS) $(SACKPT_CFLAGS) $(EXTRA_EXEC_CFLAGS) CFLAGS += $(CPG_CFLAGS) $(SACKPT_CFLAGS) $(EXTRA_EXEC_CFLAGS)
LDFLAGS += $(EXTRA_EXEC_LDFLAGS) LDFLAGS += $(EXTRA_EXEC_LDFLAGS)
Index: LVM2.2.02.160/daemons/cmirrord/cluster.c Index: LVM2.2.02.164/daemons/cmirrord/cluster.c
=================================================================== ===================================================================
--- LVM2.2.02.160.orig/daemons/cmirrord/cluster.c --- LVM2.2.02.164.orig/daemons/cmirrord/cluster.c
+++ LVM2.2.02.160/daemons/cmirrord/cluster.c +++ LVM2.2.02.164/daemons/cmirrord/cluster.c
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>
@ -282,10 +282,10 @@ Index: LVM2.2.02.160/daemons/cmirrord/cluster.c
return 0; return 0;
} }
Index: LVM2.2.02.160/daemons/cmirrord/functions.c Index: LVM2.2.02.164/daemons/cmirrord/functions.c
=================================================================== ===================================================================
--- LVM2.2.02.160.orig/daemons/cmirrord/functions.c --- LVM2.2.02.164.orig/daemons/cmirrord/functions.c
+++ LVM2.2.02.160/daemons/cmirrord/functions.c +++ LVM2.2.02.164/daemons/cmirrord/functions.c
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <time.h> #include <time.h>
@ -414,10 +414,10 @@ Index: LVM2.2.02.160/daemons/cmirrord/functions.c
dm_list_iterate_items(lc, &log_list) { dm_list_iterate_items(lc, &log_list) {
LOG_ERROR("%s", lc->uuid); LOG_ERROR("%s", lc->uuid);
LOG_ERROR(" recoverer : %" PRIu32, lc->recoverer); LOG_ERROR(" recoverer : %" PRIu32, lc->recoverer);
Index: LVM2.2.02.160/daemons/cmirrord/local.c Index: LVM2.2.02.164/daemons/cmirrord/local.c
=================================================================== ===================================================================
--- LVM2.2.02.160.orig/daemons/cmirrord/local.c --- LVM2.2.02.164.orig/daemons/cmirrord/local.c
+++ LVM2.2.02.160/daemons/cmirrord/local.c +++ LVM2.2.02.164/daemons/cmirrord/local.c
@@ -29,13 +29,13 @@ @@ -29,13 +29,13 @@
static int cn_fd = -1; /* Connector (netlink) socket fd */ static int cn_fd = -1; /* Connector (netlink) socket fd */
@ -441,10 +441,10 @@ Index: LVM2.2.02.160/daemons/cmirrord/local.c
memset(send_buf, 0, sizeof(send_buf)); memset(send_buf, 0, sizeof(send_buf));
Index: LVM2.2.02.160/lib/metadata/mirror.c Index: LVM2.2.02.164/lib/metadata/mirror.c
=================================================================== ===================================================================
--- LVM2.2.02.160.orig/lib/metadata/mirror.c --- LVM2.2.02.164.orig/lib/metadata/mirror.c
+++ LVM2.2.02.160/lib/metadata/mirror.c +++ LVM2.2.02.164/lib/metadata/mirror.c
@@ -1973,10 +1973,6 @@ int add_mirror_log(struct cmd_context *c @@ -1973,10 +1973,6 @@ int add_mirror_log(struct cmd_context *c
unsigned old_log_count; unsigned old_log_count;
int r = 0; int r = 0;
@ -483,10 +483,10 @@ Index: LVM2.2.02.160/lib/metadata/mirror.c
/* For corelog mirror, activation code depends on /* For corelog mirror, activation code depends on
* the global mirror_in_sync status. As we are adding * the global mirror_in_sync status. As we are adding
Index: LVM2.2.02.160/lib/mirror/mirrored.c Index: LVM2.2.02.164/lib/mirror/mirrored.c
=================================================================== ===================================================================
--- LVM2.2.02.160.orig/lib/mirror/mirrored.c --- LVM2.2.02.164.orig/lib/mirror/mirrored.c
+++ LVM2.2.02.160/lib/mirror/mirrored.c +++ LVM2.2.02.164/lib/mirror/mirrored.c
@@ -293,12 +293,15 @@ static int _add_log(struct dm_pool *mem, @@ -293,12 +293,15 @@ static int _add_log(struct dm_pool *mem,
return 0; return 0;
} }
@ -504,11 +504,11 @@ Index: LVM2.2.02.160/lib/mirror/mirrored.c
log_flags |= DM_CORELOG; log_flags |= DM_CORELOG;
} }
Index: LVM2.2.02.160/tools/lvconvert.c Index: LVM2.2.02.164/tools/lvconvert.c
=================================================================== ===================================================================
--- LVM2.2.02.160.orig/tools/lvconvert.c --- LVM2.2.02.164.orig/tools/lvconvert.c
+++ LVM2.2.02.160/tools/lvconvert.c +++ LVM2.2.02.164/tools/lvconvert.c
@@ -1321,15 +1321,6 @@ static int _lvconvert_mirrors_parse_para @@ -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); *new_log_count = arg_int_value(cmd, mirrorlog_ARG, lp->corelog ? MIRROR_LOG_CORE : DEFAULT_MIRRORLOG);
@ -517,10 +517,10 @@ Index: LVM2.2.02.160/tools/lvconvert.c
- * log daemon is multi-threaded. - * log daemon is multi-threaded.
- */ - */
- if ((*new_log_count == MIRROR_LOG_MIRRORED) && 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"); - log_error("Log type, \"mirrored\", is unavailable to cluster mirrors.");
- return 0; - 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));
/* /*

9
device-mapper.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Sep 2 08:23:06 UTC 2016 - tchvatal@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
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 8 13:43:41 UTC 2016 - tchvatal@suse.com Fri Jul 8 13:43:41 UTC 2016 - tchvatal@suse.com

4
device-mapper.spec
View File

@ -17,8 +17,8 @@
### COMMON-DEF-BEGIN ### ### COMMON-DEF-BEGIN ###
%define lvm2_version 2.02.160 %define lvm2_version 2.02.164
%define device_mapper_version 1.02.130 %define device_mapper_version 1.02.133
### COMMON-DEF-END ### ### COMMON-DEF-END ###
%define libname libdevmapper1_03 %define libname libdevmapper1_03
%define libname_event libdevmapper-event1_03 %define libname_event libdevmapper-event1_03

9
lvm2-clvm.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Sep 2 08:23:06 UTC 2016 - tchvatal@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
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 8 13:43:41 UTC 2016 - tchvatal@suse.com Fri Jul 8 13:43:41 UTC 2016 - tchvatal@suse.com

4
lvm2-clvm.spec
View File

@ -17,8 +17,8 @@
### COMMON-DEF-BEGIN ### ### COMMON-DEF-BEGIN ###
%define lvm2_version 2.02.160 %define lvm2_version 2.02.164
%define device_mapper_version 1.02.130 %define device_mapper_version 1.02.133
### COMMON-DEF-END ### ### COMMON-DEF-END ###
Name: lvm2-clvm Name: lvm2-clvm
Version: %{lvm2_version} Version: %{lvm2_version}

9
lvm2.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Sep 2 08:23:06 UTC 2016 - tchvatal@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
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 8 13:43:41 UTC 2016 - tchvatal@suse.com Fri Jul 8 13:43:41 UTC 2016 - tchvatal@suse.com

4
lvm2.spec
View File

@ -17,8 +17,8 @@
### COMMON-DEF-BEGIN ### ### COMMON-DEF-BEGIN ###
%define lvm2_version 2.02.160 %define lvm2_version 2.02.164
%define device_mapper_version 1.02.130 %define device_mapper_version 1.02.133
### COMMON-DEF-END ### ### COMMON-DEF-END ###
%define _udevdir %(pkg-config --variable=udevdir udev) %define _udevdir %(pkg-config --variable=udevdir udev)
%define applib liblvm2app2_2 %define applib liblvm2app2_2

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

@ -25,11 +25,11 @@ Signed-off-by: Guangliang Zhao <gzhao@suse.com>
man/lvcreate.8.in | 4 ++++ man/lvcreate.8.in | 4 ++++
5 files changed, 60 insertions(+) 5 files changed, 60 insertions(+)
Index: LVM2.2.02.139/conf/example.conf.in Index: LVM2.2.02.164/conf/example.conf.in
=================================================================== ===================================================================
--- LVM2.2.02.139.orig/conf/example.conf.in --- LVM2.2.02.164.orig/conf/example.conf.in
+++ LVM2.2.02.139/conf/example.conf.in +++ LVM2.2.02.164/conf/example.conf.in
@@ -359,6 +359,23 @@ allocation { @@ -372,6 +372,23 @@ allocation {
# or erased unless the --wipesignatures option is used directly. # or erased unless the --wipesignatures option is used directly.
wipe_signatures_when_zeroing_new_lvs = 1 wipe_signatures_when_zeroing_new_lvs = 1
@ -53,13 +53,13 @@ Index: LVM2.2.02.139/conf/example.conf.in
# Configuration option allocation/mirror_logs_require_separate_pvs. # Configuration option allocation/mirror_logs_require_separate_pvs.
# Mirror logs and images will always use different PVs. # Mirror logs and images will always use different PVs.
# The default setting changed in version 2.02.85. # The default setting changed in version 2.02.85.
Index: LVM2.2.02.139/lib/config/config_settings.h Index: LVM2.2.02.164/lib/config/config_settings.h
=================================================================== ===================================================================
--- LVM2.2.02.139.orig/lib/config/config_settings.h --- LVM2.2.02.164.orig/lib/config/config_settings.h
+++ LVM2.2.02.139/lib/config/config_settings.h +++ LVM2.2.02.164/lib/config/config_settings.h
@@ -449,6 +449,9 @@ cfg(allocation_mirror_logs_require_separ @@ -473,6 +473,9 @@ cfg(allocation_raid_stripe_all_devices_C
"Mirror logs and images will always use different PVs.\n" "when the command does not specify the number of stripes to use.\n"
"The default setting changed in version 2.02.85.\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, +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") + "Mirror legs will always use different PVs.\n")
@ -67,11 +67,11 @@ Index: LVM2.2.02.139/lib/config/config_settings.h
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, 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") "Cache pool metadata and data will always use different PVs.\n")
Index: LVM2.2.02.139/lib/config/defaults.h Index: LVM2.2.02.164/lib/config/defaults.h
=================================================================== ===================================================================
--- LVM2.2.02.139.orig/lib/config/defaults.h --- LVM2.2.02.164.orig/lib/config/defaults.h
+++ LVM2.2.02.139/lib/config/defaults.h +++ LVM2.2.02.164/lib/config/defaults.h
@@ -144,6 +144,7 @@ @@ -157,6 +157,7 @@
#define DEFAULT_MAX_LV 0 #define DEFAULT_MAX_LV 0
#define DEFAULT_ALLOC_POLICY ALLOC_NORMAL #define DEFAULT_ALLOC_POLICY ALLOC_NORMAL
#define DEFAULT_MIRROR_LOGS_REQUIRE_SEPARATE_PVS 0 #define DEFAULT_MIRROR_LOGS_REQUIRE_SEPARATE_PVS 0
@ -79,11 +79,11 @@ Index: LVM2.2.02.139/lib/config/defaults.h
#define DEFAULT_MAXIMISE_CLING 1 #define DEFAULT_MAXIMISE_CLING 1
#define DEFAULT_CLUSTERED 0 #define DEFAULT_CLUSTERED 0
Index: LVM2.2.02.139/lib/metadata/lv_manip.c Index: LVM2.2.02.164/lib/metadata/lv_manip.c
=================================================================== ===================================================================
--- LVM2.2.02.139.orig/lib/metadata/lv_manip.c --- LVM2.2.02.164.orig/lib/metadata/lv_manip.c
+++ LVM2.2.02.139/lib/metadata/lv_manip.c +++ LVM2.2.02.164/lib/metadata/lv_manip.c
@@ -1550,6 +1550,9 @@ struct alloc_handle { @@ -1519,6 +1519,9 @@ struct alloc_handle {
unsigned maximise_cling; unsigned maximise_cling;
unsigned mirror_logs_separate; /* Force mirror logs on separate PVs? */ unsigned mirror_logs_separate; /* Force mirror logs on separate PVs? */
@ -93,7 +93,7 @@ Index: LVM2.2.02.139/lib/metadata/lv_manip.c
/* /*
* RAID devices require a metadata area that accompanies each * RAID devices require a metadata area that accompanies each
@@ -2608,6 +2611,32 @@ static int _limit_to_one_area_per_tag(st @@ -2600,6 +2603,32 @@ static int _limit_to_one_area_per_tag(st
} }
/* /*
@ -126,7 +126,7 @@ Index: LVM2.2.02.139/lib/metadata/lv_manip.c
* Returns 1 regardless of whether any space was found, except on error. * Returns 1 regardless of whether any space was found, except on error.
*/ */
static int _find_some_parallel_space(struct alloc_handle *ah, static int _find_some_parallel_space(struct alloc_handle *ah,
@@ -2737,6 +2766,10 @@ static int _find_some_parallel_space(str @@ -2729,6 +2758,10 @@ static int _find_some_parallel_space(str
continue; continue;
case USE_AREA: case USE_AREA:
@ -137,7 +137,7 @@ Index: LVM2.2.02.139/lib/metadata/lv_manip.c
/* /*
* Except with ALLOC_ANYWHERE, replace first area with this * Except with ALLOC_ANYWHERE, replace first area with this
* one which is smaller but still big enough. * one which is smaller but still big enough.
@@ -3220,6 +3253,7 @@ static struct alloc_handle *_alloc_init( @@ -3210,6 +3243,7 @@ static struct alloc_handle *_alloc_init(
ah->parity_count = parity_count; ah->parity_count = parity_count;
ah->region_size = region_size; ah->region_size = region_size;
ah->alloc = alloc; ah->alloc = alloc;
@ -145,7 +145,7 @@ Index: LVM2.2.02.139/lib/metadata/lv_manip.c
/* /*
* For the purposes of allocation, area_count and parity_count are * For the purposes of allocation, area_count and parity_count are
@@ -3231,6 +3265,7 @@ static struct alloc_handle *_alloc_init( @@ -3221,6 +3255,7 @@ static struct alloc_handle *_alloc_init(
ah->area_multiple = _calc_area_multiple(segtype, area_count + parity_count, stripes); 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? //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); ah->mirror_logs_separate = find_config_tree_bool(cmd, allocation_mirror_logs_require_separate_pvs_CFG, NULL);
@ -153,11 +153,11 @@ Index: LVM2.2.02.139/lib/metadata/lv_manip.c
if (mirrors || stripes) if (mirrors || stripes)
total_extents = new_extents; total_extents = new_extents;
Index: LVM2.2.02.139/man/lvcreate.8.in Index: LVM2.2.02.164/man/lvcreate.8.in
=================================================================== ===================================================================
--- LVM2.2.02.139.orig/man/lvcreate.8.in --- LVM2.2.02.164.orig/man/lvcreate.8.in
+++ LVM2.2.02.139/man/lvcreate.8.in +++ LVM2.2.02.164/man/lvcreate.8.in
@@ -404,6 +404,10 @@ Using \fBcore\fP means the mirror is reg @@ -418,6 +418,10 @@ Using \fBcore\fP means the mirror is reg
from the first device each time the logical volume is activated, from the first device each time the logical volume is activated,
like after every reboot. like after every reboot.
.br .br