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

Accepting request 448708 from Base:System

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/448708
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lvm2?expand=0&rev=96
This commit is contained in:
Dominique Leuenberger 2017-01-10 09:35:14 +00:00 committed by Git OBS Bridge
commit bcefa669b5
11 changed files with 99 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
LVM2.2.02.165.tgz
View File

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

7
LVM2.2.02.165.tgz.asc
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iEYEABECAAYFAlfPblQACgkQIoGRwVZ+LBeyDwCfZ5Ls6u9zDDBjeaGVZFbad1BM
bLUAn02XQx/+zVTPwZoTtSHP68kQzwnT
=2smD
-----END PGP SIGNATURE-----

3
LVM2.2.02.168.tgz Normal file
View File

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

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

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iEUEABECAAYFAlg/XqMACgkQIoGRwVZ+LBdjQACVGeU4I+B5ETIhINJeYXy2bLNu
hQCgxEmGwG0ec2frSXhQociTYfT6vVc=
=T5md
-----END PGP SIGNATURE-----

82
cluster_support_mirrord_log.diff
View File

@ -9,10 +9,10 @@ Subject: Parallelize dispatching
tools/lvconvert.c | 9 ---
7 files changed, 109 insertions(+), 81 deletions(-)
Index: LVM2.2.02.164/daemons/cmirrord/Makefile.in
Index: LVM2.2.02.168/daemons/cmirrord/Makefile.in
===================================================================
--- LVM2.2.02.164.orig/daemons/cmirrord/Makefile.in
+++ LVM2.2.02.164/daemons/cmirrord/Makefile.in
--- LVM2.2.02.168.orig/daemons/cmirrord/Makefile.in
+++ LVM2.2.02.168/daemons/cmirrord/Makefile.in
@@ -26,7 +26,7 @@ TARGETS = cmirrord
include $(top_builddir)/make.tmpl
@ -22,10 +22,10 @@ Index: LVM2.2.02.164/daemons/cmirrord/Makefile.in
LMLIBS += $(CPG_LIBS) $(SACKPT_LIBS)
CFLAGS += $(CPG_CFLAGS) $(SACKPT_CFLAGS) $(EXTRA_EXEC_CFLAGS)
LDFLAGS += $(EXTRA_EXEC_LDFLAGS)
Index: LVM2.2.02.164/daemons/cmirrord/cluster.c
Index: LVM2.2.02.168/daemons/cmirrord/cluster.c
===================================================================
--- LVM2.2.02.164.orig/daemons/cmirrord/cluster.c
+++ LVM2.2.02.164/daemons/cmirrord/cluster.c
--- LVM2.2.02.168.orig/daemons/cmirrord/cluster.c
+++ LVM2.2.02.168/daemons/cmirrord/cluster.c
@@ -22,6 +22,7 @@
#include <errno.h>
#include <signal.h>
@ -282,11 +282,11 @@ Index: LVM2.2.02.164/daemons/cmirrord/cluster.c
return 0;
}
Index: LVM2.2.02.164/daemons/cmirrord/functions.c
Index: LVM2.2.02.168/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 @@
--- LVM2.2.02.168.orig/daemons/cmirrord/functions.c
+++ LVM2.2.02.168/daemons/cmirrord/functions.c
@@ -20,6 +20,7 @@
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
@ -294,7 +294,7 @@ Index: LVM2.2.02.164/daemons/cmirrord/functions.c
#define BYTE_SHIFT 3
@@ -106,6 +107,9 @@ struct recovery_request {
@@ -107,6 +108,9 @@ struct recovery_request {
static DM_LIST_INIT(log_list);
static DM_LIST_INIT(log_pending_list);
@ -304,7 +304,7 @@ Index: LVM2.2.02.164/daemons/cmirrord/functions.c
static int log_test_bit(dm_bitset_t bs, int bit)
{
return dm_bit(bs, bit) ? 1 : 0;
@@ -152,11 +156,15 @@ static struct log_c *get_log(const char
@@ -153,11 +157,15 @@ static struct log_c *get_log(const char
{
struct log_c *lc;
@ -321,7 +321,7 @@ Index: LVM2.2.02.164/daemons/cmirrord/functions.c
return NULL;
}
@@ -172,10 +180,14 @@ static struct log_c *get_pending_log(con
@@ -173,10 +181,14 @@ static struct log_c *get_pending_log(con
{
struct log_c *lc;
@ -337,7 +337,7 @@ Index: LVM2.2.02.164/daemons/cmirrord/functions.c
return NULL;
}
@@ -520,7 +532,9 @@ static int _clog_ctr(char *uuid, uint64_
@@ -521,7 +533,9 @@ static int _clog_ctr(char *uuid, uint64_
LOG_DBG("Disk log ready");
}
@ -347,7 +347,7 @@ Index: LVM2.2.02.164/daemons/cmirrord/functions.c
return 0;
fail:
@@ -650,7 +664,10 @@ static int clog_dtr(struct dm_ulog_reque
@@ -651,7 +665,10 @@ static int clog_dtr(struct dm_ulog_reque
LOG_DBG("[%s] Cluster log removed", SHORT_UUID(lc->uuid));
@ -358,7 +358,7 @@ Index: LVM2.2.02.164/daemons/cmirrord/functions.c
if (lc->disk_fd != -1 && close(lc->disk_fd))
LOG_ERROR("Failed to close disk log: %s",
strerror(errno));
@@ -722,8 +739,13 @@ int cluster_postsuspend(char *uuid, uint
@@ -723,8 +740,13 @@ int cluster_postsuspend(char *uuid, uint
lc->resume_override = 0;
/* move log to pending list */
@ -372,7 +372,7 @@ Index: LVM2.2.02.164/daemons/cmirrord/functions.c
return 0;
}
@@ -827,9 +849,9 @@ no_disk:
@@ -828,9 +850,9 @@ no_disk:
if (commit_log && (lc->disk_fd >= 0)) {
rq->error = write_log(lc);
if (rq->error)
@ -384,7 +384,7 @@ Index: LVM2.2.02.164/daemons/cmirrord/functions.c
lc->touched = 0;
}
out:
@@ -911,8 +933,13 @@ int local_resume(struct dm_ulog_request
@@ -912,8 +934,13 @@ int local_resume(struct dm_ulog_request
}
/* move log to official list */
@ -398,7 +398,7 @@ Index: LVM2.2.02.164/daemons/cmirrord/functions.c
}
return 0;
@@ -1935,7 +1962,6 @@ void log_debug(void)
@@ -1936,7 +1963,6 @@ void log_debug(void)
LOG_ERROR("");
LOG_ERROR("LOG COMPONENT DEBUGGING::");
@ -406,7 +406,7 @@ Index: LVM2.2.02.164/daemons/cmirrord/functions.c
LOG_ERROR("Pending log list:");
dm_list_iterate_items(lc, &log_pending_list) {
LOG_ERROR("%s", lc->uuid);
@@ -1945,6 +1971,7 @@ void log_debug(void)
@@ -1946,6 +1972,7 @@ void log_debug(void)
print_bits(lc->clean_bits, 1);
}
@ -414,10 +414,10 @@ Index: LVM2.2.02.164/daemons/cmirrord/functions.c
dm_list_iterate_items(lc, &log_list) {
LOG_ERROR("%s", lc->uuid);
LOG_ERROR(" recoverer : %" PRIu32, lc->recoverer);
Index: LVM2.2.02.164/daemons/cmirrord/local.c
Index: LVM2.2.02.168/daemons/cmirrord/local.c
===================================================================
--- LVM2.2.02.164.orig/daemons/cmirrord/local.c
+++ LVM2.2.02.164/daemons/cmirrord/local.c
--- LVM2.2.02.168.orig/daemons/cmirrord/local.c
+++ LVM2.2.02.168/daemons/cmirrord/local.c
@@ -29,13 +29,13 @@
static int cn_fd = -1; /* Connector (netlink) socket fd */
@ -441,22 +441,23 @@ Index: LVM2.2.02.164/daemons/cmirrord/local.c
memset(send_buf, 0, sizeof(send_buf));
Index: LVM2.2.02.164/lib/metadata/mirror.c
Index: LVM2.2.02.168/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
--- LVM2.2.02.168.orig/lib/metadata/mirror.c
+++ LVM2.2.02.168/lib/metadata/mirror.c
@@ -1925,11 +1925,6 @@ int add_mirror_log(struct cmd_context *c
unsigned old_log_count;
int r = 0;
- if (vg_is_clustered(lv->vg) && (log_count > 1)) {
- log_error("Log type, \"mirrored\", is unavailable to cluster mirrors");
- log_error("Log type, \"mirrored\", is unavailable to cluster mirrors.");
- return 0;
- }
-
if (dm_list_size(&lv->segments) != 1) {
log_error("Multiple-segment mirror is not supported");
@@ -2140,26 +2136,6 @@ int lv_add_mirrors(struct cmd_context *c
log_error("Multiple-segment mirror is not supported.");
return 0;
@@ -2090,27 +2085,6 @@ int lv_add_mirrors(struct cmd_context *c
return 0;
}
@ -476,17 +477,18 @@ Index: LVM2.2.02.164/lib/metadata/mirror.c
- * log daemon is multi-threaded.
- */
- if (log_count > 1) {
- log_error("Log type, \"mirrored\", is unavailable to cluster mirrors");
- log_error("Log type, \"mirrored\", is unavailable to cluster mirrors.");
- return 0;
- }
- }
-
/* For corelog mirror, activation code depends on
* the global mirror_in_sync status. As we are adding
Index: LVM2.2.02.164/lib/mirror/mirrored.c
* a new mirror, it should be set as 'out-of-sync'
Index: LVM2.2.02.168/lib/mirror/mirrored.c
===================================================================
--- LVM2.2.02.164.orig/lib/mirror/mirrored.c
+++ LVM2.2.02.164/lib/mirror/mirrored.c
--- LVM2.2.02.168.orig/lib/mirror/mirrored.c
+++ LVM2.2.02.168/lib/mirror/mirrored.c
@@ -293,12 +293,15 @@ static int _add_log(struct dm_pool *mem,
return 0;
}
@ -504,11 +506,11 @@ Index: LVM2.2.02.164/lib/mirror/mirrored.c
log_flags |= DM_CORELOG;
}
Index: LVM2.2.02.164/tools/lvconvert.c
Index: LVM2.2.02.168/tools/lvconvert.c
===================================================================
--- 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
--- LVM2.2.02.168.orig/tools/lvconvert.c
+++ LVM2.2.02.168/tools/lvconvert.c
@@ -1375,15 +1375,6 @@ static int _lvconvert_mirrors_parse_para
*new_log_count = arg_int_value(cmd, mirrorlog_ARG, lp->corelog ? MIRROR_LOG_CORE : DEFAULT_MIRRORLOG);

13
device-mapper.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Dec 28 11:08:23 UTC 2016 - tchvatal@suse.com
- Version update to 2.02.168 release, see WHATS_NEW and WHATS_NEW_DM
files for detailed changelogs
* Refresh patch cluster_support_mirrord_log.diff
-------------------------------------------------------------------
Wed Dec 28 10:58:29 UTC 2016 - zlliu@suse.com
- fix bsc#1015357 about blkid_wiping printed warning.
* Add dependency on pkgconfig(blkid)
-------------------------------------------------------------------
Fri Sep 9 09:24:19 UTC 2016 - tchvatal@suse.com

4
device-mapper.spec
View File

@ -17,8 +17,8 @@
### COMMON-DEF-BEGIN ###
%define lvm2_version 2.02.165
%define device_mapper_version 1.02.134
%define lvm2_version 2.02.168
%define device_mapper_version 1.02.137
### COMMON-DEF-END ###
%define libname libdevmapper1_03
%define libname_event libdevmapper-event1_03

13
lvm2-clvm.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Dec 28 11:08:23 UTC 2016 - tchvatal@suse.com
- Version update to 2.02.168 release, see WHATS_NEW and WHATS_NEW_DM
files for detailed changelogs
* Refresh patch cluster_support_mirrord_log.diff
-------------------------------------------------------------------
Wed Dec 28 10:58:29 UTC 2016 - zlliu@suse.com
- fix bsc#1015357 about blkid_wiping printed warning.
* Add dependency on pkgconfig(blkid)
-------------------------------------------------------------------
Fri Sep 9 09:24:19 UTC 2016 - tchvatal@suse.com

4
lvm2-clvm.spec
View File

@ -17,8 +17,8 @@
### COMMON-DEF-BEGIN ###
%define lvm2_version 2.02.165
%define device_mapper_version 1.02.134
%define lvm2_version 2.02.168
%define device_mapper_version 1.02.137
### COMMON-DEF-END ###
Name: lvm2-clvm
Version: %{lvm2_version}

13
lvm2.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Dec 28 11:08:23 UTC 2016 - tchvatal@suse.com
- Version update to 2.02.168 release, see WHATS_NEW and WHATS_NEW_DM
files for detailed changelogs
* Refresh patch cluster_support_mirrord_log.diff
-------------------------------------------------------------------
Wed Dec 28 10:58:29 UTC 2016 - zlliu@suse.com
- fix bsc#1015357 about blkid_wiping printed warning.
* Add dependency on pkgconfig(blkid)
-------------------------------------------------------------------
Fri Sep 9 09:24:19 UTC 2016 - tchvatal@suse.com

6
lvm2.spec
View File

@ -17,8 +17,8 @@
### COMMON-DEF-BEGIN ###
%define lvm2_version 2.02.165
%define device_mapper_version 1.02.134
%define lvm2_version 2.02.168
%define device_mapper_version 1.02.137
### COMMON-DEF-END ###
%define _udevdir %(pkg-config --variable=udevdir udev)
%define applib liblvm2app2_2
@ -85,6 +85,7 @@ BuildRequires: pkgconfig
BuildRequires: readline-devel
BuildRequires: systemd
BuildRequires: thin-provisioning-tools >= 0.5.6
BuildRequires: pkgconfig(blkid)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(udev)
@ -163,6 +164,7 @@ This package provides development files for the LVM2 Logical Volume Manager.
%build
extra_opts="
--enable-blkid_wiping
--enable-cmdlib
--enable-applib
--enable-realtime