From d512270acf6b06272d9d10c6ff067229e4c11421 Mon Sep 17 00:00:00 2001 From: markeryang Date: Wed, 23 Dec 2020 11:21:35 +0800 Subject: [PATCH] backport upstream patches-epoch2 to fix some problems --- 0005-bugfix-lvm2-add-SSD.patch | 1 + ...ify-default-log-level-to-error-level.patch | 1 + 0009-enhancement-add-dfx-log.patch | 4 +- ...syslog-more-when-use-libdevmapper-so.patch | 55 ++++++++++++ 0011-enhancement-log-it-when-disk-slow.patch | 89 +++++++++++++++++++ ...bugfix-lvm2-fix-the-reuse-of-va_list.patch | 40 +++++++++ lvm2.spec | 9 +- 7 files changed, 197 insertions(+), 2 deletions(-) create mode 100644 0010-enhancement-syslog-more-when-use-libdevmapper-so.patch create mode 100644 0011-enhancement-log-it-when-disk-slow.patch create mode 100644 0012-bugfix-lvm2-fix-the-reuse-of-va_list.patch diff --git a/0005-bugfix-lvm2-add-SSD.patch b/0005-bugfix-lvm2-add-SSD.patch index c9401b4..c538475 100644 --- a/0005-bugfix-lvm2-add-SSD.patch +++ b/0005-bugfix-lvm2-add-SSD.patch @@ -3,6 +3,7 @@ From: geruijun Date: Thu, 14 Feb 2019 04:55:01 -0500 Subject: [PATCH] lvm2: add 0002-bugfix-lvm2-add-SSD.patch +Signed-off-by: wangjufeng --- conf/example.conf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/0008-enhancement-modify-default-log-level-to-error-level.patch b/0008-enhancement-modify-default-log-level-to-error-level.patch index 01db1f1..033d08d 100644 --- a/0008-enhancement-modify-default-log-level-to-error-level.patch +++ b/0008-enhancement-modify-default-log-level-to-error-level.patch @@ -3,6 +3,7 @@ From: root Date: Tue, 19 Mar 2019 15:44:17 +0800 Subject: [PATCH 1/2] modify default log level to error level +Signed-off-by: wangjufeng --- conf/example.conf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0009-enhancement-add-dfx-log.patch b/0009-enhancement-add-dfx-log.patch index 136978e..c32c181 100644 --- a/0009-enhancement-add-dfx-log.patch +++ b/0009-enhancement-add-dfx-log.patch @@ -4,6 +4,7 @@ Date: Tue, 19 Mar 2019 16:43:16 +0800 Subject: [PATCH] add dfx log when error occur, or lvm resource change, it will print the cmdline and ppid +Signed-off-by: wangjufeng --- conf/example.conf.in | 4 ++++ conf/example.conf.in.rej | 13 +++++++++++++ @@ -12,9 +13,10 @@ Subject: [PATCH] add dfx log when error occur, or lvm resource change, it will lib/config/config_settings.h | 5 +++++ lib/log/log.c | 21 +++++++++++++++++++-- lib/log/log.h | 4 +++- - lib/misc/lvm-globals.c | 11 +++++++++++ + lib/misc/lvm-globals.c | 12 ++++++++++++ lib/misc/lvm-globals.h | 2 ++ tools/lvmcmdline.c | 1 + + 10 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 conf/example.conf.in.rej diff --git a/0010-enhancement-syslog-more-when-use-libdevmapper-so.patch b/0010-enhancement-syslog-more-when-use-libdevmapper-so.patch new file mode 100644 index 0000000..3be3700 --- /dev/null +++ b/0010-enhancement-syslog-more-when-use-libdevmapper-so.patch @@ -0,0 +1,55 @@ +From 53db5959233fb8977ff6c9cc0fc743239704f7e9 Mon Sep 17 00:00:00 2001 +From: wangjufeng +Date: Sat, 16 Nov 2019 15:09:56 +0800 +Subject: [PATCH] syslog more when use libdevmapper.so + +When docker use function of libdevmapper.so, it don't log to syslog. +This patch make it also log to syslog. + +Signed-off-by: wangjufeng +--- + libdm/libdm-common.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c +index 0b03106..2fd8783 100644 +--- a/libdm/libdm-common.c ++++ b/libdm/libdm-common.c +@@ -132,6 +132,7 @@ static void _default_log_line(int level, const char *file, + fprintf(out, "%s:%d ", file, line); + + vfprintf(out, f, ap); ++ vsyslog(level, f, ap); + fputc('\n', out); + } + +@@ -2586,11 +2587,15 @@ int dm_udev_complete(uint32_t cookie) + { + int semid; + +- if (!cookie || !dm_udev_get_sync_support()) ++ if (!cookie || !dm_udev_get_sync_support()) { ++ log_print("Do not wait cookie:0x%x", cookie); + return 1; ++ } + +- if (!_get_cookie_sem(cookie, &semid)) ++ if (!_get_cookie_sem(cookie, &semid)) { ++ log_error("Could not get cookie 0x%x sem %d", cookie, semid); + return_0; ++ } + + if (!_udev_notify_sem_dec(cookie, semid)) { + log_error("Could not signal waiting process using notification " +@@ -2598,7 +2603,7 @@ int dm_udev_complete(uint32_t cookie) + cookie, cookie); + return 0; + } +- ++ log_print("Complete cookie 0x%x success.", cookie); + return 1; + } + +-- +2.19.1 + diff --git a/0011-enhancement-log-it-when-disk-slow.patch b/0011-enhancement-log-it-when-disk-slow.patch new file mode 100644 index 0000000..e403eec --- /dev/null +++ b/0011-enhancement-log-it-when-disk-slow.patch @@ -0,0 +1,89 @@ +From e4c231700bd3f7f14dad8fe87cfc7b1179e4f3c0 Mon Sep 17 00:00:00 2001 +From: wangjufeng +Date: Sat, 16 Nov 2019 17:47:19 +0800 +Subject: [PATCH] log it when disk slow + +This patch help to log it when read or write disk take too much time. + +Signed-off-by: wangjufeng +--- + lib/device/dev-cache.c | 40 +++++++++++++++++++++++++++++++++++----- + 1 file changed, 35 insertions(+), 5 deletions(-) + +diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c +index 6af559c..7c144d6 100644 +--- a/lib/device/dev-cache.c ++++ b/lib/device/dev-cache.c +@@ -58,6 +58,7 @@ static struct { + #define _free(x) dm_pool_free(_cache.mem, (x)) + #define _strdup(x) dm_pool_strdup(_cache.mem, (x)) + ++static long udev_getdev_timemax = 500000; // macroseconds + static int _insert(const char *path, const struct stat *info, + int rec, int check_with_udev_db); + +@@ -1025,12 +1026,23 @@ static int _device_in_udev_db(const dev_t d) + static int _insert_udev_dir(struct udev *udev, const char *dir) + { + struct udev_enumerate *udev_enum = NULL; +- struct udev_list_entry *device_entry, *symlink_entry; ++ struct udev_list_entry *device_entry, *symlink_entry, *first_entry; + const char *entry_name, *node_name, *symlink_name; + struct udev_device *device; + int r = 1; +- +- if (!(udev_enum = udev_enumerate_new(udev))) { ++ int ret = -1; ++ struct timeval start, end; ++ long time_use = 0; ++ ++ ret = gettimeofday(&start,NULL); ++ udev_enum = udev_enumerate_new(udev); ++ if (!ret && !gettimeofday(&end,NULL)) { ++ time_use = (end.tv_sec - start.tv_sec) * 1000000 + (end.tv_usec - start.tv_usec); ++ if (time_use > udev_getdev_timemax) { ++ log_print_unless_silent("Call udev_enumerate_new use %ld usec", time_use); ++ } ++ } ++ if (!udev_enum) { + log_error("Failed to udev_enumerate_new."); + return 0; + } +@@ -1062,14 +1074,32 @@ static int _insert_udev_dir(struct udev *udev, const char *dir) + entry_name); + continue; + } ++ ret = gettimeofday(&start,NULL); ++ node_name = udev_device_get_devnode(device); ++ if (!ret && !gettimeofday(&end,NULL)) { ++ time_use = (end.tv_sec - start.tv_sec) * 1000000 + (end.tv_usec - start.tv_usec); ++ if (time_use > udev_getdev_timemax) { ++ log_print_unless_silent("Call udev_device_get_devnode use %ld usec, device:%s", ++ time_use, entry_name); ++ } ++ } + +- if (!(node_name = udev_device_get_devnode(device))) ++ if (!node_name) + log_very_verbose("udev failed to return a device node for entry %s.", + entry_name); + else + r &= _insert(node_name, NULL, 0, 0); + +- udev_list_entry_foreach(symlink_entry, udev_device_get_devlinks_list_entry(device)) { ++ ret = gettimeofday(&start,NULL); ++ first_entry = udev_device_get_devlinks_list_entry(device); ++ if (!ret && !gettimeofday(&end,NULL)) { ++ time_use = (end.tv_sec - start.tv_sec) * 1000000 + (end.tv_usec - start.tv_usec); ++ if (time_use > udev_getdev_timemax) { ++ log_print_unless_silent("Call udev_device_get_devlinks_list_entry use %ld usec, dev:%s", ++ time_use, entry_name); ++ } ++ } ++ udev_list_entry_foreach(symlink_entry, first_entry) { + if (!(symlink_name = udev_list_entry_get_name(symlink_entry))) + log_very_verbose("udev failed to return a symlink name for entry %s.", + entry_name); +-- +1.8.3.1 + diff --git a/0012-bugfix-lvm2-fix-the-reuse-of-va_list.patch b/0012-bugfix-lvm2-fix-the-reuse-of-va_list.patch new file mode 100644 index 0000000..eecc329 --- /dev/null +++ b/0012-bugfix-lvm2-fix-the-reuse-of-va_list.patch @@ -0,0 +1,40 @@ +From 70330d222e3231af111e9d7b500ed86e0980a2c6 Mon Sep 17 00:00:00 2001 +From: wangjufeng +Date: Fri, 20 Mar 2020 19:28:02 +0800 +Subject: [PATCH] lvm2: fix the reuse of va_list + +After a va_list is used, it should not be used again. Because it +is already changed after using. + +Signed-off-by: wangjufeng +--- + libdm/libdm-common.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c +index 2fd8783..7f2fb81 100644 +--- a/libdm/libdm-common.c ++++ b/libdm/libdm-common.c +@@ -113,6 +113,7 @@ static void _default_log_line(int level, const char *file, + int line, int dm_errno_or_class, + const char *f, va_list ap) + { ++ va_list copyap; + static int _abort_on_internal_errors = -1; + static int _debug_with_line_numbers = -1; + FILE *out = log_stderr(level) ? stderr : stdout; +@@ -131,8 +132,10 @@ static void _default_log_line(int level, const char *file, + if (_debug_with_line_numbers) + fprintf(out, "%s:%d ", file, line); + ++ va_copy(copyap, ap); + vfprintf(out, f, ap); +- vsyslog(level, f, ap); ++ vsyslog(level, f, copyap); ++ va_end(copyap); + fputc('\n', out); + } + +-- +1.8.3.1 + diff --git a/lvm2.spec b/lvm2.spec index c6642e4..d71eb10 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -43,7 +43,7 @@ Name: lvm2 Version: 2.03.09 -Release: 4 +Release: 5 Epoch: 8 Summary: Tools for logical volume management License: GPLv2 and LGPLv2 @@ -58,6 +58,9 @@ Patch6: 0006-bugfix-add-timeout-when-fail-to-wait-udev.patch Patch7: 0007-bugfix-fix-the-code-maybe-lead-to-buffer-over-bound-access.patch Patch8: 0008-enhancement-modify-default-log-level-to-error-level.patch Patch9: 0009-enhancement-add-dfx-log.patch +Patch10: 0010-enhancement-syslog-more-when-use-libdevmapper-so.patch +Patch11: 0011-enhancement-log-it-when-disk-slow.patch +Patch12: 0012-bugfix-lvm2-fix-the-reuse-of-va_list.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -91,6 +94,7 @@ Requires: bash >= %{bash_version} Requires: module-init-tools Requires: device-mapper-persistent-data >= %{persistent_data_version} Requires: device-mapper-event = %{?epoch}:%{device_mapper_version}-%{release} +Recommends: %{name}-help = %{epoch}:%{version}-%{release} Requires(post): systemd-units >= %{systemd_version}, systemd-sysv Requires(preun): systemd-units >= %{systemd_version} Requires(postun): systemd-units >= %{systemd_version} @@ -483,6 +487,9 @@ fi %changelog +* Wed Dec 23 2020 yanglongkang - 8.2.03.09-5 +- backport upstream patches-epoch2 to fix some problems + * Wed Nov 4 2020 lixiaokeng - 8.2.03.09-4 - add make test -- Gitee