Enable dmeventd monitoring section of config file by default.

This commit is contained in:
Alasdair Kergon 2009-09-17 12:18:52 +00:00
parent 5ee29b9c97
commit dde31a5dd2
3 changed files with 40 additions and 4 deletions

View File

@ -1,4 +1,3 @@
diff -ru LVM2.2.02.52/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c LVM2.2.02.52-new2/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
--- LVM2.2.02.52/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c 2009-06-30 19:39:31.000000000 +0100 --- LVM2.2.02.52/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c 2009-06-30 19:39:31.000000000 +0100
+++ LVM2.2.02.52-new2/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c 2009-09-17 12:51:29.637533000 +0100 +++ LVM2.2.02.52-new2/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c 2009-09-17 12:51:29.637533000 +0100
@@ -126,8 +126,10 @@ @@ -126,8 +126,10 @@
@ -13,7 +12,6 @@ diff -ru LVM2.2.02.52/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c LVM2.2.0
const char *format) const char *format)
{ {
if (!strncmp(format, "WARNING: ", 9) && (level < 5)) if (!strncmp(format, "WARNING: ", 9) && (level < 5))
diff -ru LVM2.2.02.52/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c LVM2.2.02.52-new2/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
--- LVM2.2.02.52/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c 2008-10-13 13:06:30.000000000 +0100 --- LVM2.2.02.52/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c 2008-10-13 13:06:30.000000000 +0100
+++ LVM2.2.02.52-new2/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c 2009-09-17 12:51:29.641533000 +0100 +++ LVM2.2.02.52-new2/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c 2009-09-17 12:51:29.641533000 +0100
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
@ -24,8 +22,6 @@ diff -ru LVM2.2.02.52/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c LVM2
const char *format) const char *format)
{ {
if (!strncmp(format, "WARNING: ", 9) && (level < 5)) if (!strncmp(format, "WARNING: ", 9) && (level < 5))
Only in LVM2.2.02.52/scripts: lvm2_monitoring_init_red_hat.in.lvm2_monitoring
diff -ru LVM2.2.02.52/WHATS_NEW LVM2.2.02.52-new2/WHATS_NEW
--- LVM2.2.02.52/WHATS_NEW 2009-09-17 12:50:42.799264000 +0100 --- LVM2.2.02.52/WHATS_NEW 2009-09-17 12:50:42.799264000 +0100
+++ LVM2.2.02.52-new2/WHATS_NEW 2009-09-17 12:51:51.499101000 +0100 +++ LVM2.2.02.52-new2/WHATS_NEW 2009-09-17 12:51:51.499101000 +0100
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@

View File

@ -0,0 +1,38 @@
--- LVM2.2.02.52/doc/example.conf 2009-09-15 14:49:11.000000000 +0100
+++ LVM2.2.02.52-new3/doc/example.conf 2009-09-17 13:18:59.736033000 +0100
@@ -435,7 +435,7 @@
# Event daemon
#
-# dmeventd {
+dmeventd {
# mirror_library is the library used when monitoring a mirror device.
#
# "libdevmapper-event-lvm2mirror.so" attempts to recover from
@@ -443,7 +443,7 @@
# reconfigures a mirror as necessary. If no mirror library is
# provided, mirrors are not monitored through dmeventd.
- # mirror_library = "libdevmapper-event-lvm2mirror.so"
+ mirror_library = "libdevmapper-event-lvm2mirror.so"
# snapshot_library is the library used when monitoring a snapshot device.
#
@@ -452,6 +452,6 @@
# snapshot exceedes 80%. The warning is repeated when 85%, 90% and
# 95% of the snapshot are filled.
- # snapshot_library = "libdevmapper-event-lvm2snapshot.so"
-#}
+ snapshot_library = "libdevmapper-event-lvm2snapshot.so"
+}
--- LVM2.2.02.52/WHATS_NEW 2009-09-17 13:17:07.822006000 +0100
+++ LVM2.2.02.52-new3/WHATS_NEW 2009-09-17 13:19:57.674596000 +0100
@@ -1,5 +1,6 @@
Version 2.02.53 -
=====================================
+ Enable dmeventd monitoring section of config file by default.
Fix dmeventd _temporary_log_fn parameters. (2.02.50)
Update lvm2 monitoring script to lvm2_monitoring_init_red_hat.in.

View File

@ -18,6 +18,7 @@ Source0: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
Patch0: cluster-locking-built-in.patch Patch0: cluster-locking-built-in.patch
Patch1: lvm2-2_02_53-lvm2_monitoring_init.patch Patch1: lvm2-2_02_53-lvm2_monitoring_init.patch
Patch2: lvm2-2_02_53-dmeventd_log_fn.patch Patch2: lvm2-2_02_53-dmeventd_log_fn.patch
Patch3: lvm2-2_02_53-enable_dmeventd_in_lvm_conf.patch
BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
@ -48,6 +49,7 @@ or more physical volumes and creating one or more logical volumes
%patch0 -p1 -b .locking %patch0 -p1 -b .locking
%patch1 -p1 -b .lvm2_monitoring %patch1 -p1 -b .lvm2_monitoring
%patch2 -p1 -b .dmeventd_log_fn %patch2 -p1 -b .dmeventd_log_fn
%patch3 -p1 -b .enable_dmeventd_in_conf
%build %build
%define _exec_prefix / %define _exec_prefix /