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

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

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

- 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

- 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

OBS-URL: https://build.opensuse.org/request/show/407296
OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=155
This commit is contained in:
LiuhuaMelody Wang 2016-07-25 02:29:50 +00:00 committed by Git OBS Bridge
parent f2dca905c9
commit 5768ee5ddf
11 changed files with 70 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
LVM2.2.02.155.tgz
View File

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

7
LVM2.2.02.155.tgz.asc
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iEYEABECAAYFAldSA0MACgkQIoGRwVZ+LBe5AgCg1ReoabJaM1fBerB9UQzUYSEX
93wAoOzm92DOF3ZSjVNNN+s6Vr/rN+Le
=5j5T
-----END PGP SIGNATURE-----

3
LVM2.2.02.160.tgz Normal file
View File

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

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

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

60
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.139/daemons/cmirrord/Makefile.in Index: LVM2.2.02.160/daemons/cmirrord/Makefile.in
=================================================================== ===================================================================
--- LVM2.2.02.139.orig/daemons/cmirrord/Makefile.in --- LVM2.2.02.160.orig/daemons/cmirrord/Makefile.in
+++ LVM2.2.02.139/daemons/cmirrord/Makefile.in +++ LVM2.2.02.160/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.139/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.139/daemons/cmirrord/cluster.c Index: LVM2.2.02.160/daemons/cmirrord/cluster.c
=================================================================== ===================================================================
--- LVM2.2.02.139.orig/daemons/cmirrord/cluster.c --- LVM2.2.02.160.orig/daemons/cmirrord/cluster.c
+++ LVM2.2.02.139/daemons/cmirrord/cluster.c +++ LVM2.2.02.160/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.139/daemons/cmirrord/cluster.c
return 0; return 0;
} }
Index: LVM2.2.02.139/daemons/cmirrord/functions.c Index: LVM2.2.02.160/daemons/cmirrord/functions.c
=================================================================== ===================================================================
--- LVM2.2.02.139.orig/daemons/cmirrord/functions.c --- LVM2.2.02.160.orig/daemons/cmirrord/functions.c
+++ LVM2.2.02.139/daemons/cmirrord/functions.c +++ LVM2.2.02.160/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>
@ -347,7 +347,7 @@ Index: LVM2.2.02.139/daemons/cmirrord/functions.c
return 0; return 0;
fail: 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)); LOG_DBG("[%s] Cluster log removed", SHORT_UUID(lc->uuid));
@ -358,7 +358,7 @@ Index: LVM2.2.02.139/daemons/cmirrord/functions.c
if (lc->disk_fd != -1 && close(lc->disk_fd)) if (lc->disk_fd != -1 && close(lc->disk_fd))
LOG_ERROR("Failed to close disk log: %s", LOG_ERROR("Failed to close disk log: %s",
strerror(errno)); 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; lc->resume_override = 0;
/* move log to pending list */ /* move log to pending list */
@ -372,7 +372,7 @@ Index: LVM2.2.02.139/daemons/cmirrord/functions.c
return 0; return 0;
} }
@@ -821,9 +843,9 @@ no_disk: @@ -827,9 +849,9 @@ no_disk:
if (commit_log && (lc->disk_fd >= 0)) { if (commit_log && (lc->disk_fd >= 0)) {
rq->error = write_log(lc); rq->error = write_log(lc);
if (rq->error) if (rq->error)
@ -384,7 +384,7 @@ Index: LVM2.2.02.139/daemons/cmirrord/functions.c
lc->touched = 0; lc->touched = 0;
} }
out: 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 */ /* move log to official list */
@ -398,7 +398,7 @@ Index: LVM2.2.02.139/daemons/cmirrord/functions.c
} }
return 0; return 0;
@@ -1929,7 +1956,6 @@ void log_debug(void) @@ -1935,7 +1962,6 @@ void log_debug(void)
LOG_ERROR(""); LOG_ERROR("");
LOG_ERROR("LOG COMPONENT DEBUGGING::"); LOG_ERROR("LOG COMPONENT DEBUGGING::");
@ -406,7 +406,7 @@ Index: LVM2.2.02.139/daemons/cmirrord/functions.c
LOG_ERROR("Pending log list:"); LOG_ERROR("Pending log list:");
dm_list_iterate_items(lc, &log_pending_list) { dm_list_iterate_items(lc, &log_pending_list) {
LOG_ERROR("%s", lc->uuid); 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); print_bits(lc->clean_bits, 1);
} }
@ -414,10 +414,10 @@ Index: LVM2.2.02.139/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.139/daemons/cmirrord/local.c Index: LVM2.2.02.160/daemons/cmirrord/local.c
=================================================================== ===================================================================
--- LVM2.2.02.139.orig/daemons/cmirrord/local.c --- LVM2.2.02.160.orig/daemons/cmirrord/local.c
+++ LVM2.2.02.139/daemons/cmirrord/local.c +++ LVM2.2.02.160/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.139/daemons/cmirrord/local.c
memset(send_buf, 0, sizeof(send_buf)); memset(send_buf, 0, sizeof(send_buf));
Index: LVM2.2.02.139/lib/metadata/mirror.c Index: LVM2.2.02.160/lib/metadata/mirror.c
=================================================================== ===================================================================
--- LVM2.2.02.139.orig/lib/metadata/mirror.c --- LVM2.2.02.160.orig/lib/metadata/mirror.c
+++ LVM2.2.02.139/lib/metadata/mirror.c +++ LVM2.2.02.160/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.139/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.139/lib/mirror/mirrored.c Index: LVM2.2.02.160/lib/mirror/mirrored.c
=================================================================== ===================================================================
--- LVM2.2.02.139.orig/lib/mirror/mirrored.c --- LVM2.2.02.160.orig/lib/mirror/mirrored.c
+++ LVM2.2.02.139/lib/mirror/mirrored.c +++ LVM2.2.02.160/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,13 +504,13 @@ Index: LVM2.2.02.139/lib/mirror/mirrored.c
log_flags |= DM_CORELOG; log_flags |= DM_CORELOG;
} }
Index: LVM2.2.02.139/tools/lvconvert.c Index: LVM2.2.02.160/tools/lvconvert.c
=================================================================== ===================================================================
--- LVM2.2.02.139.orig/tools/lvconvert.c --- LVM2.2.02.160.orig/tools/lvconvert.c
+++ LVM2.2.02.139/tools/lvconvert.c +++ LVM2.2.02.160/tools/lvconvert.c
@@ -1222,15 +1222,6 @@ static int _lvconvert_mirrors_parse_para @@ -1321,15 +1321,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); *new_log_count = arg_int_value(cmd, mirrorlog_ARG, lp->corelog ? MIRROR_LOG_CORE : DEFAULT_MIRRORLOG);
- /* - /*
- * No mirrored logs for cluster mirrors until - * No mirrored logs for cluster mirrors until

8
device-mapper.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Jul 8 13:43:41 UTC 2016 - tchvatal@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 - tchvatal@suse.com Tue Jun 7 12:08:24 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.155 %define lvm2_version 2.02.160
%define device_mapper_version 1.02.126 %define device_mapper_version 1.02.130
### 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

8
lvm2-clvm.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Jul 8 13:43:41 UTC 2016 - tchvatal@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 - tchvatal@suse.com Tue Jun 7 12:08:24 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.155 %define lvm2_version 2.02.160
%define device_mapper_version 1.02.126 %define device_mapper_version 1.02.130
### COMMON-DEF-END ### ### COMMON-DEF-END ###
Name: lvm2-clvm Name: lvm2-clvm
Version: %{lvm2_version} Version: %{lvm2_version}

8
lvm2.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Jul 8 13:43:41 UTC 2016 - tchvatal@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 - tchvatal@suse.com Tue Jun 7 12:08:24 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.155 %define lvm2_version 2.02.160
%define device_mapper_version 1.02.126 %define device_mapper_version 1.02.130
### 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