main - cleanup: simplify
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1fb3e08033570365580...
Commit: 1fb3e08033570365580b576777e312d2f9c2d86d
Parent: a7cf55c6a19a0a70dab7f2b8a406d52e24d5e3cd
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Mar 1 21:05:47 2023 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Apr 6 11:06:04 2023 +0200
cleanup: simplify
---
lib/metadata/integrity_manip.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/metadata/integrity_manip.c b/lib/metadata/integrity_manip.c
index ffb869b08..456795532 100644
--- a/lib/metadata/integrity_manip.c
+++ b/lib/metadata/integrity_manip.c
@@ -936,7 +936,9 @@ int lv_integrity_mismatches(struct cmd_context *cmd,
const struct logical_volume *lv,
uint64_t *mismatches)
{
- struct lv_with_info_and_seg_status status;
+ struct lv_with_info_and_seg_status status = {
+ .seg_status.type = SEG_STATUS_NONE,
+ };
if (lv_is_raid(lv) && lv_raid_has_integrity((struct logical_volume *)lv))
return lv_raid_integrity_total_mismatches(cmd, lv, mismatches);
@@ -944,9 +946,6 @@ int lv_integrity_mismatches(struct cmd_context *cmd,
if (!lv_is_integrity(lv))
return_0;
- memset(&status, 0, sizeof(status));
- status.seg_status.type = SEG_STATUS_NONE;
-
status.seg_status.seg = first_seg(lv);
/* FIXME: why reporter_pool? */
1 year, 2 months
- 1
- 0
main - configure: update
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a7cf55c6a19a0a70dab...
Commit: a7cf55c6a19a0a70dab7f2b8a406d52e24d5e3cd
Parent: 0f2c48a10e6085d483d560277b9d582835582ec4
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Mar 1 09:40:53 2023 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Apr 6 11:06:04 2023 +0200
configure: update
autoreconf
---
aclocal.m4 | 34 ++---
configure | 442 +++++++++++++++++++++++++++++--------------------------------
2 files changed, 226 insertions(+), 250 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 56c51c7a5..a1ba0f473 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -69,8 +69,8 @@ AC_DEFUN([AX_PYTHON_MODULE],[
fi
])
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 11 (pkg-config-0.29.1)
+# pkg.m4 - Macros to locate and use pkg-config. -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
dnl Copyright �� 2004 Scott James Remnant <scott(a)netsplit.com>.
dnl Copyright �� 2012-2015 Dan Nicholson <dbn.lists(a)gmail.com>
@@ -112,7 +112,7 @@ dnl
dnl See the "Since" comment for each macro you use to see what version
dnl of the macros you require.
m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.1])
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
])dnl PKG_PREREQ
@@ -157,7 +157,7 @@ dnl Check to see whether a particular set of modules exists. Similar to
dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
dnl
dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-dnl only at the first occurence in configure.ac, so if the first place
+dnl only at the first occurrence in configure.ac, so if the first place
dnl it's called might be skipped (such as if it is within an "if", you
dnl have to call PKG_CHECK_EXISTS manually
AC_DEFUN([PKG_CHECK_EXISTS],
@@ -213,7 +213,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
-AC_MSG_CHECKING([for $1])
+AC_MSG_CHECKING([for $2])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -223,17 +223,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
- else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
- m4_default([$4], [AC_MSG_ERROR(
+ m4_default([$4], [AC_MSG_ERROR(
[Package requirements ($2) were not met:
$$1_PKG_ERRORS
@@ -244,8 +244,8 @@ installed software in a non-standard prefix.
_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
- AC_MSG_RESULT([no])
- m4_default([$4], [AC_MSG_FAILURE(
+ AC_MSG_RESULT([no])
+ m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -255,10 +255,10 @@ _PKG_TEXT
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
])
else
- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes])
- $3
+ $3
fi[]dnl
])dnl PKG_CHECK_MODULES
diff --git a/configure b/configure
index 7f50d6fe3..75ceade03 100755
--- a/configure
+++ b/configure
@@ -967,7 +967,6 @@ enable_use_lvmlockd
with_lvmlockd_pidfile
enable_use_lvmpolld
with_lvmpolld_pidfile
-enable_dmfilemapd
enable_notify_dbus
enable_systemd_journal
enable_app_machineid
@@ -990,6 +989,7 @@ enable_fsadm
enable_lvmimportvdo
enable_blkdeactivate
enable_dmeventd
+enable_dmfilemapd
enable_selinux
enable_blkzeroout
enable_nls
@@ -1706,7 +1706,6 @@ Optional Features:
--enable-lvmlockd-idm enable the LVM lock daemon using idm
--disable-use-lvmlockd disable usage of LVM lock daemon
--disable-use-lvmpolld disable usage of LVM Poll Daemon
- --enable-dmfilemapd enable the dmstats filemap daemon
--enable-notify-dbus enable LVM notification using dbus
--disable-systemd-journal
disable LVM systemd journaling
@@ -1729,6 +1728,7 @@ Optional Features:
--disable-lvmimportvdo disable lvm_import_vdo
--disable-blkdeactivate disable blkdeactivate
--enable-dmeventd enable the device-mapper event daemon
+ --enable-dmfilemapd enable the dmstats filemap daemon
--disable-selinux disable selinux support
--disable-blkzeroout do not use BLKZEROOUT for device zeroing
--enable-nls enable Native Language Support
@@ -11206,8 +11206,8 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CPG" >&5
-printf %s "checking for CPG... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcpg" >&5
+printf %s "checking for libcpg... " >&6; }
if test -n "$CPG_CFLAGS"; then
pkg_cv_CPG_CFLAGS="$CPG_CFLAGS"
@@ -11247,7 +11247,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -11256,14 +11256,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- CPG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcpg" 2>&1`
+ CPG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcpg" 2>&1`
else
- CPG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcpg" 2>&1`
+ CPG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcpg" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$CPG_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$CPG_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libcpg) were not met:
+ as_fn_error $? "Package requirements (libcpg) were not met:
$CPG_PKG_ERRORS
@@ -11274,9 +11274,9 @@ Alternatively, you may set the environment variables CPG_CFLAGS
and CPG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -11289,8 +11289,8 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- CPG_CFLAGS=$pkg_cv_CPG_CFLAGS
- CPG_LIBS=$pkg_cv_CPG_LIBS
+ CPG_CFLAGS=$pkg_cv_CPG_CFLAGS
+ CPG_LIBS=$pkg_cv_CPG_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
@@ -11888,8 +11888,8 @@ printf "%s\n" "$VALGRIND_POOL" >&6; }
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for VALGRIND" >&5
-printf %s "checking for VALGRIND... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for valgrind" >&5
+printf %s "checking for valgrind... " >&6; }
if test -n "$VALGRIND_CFLAGS"; then
pkg_cv_VALGRIND_CFLAGS="$VALGRIND_CFLAGS"
@@ -11929,7 +11929,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -11938,12 +11938,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- VALGRIND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "valgrind" 2>&1`
+ VALGRIND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "valgrind" 2>&1`
else
- VALGRIND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "valgrind" 2>&1`
+ VALGRIND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "valgrind" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$VALGRIND_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$VALGRIND_PKG_ERRORS" >&5
if test "$VALGRIND_POOL" = "yes"
@@ -11952,7 +11952,7 @@ then :
fi
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if test "$VALGRIND_POOL" = "yes"
@@ -11961,11 +11961,11 @@ then :
fi
else
- VALGRIND_CFLAGS=$pkg_cv_VALGRIND_CFLAGS
- VALGRIND_LIBS=$pkg_cv_VALGRIND_LIBS
+ VALGRIND_CFLAGS=$pkg_cv_VALGRIND_CFLAGS
+ VALGRIND_LIBS=$pkg_cv_VALGRIND_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- HAVE_VALGRIND="yes"
+ HAVE_VALGRIND="yes"
fi
@@ -12043,8 +12043,8 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSANLOCKCLIENT" >&5
-printf %s "checking for LIBSANLOCKCLIENT... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsanlock_client >= 3.3.0" >&5
+printf %s "checking for libsanlock_client >= 3.3.0... " >&6; }
if test -n "$LIBSANLOCKCLIENT_CFLAGS"; then
pkg_cv_LIBSANLOCKCLIENT_CFLAGS="$LIBSANLOCKCLIENT_CFLAGS"
@@ -12084,7 +12084,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -12093,14 +12093,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBSANLOCKCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsanlock_client >= 3.3.0" 2>&1`
+ LIBSANLOCKCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsanlock_client >= 3.3.0" 2>&1`
else
- LIBSANLOCKCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsanlock_client >= 3.3.0" 2>&1`
+ LIBSANLOCKCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsanlock_client >= 3.3.0" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBSANLOCKCLIENT_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBSANLOCKCLIENT_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libsanlock_client >= 3.3.0) were not met:
+ as_fn_error $? "Package requirements (libsanlock_client >= 3.3.0) were not met:
$LIBSANLOCKCLIENT_PKG_ERRORS
@@ -12111,9 +12111,9 @@ Alternatively, you may set the environment variables LIBSANLOCKCLIENT_CFLAGS
and LIBSANLOCKCLIENT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -12126,11 +12126,11 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- LIBSANLOCKCLIENT_CFLAGS=$pkg_cv_LIBSANLOCKCLIENT_CFLAGS
- LIBSANLOCKCLIENT_LIBS=$pkg_cv_LIBSANLOCKCLIENT_LIBS
+ LIBSANLOCKCLIENT_CFLAGS=$pkg_cv_LIBSANLOCKCLIENT_CFLAGS
+ LIBSANLOCKCLIENT_LIBS=$pkg_cv_LIBSANLOCKCLIENT_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- BUILD_LVMLOCKD="yes"
+ BUILD_LVMLOCKD="yes"
fi
printf "%s\n" "#define LOCKDSANLOCK_SUPPORT 1" >>confdefs.h
@@ -12157,8 +12157,8 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBDLM" >&5
-printf %s "checking for LIBDLM... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libdlm_lt" >&5
+printf %s "checking for libdlm_lt... " >&6; }
if test -n "$LIBDLM_CFLAGS"; then
pkg_cv_LIBDLM_CFLAGS="$LIBDLM_CFLAGS"
@@ -12198,7 +12198,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -12207,14 +12207,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBDLM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlm_lt" 2>&1`
+ LIBDLM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlm_lt" 2>&1`
else
- LIBDLM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlm_lt" 2>&1`
+ LIBDLM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlm_lt" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBDLM_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBDLM_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libdlm_lt) were not met:
+ as_fn_error $? "Package requirements (libdlm_lt) were not met:
$LIBDLM_PKG_ERRORS
@@ -12225,9 +12225,9 @@ Alternatively, you may set the environment variables LIBDLM_CFLAGS
and LIBDLM_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -12240,11 +12240,11 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- LIBDLM_CFLAGS=$pkg_cv_LIBDLM_CFLAGS
- LIBDLM_LIBS=$pkg_cv_LIBDLM_LIBS
+ LIBDLM_CFLAGS=$pkg_cv_LIBDLM_CFLAGS
+ LIBDLM_LIBS=$pkg_cv_LIBDLM_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- BUILD_LVMLOCKD="yes"
+ BUILD_LVMLOCKD="yes"
fi
printf "%s\n" "#define LOCKDDLM_SUPPORT 1" >>confdefs.h
@@ -12280,8 +12280,8 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBDLMCONTROL" >&5
-printf %s "checking for LIBDLMCONTROL... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libdlmcontrol >= 3.2" >&5
+printf %s "checking for libdlmcontrol >= 3.2... " >&6; }
if test -n "$LIBDLMCONTROL_CFLAGS"; then
pkg_cv_LIBDLMCONTROL_CFLAGS="$LIBDLMCONTROL_CFLAGS"
@@ -12321,7 +12321,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -12330,14 +12330,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBDLMCONTROL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlmcontrol >= 3.2" 2>&1`
+ LIBDLMCONTROL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlmcontrol >= 3.2" 2>&1`
else
- LIBDLMCONTROL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlmcontrol >= 3.2" 2>&1`
+ LIBDLMCONTROL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlmcontrol >= 3.2" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBDLMCONTROL_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBDLMCONTROL_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libdlmcontrol >= 3.2) were not met:
+ as_fn_error $? "Package requirements (libdlmcontrol >= 3.2) were not met:
$LIBDLMCONTROL_PKG_ERRORS
@@ -12348,9 +12348,9 @@ Alternatively, you may set the environment variables LIBDLMCONTROL_CFLAGS
and LIBDLMCONTROL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -12363,11 +12363,11 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- LIBDLMCONTROL_CFLAGS=$pkg_cv_LIBDLMCONTROL_CFLAGS
- LIBDLMCONTROL_LIBS=$pkg_cv_LIBDLMCONTROL_LIBS
+ LIBDLMCONTROL_CFLAGS=$pkg_cv_LIBDLMCONTROL_CFLAGS
+ LIBDLMCONTROL_LIBS=$pkg_cv_LIBDLMCONTROL_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- BUILD_LVMLOCKD="yes"
+ BUILD_LVMLOCKD="yes"
fi
printf "%s\n" "#define LOCKDDLM_CONTROL_SUPPORT 1" >>confdefs.h
@@ -12401,8 +12401,8 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSEAGATEILM" >&5
-printf %s "checking for LIBSEAGATEILM... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libseagate_ilm >= 0.1.0" >&5
+printf %s "checking for libseagate_ilm >= 0.1.0... " >&6; }
if test -n "$LIBSEAGATEILM_CFLAGS"; then
pkg_cv_LIBSEAGATEILM_CFLAGS="$LIBSEAGATEILM_CFLAGS"
@@ -12442,7 +12442,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -12451,14 +12451,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBSEAGATEILM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libseagate_ilm >= 0.1.0" 2>&1`
+ LIBSEAGATEILM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libseagate_ilm >= 0.1.0" 2>&1`
else
- LIBSEAGATEILM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libseagate_ilm >= 0.1.0" 2>&1`
+ LIBSEAGATEILM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libseagate_ilm >= 0.1.0" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBSEAGATEILM_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBSEAGATEILM_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libseagate_ilm >= 0.1.0) were not met:
+ as_fn_error $? "Package requirements (libseagate_ilm >= 0.1.0) were not met:
$LIBSEAGATEILM_PKG_ERRORS
@@ -12469,9 +12469,9 @@ Alternatively, you may set the environment variables LIBSEAGATEILM_CFLAGS
and LIBSEAGATEILM_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -12484,11 +12484,11 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- LIBSEAGATEILM_CFLAGS=$pkg_cv_LIBSEAGATEILM_CFLAGS
- LIBSEAGATEILM_LIBS=$pkg_cv_LIBSEAGATEILM_LIBS
+ LIBSEAGATEILM_CFLAGS=$pkg_cv_LIBSEAGATEILM_CFLAGS
+ LIBSEAGATEILM_LIBS=$pkg_cv_LIBSEAGATEILM_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- BUILD_LVMLOCKD="yes"
+ BUILD_LVMLOCKD="yes"
fi
printf "%s\n" "#define LOCKDIDM_SUPPORT 1" >>confdefs.h
@@ -12510,6 +12510,7 @@ printf %s "checking whether to build lvmlockd... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_LVMLOCKD" >&5
printf "%s\n" "$BUILD_LVMLOCKD" >&6; }
+DEFAULT_USE_LVMLOCKD=0
if test "$BUILD_LVMLOCKD" = "yes"
then :
@@ -12527,16 +12528,15 @@ printf %s "checking defaults for use_lvmlockd... " >&6; }
# Check whether --enable-use_lvmlockd was given.
if test ${enable_use_lvmlockd+y}
then :
- enableval=$enable_use_lvmlockd; if test "$enableval" = "yes"
-then :
- DEFAULT_USE_LVMLOCKD=1
+ enableval=$enable_use_lvmlockd; use_lvmlockd=$enableval
else $as_nop
- DEFAULT_USE_LVMLOCKD=0
+ use_lvmlockd="yes"
fi
-else $as_nop
+
+ if test "$use_lvmlockd" = "yes"
+then :
DEFAULT_USE_LVMLOCKD=1
fi
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DEFAULT_USE_LVMLOCKD" >&5
printf "%s\n" "$DEFAULT_USE_LVMLOCKD" >&6; }
@@ -12556,16 +12556,13 @@ fi
printf "%s\n" "#define LVMLOCKD_PIDFILE \"$LVMLOCKD_PIDFILE\"" >>confdefs.h
-else $as_nop
-
- DEFAULT_USE_LVMLOCKD=0
-
fi
printf "%s\n" "#define DEFAULT_USE_LVMLOCKD $DEFAULT_USE_LVMLOCKD" >>confdefs.h
################################################################################
+DEFAULT_USE_LVMPOLLD=0
if test "$BUILD_LVMPOLLD" = "yes"
then :
@@ -12574,16 +12571,15 @@ printf %s "checking defaults for use_lvmpolld... " >&6; }
# Check whether --enable-use_lvmpolld was given.
if test ${enable_use_lvmpolld+y}
then :
- enableval=$enable_use_lvmpolld; if test "$enableval" = "yes"
-then :
- DEFAULT_USE_LVMPOLLD=1
+ enableval=$enable_use_lvmpolld; use_lvmpolld=$enableval
else $as_nop
- DEFAULT_USE_LVMPOLLD=0
+ use_lvmpolld="yes"
fi
-else $as_nop
+
+ if test "$use_lvmpolld" = "yes"
+then :
DEFAULT_USE_LVMPOLLD=1
fi
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DEFAULT_USE_LVMPOLLD" >&5
printf "%s\n" "$DEFAULT_USE_LVMPOLLD" >&6; }
@@ -12603,79 +12599,45 @@ fi
printf "%s\n" "#define LVMPOLLD_PIDFILE \"$LVMPOLLD_PIDFILE\"" >>confdefs.h
-else $as_nop
-
- DEFAULT_USE_LVMPOLLD=0
-
fi
printf "%s\n" "#define DEFAULT_USE_LVMPOLLD $DEFAULT_USE_LVMPOLLD" >>confdefs.h
-################################################################################
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build dmfilemapd" >&5
-printf %s "checking whether to build dmfilemapd... " >&6; }
-# Check whether --enable-dmfilemapd was given.
-if test ${enable_dmfilemapd+y}
-then :
- enableval=$enable_dmfilemapd; BUILD_DMFILEMAPD=$enableval
-else $as_nop
- BUILD_DMFILEMAPD="no"
-fi
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_DMFILEMAPD" >&5
-printf "%s\n" "$BUILD_DMFILEMAPD" >&6; }
-
-printf "%s\n" "#define DMFILEMAPD \$BUILD_DMFILEMAPD" >>confdefs.h
-
-
-if test "$BUILD_DMFILEMAPD" = "yes"
-then :
-
- ac_fn_c_check_header_compile "$LINENO" "linux/fiemap.h" "ac_cv_header_linux_fiemap_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_fiemap_h" = xyes
-then :
-
-else $as_nop
- as_fn_error $? "--enable-dmfilemapd requires fiemap.h" "$LINENO" 5
-fi
-
-
-fi
SYSTEMD_MIN_VERSION=0
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 205\""; } >&5
- ($PKG_CONFIG --exists --print-errors "systemd >= 205") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 221\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "systemd >= 221") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- SYSTEMD_MIN_VERSION=205
+ SYSTEMD_MIN_VERSION=221
fi
-
-################################################################################
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 221\""; } >&5
- ($PKG_CONFIG --exists --print-errors "systemd >= 221") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 234\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "systemd >= 234") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- SYSTEMD_MIN_VERSION=221
+ SYSTEMD_MIN_VERSION=234
fi
+
+################################################################################
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build notifydbus" >&5
printf %s "checking whether to build notifydbus... " >&6; }
# Check whether --enable-notify-dbus was given.
if test ${enable_notify_dbus+y}
then :
- enableval=$enable_notify_dbus; if test "$enableval" = "yes" && test "$SYSTEMD_MIN_VERSION" -lt 221
-then :
- as_fn_error $? "Enabling notify-dbus requires systemd >= 221" "$LINENO" 5
-fi
- NOTIFYDBUS_SUPPORT=$enableval
+ enableval=$enable_notify_dbus; NOTIFYDBUS_SUPPORT=$enableval
else $as_nop
NOTIFYDBUS_SUPPORT="no"
fi
+if test "$NOTIFYDBUS_SUPPORT" = "yes" && test "$SYSTEMD_MIN_VERSION" -lt 221
+then :
+ as_fn_error $? "Enabling notify-dbus requires systemd >= 221" "$LINENO" 5
+fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NOTIFYDBUS_SUPPORT" >&5
printf "%s\n" "$NOTIFYDBUS_SUPPORT" >&6; }
@@ -12727,14 +12689,10 @@ printf "%s\n" "#define SYSTEMD_JOURNAL_SUPPORT 1" >>confdefs.h
fi
################################################################################
-if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 234\""; } >&5
- ($PKG_CONFIG --exists --print-errors "systemd >= 234") 2>&5
- ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- SYSTEMD_MIN_VERSION=234 APP_MACHINEID_SUPPORT="maybe"
-else
+if test "$SYSTEMD_MIN_VERSION" -ge 234
+then :
+ APP_MACHINEID_SUPPORT="maybe"
+else $as_nop
APP_MACHINEID_SUPPORT="no"
fi
ac_fn_c_check_header_compile "$LINENO" "systemd/sd-id128.h" "ac_cv_header_systemd_sd_id128_h" "$ac_includes_default"
@@ -12775,8 +12733,8 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSYSTEMD" >&5
-printf %s "checking for LIBSYSTEMD... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd" >&5
+printf %s "checking for libsystemd... " >&6; }
if test -n "$LIBSYSTEMD_CFLAGS"; then
pkg_cv_LIBSYSTEMD_CFLAGS="$LIBSYSTEMD_CFLAGS"
@@ -12816,7 +12774,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -12825,14 +12783,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBSYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1`
+ LIBSYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1`
else
- LIBSYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1`
+ LIBSYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBSYSTEMD_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBSYSTEMD_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libsystemd) were not met:
+ as_fn_error $? "Package requirements (libsystemd) were not met:
$LIBSYSTEMD_PKG_ERRORS
@@ -12843,9 +12801,9 @@ Alternatively, you may set the environment variables LIBSYSTEMD_CFLAGS
and LIBSYSTEMD_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -12858,8 +12816,8 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- LIBSYSTEMD_CFLAGS=$pkg_cv_LIBSYSTEMD_CFLAGS
- LIBSYSTEMD_LIBS=$pkg_cv_LIBSYSTEMD_LIBS
+ LIBSYSTEMD_CFLAGS=$pkg_cv_LIBSYSTEMD_CFLAGS
+ LIBSYSTEMD_LIBS=$pkg_cv_LIBSYSTEMD_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
@@ -12877,7 +12835,6 @@ else $as_nop
SYSTEMD_RUN_CMD="autodetect"
fi
-
if test "$SYSTEMD_RUN_CMD" = "autodetect"
then :
if test -n "$ac_tool_prefix"; then
@@ -12988,16 +12945,15 @@ else
SYSTEMD_RUN_CMD="$ac_cv_path_SYSTEMD_RUN_CMD"
fi
- if test -z "$SYSTEMD_RUN_CMD"
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for app running udev background service" >&5
+printf %s "checking for app running udev background service... " >&6; }
+if test -z "$SYSTEMD_RUN_CMD"
then :
SYSTEMD_RUN_CMD="/usr/bin/systemd-run"
fi
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for defined systemd-run" >&5
-printf %s "checking for defined systemd-run... " >&6; }
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SYSTEMD_RUN_CMD" >&5
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SYSTEMD_RUN_CMD" >&5
printf "%s\n" "$SYSTEMD_RUN_CMD" >&6; }
-fi
################################################################################
@@ -13030,8 +12986,8 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BLKID" >&5
-printf %s "checking for BLKID... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for blkid >= 2.24" >&5
+printf %s "checking for blkid >= 2.24... " >&6; }
if test -n "$BLKID_CFLAGS"; then
pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS"
@@ -13071,7 +13027,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -13080,14 +13036,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
+ BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
else
- BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
+ BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$BLKID_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$BLKID_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (blkid >= 2.24) were not met:
+ as_fn_error $? "Package requirements (blkid >= 2.24) were not met:
$BLKID_PKG_ERRORS
@@ -13098,9 +13054,9 @@ Alternatively, you may set the environment variables BLKID_CFLAGS
and BLKID_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -13113,8 +13069,8 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- BLKID_CFLAGS=$pkg_cv_BLKID_CFLAGS
- BLKID_LIBS=$pkg_cv_BLKID_LIBS
+ BLKID_CFLAGS=$pkg_cv_BLKID_CFLAGS
+ BLKID_LIBS=$pkg_cv_BLKID_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
@@ -13218,8 +13174,8 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
-printf %s "checking for UDEV... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libudev >= 143" >&5
+printf %s "checking for libudev >= 143... " >&6; }
if test -n "$UDEV_CFLAGS"; then
pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS"
@@ -13259,7 +13215,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -13268,14 +13224,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libudev >= 143" 2>&1`
+ UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libudev >= 143" 2>&1`
else
- UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libudev >= 143" 2>&1`
+ UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libudev >= 143" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$UDEV_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$UDEV_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libudev >= 143) were not met:
+ as_fn_error $? "Package requirements (libudev >= 143) were not met:
$UDEV_PKG_ERRORS
@@ -13286,9 +13242,9 @@ Alternatively, you may set the environment variables UDEV_CFLAGS
and UDEV_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -13301,11 +13257,11 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS
- UDEV_LIBS=$pkg_cv_UDEV_LIBS
+ UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS
+ UDEV_LIBS=$pkg_cv_UDEV_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- UDEV_PC="libudev"
+ UDEV_PC="libudev"
fi
UDEV_STATIC_LIBS=$("$PKG_CONFIG" --static --libs libudev)
@@ -14191,6 +14147,34 @@ fi
printf "%s\n" "#define DMEVENTD 1" >>confdefs.h
+fi
+
+################################################################################
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build dmfilemapd" >&5
+printf %s "checking whether to build dmfilemapd... " >&6; }
+# Check whether --enable-dmfilemapd was given.
+if test ${enable_dmfilemapd+y}
+then :
+ enableval=$enable_dmfilemapd; BUILD_DMFILEMAPD=$enableval
+else $as_nop
+ BUILD_DMFILEMAPD="no"
+fi
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_DMFILEMAPD" >&5
+printf "%s\n" "$BUILD_DMFILEMAPD" >&6; }
+
+if test "$BUILD_DMFILEMAPD" = "yes"
+then :
+ ac_fn_c_check_header_compile "$LINENO" "linux/fiemap.h" "ac_cv_header_linux_fiemap_h" "as_fn_error $? "--enable-dmfilemapd requires fiemap.h" "$LINENO" 5
+"
+if test "x$ac_cv_header_linux_fiemap_h" = xyes
+then :
+
+fi
+
+
+printf "%s\n" "#define DMFILEMAPD 1" >>confdefs.h
+
fi
################################################################################
@@ -14497,8 +14481,8 @@ fi
test $ac_status = 0; }; then
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SELINUX" >&5
-printf %s "checking for SELINUX... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libselinux" >&5
+printf %s "checking for libselinux... " >&6; }
if test -n "$SELINUX_CFLAGS"; then
pkg_cv_SELINUX_CFLAGS="$SELINUX_CFLAGS"
@@ -14538,7 +14522,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -14547,14 +14531,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- SELINUX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libselinux" 2>&1`
+ SELINUX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libselinux" 2>&1`
else
- SELINUX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libselinux" 2>&1`
+ SELINUX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libselinux" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$SELINUX_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$SELINUX_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libselinux) were not met:
+ as_fn_error $? "Package requirements (libselinux) were not met:
$SELINUX_PKG_ERRORS
@@ -14565,9 +14549,9 @@ Alternatively, you may set the environment variables SELINUX_CFLAGS
and SELINUX_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -14580,11 +14564,11 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- SELINUX_CFLAGS=$pkg_cv_SELINUX_CFLAGS
- SELINUX_LIBS=$pkg_cv_SELINUX_LIBS
+ SELINUX_CFLAGS=$pkg_cv_SELINUX_CFLAGS
+ SELINUX_LIBS=$pkg_cv_SELINUX_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- SELINUX_STATIC_LIBS=$("$PKG_CONFIG" --static --libs libselinux)
+ SELINUX_STATIC_LIBS=$("$PKG_CONFIG" --static --libs libselinux)
fi
fi
@@ -14863,8 +14847,8 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EDITLINE" >&5
-printf %s "checking for EDITLINE... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libedit" >&5
+printf %s "checking for libedit... " >&6; }
if test -n "$EDITLINE_CFLAGS"; then
pkg_cv_EDITLINE_CFLAGS="$EDITLINE_CFLAGS"
@@ -14904,7 +14888,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -14913,23 +14897,23 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- EDITLINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libedit" 2>&1`
+ EDITLINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libedit" 2>&1`
else
- EDITLINE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libedit" 2>&1`
+ EDITLINE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libedit" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$EDITLINE_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$EDITLINE_PKG_ERRORS" >&5
- as_fn_error $? "libedit could not be found which is required for the --enable-editline option." "$LINENO" 5
+ as_fn_error $? "libedit could not be found which is required for the --enable-editline option." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- as_fn_error $? "libedit could not be found which is required for the --enable-editline option." "$LINENO" 5
+ as_fn_error $? "libedit could not be found which is required for the --enable-editline option." "$LINENO" 5
else
- EDITLINE_CFLAGS=$pkg_cv_EDITLINE_CFLAGS
- EDITLINE_LIBS=$pkg_cv_EDITLINE_LIBS
+ EDITLINE_CFLAGS=$pkg_cv_EDITLINE_CFLAGS
+ EDITLINE_LIBS=$pkg_cv_EDITLINE_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
@@ -15377,7 +15361,6 @@ fi
if test -z "$with_systemdsystemunitdir"
then :
-
if test -n "$systemdsystemunitdir"; then
pkg_cv_systemdsystemunitdir="$systemdsystemunitdir"
elif test -n "$PKG_CONFIG"; then
@@ -15399,15 +15382,10 @@ systemdsystemunitdir=$pkg_cv_systemdsystemunitdir
if test "x$systemdsystemunitdir" = x""
then :
-
- systemdsystemunitdir='${exec_prefix}/lib/systemd/system'
-
+ systemdsystemunitdir='${exec_prefix}/lib/systemd/system'
fi
-
else $as_nop
-
- systemdsystemunitdir="$with_systemdsystemunitdir"
-
+ systemdsystemunitdir="$with_systemdsystemunitdir"
fi
@@ -15432,9 +15410,7 @@ systemdutildir=$pkg_cv_systemdutildir
if test "x$systemdutildir" = x""
then :
-
- systemdutildir='${exec_prefix}/lib/systemd'
-
+ systemdutildir='${exec_prefix}/lib/systemd'
fi
################################################################################
@@ -16045,19 +16021,19 @@ DEFAULT_SYS_LOCK_DIR="$RUN_DIR/lock"
test -d "$DEFAULT_SYS_LOCK_DIR" || DEFAULT_SYS_LOCK_DIR="/var/lock"
# Support configurable locking subdir for lvm
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for default lock directory" >&5
+printf %s "checking for default lock directory... " >&6; }
# Check whether --with-default-locking-dir was given.
if test ${with_default_locking_dir+y}
then :
withval=$with_default_locking_dir; DEFAULT_LOCK_DIR=$withval
else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for default lock directory" >&5
-printf %s "checking for default lock directory... " >&6; }
- DEFAULT_LOCK_DIR="$DEFAULT_SYS_LOCK_DIR/lvm"
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DEFAULT_LOCK_DIR" >&5
-printf "%s\n" "$DEFAULT_LOCK_DIR" >&6; }
+ DEFAULT_LOCK_DIR="$DEFAULT_SYS_LOCK_DIR/lvm"
fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DEFAULT_LOCK_DIR" >&5
+printf "%s\n" "$DEFAULT_LOCK_DIR" >&6; }
printf "%s\n" "#define DEFAULT_LOCK_DIR \"$DEFAULT_LOCK_DIR\"" >>confdefs.h
1 year, 2 months
- 1
- 0
main - configure.ac: print locking dir
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0f2c48a10e6085d483d...
Commit: 0f2c48a10e6085d483d560277b9d582835582ec4
Parent: 51117b579350e2e44e3dae72642010a18b8506b1
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Feb 28 23:13:00 2023 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Apr 6 11:06:04 2023 +0200
configure.ac: print locking dir
Correcting output results from configure script when
printing locking dir.
Shuffle dmfilemapd close to dmeventd option and tracing.
Couple indent changes.
---
configure.ac | 92 +++++++++++++++++++++++++++---------------------------------
1 file changed, 42 insertions(+), 50 deletions(-)
diff --git a/configure.ac b/configure.ac
index eed25d4db..efe5176db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -964,14 +964,15 @@ dnl -- Build lvmlockd
AC_MSG_CHECKING([whether to build lvmlockd])
AC_MSG_RESULT([$BUILD_LVMLOCKD])
+DEFAULT_USE_LVMLOCKD=0
AS_IF([test "$BUILD_LVMLOCKD" = "yes"], [
AS_IF([test "$LVMPOLLD" = "no"], [AC_MSG_ERROR([cannot build lvmlockd with --disable-lvmpolld.])])
AS_IF([test "$BUILD_LVMPOLLD" = "no"], [BUILD_LVMPOLLD=yes; AC_MSG_WARN([Enabling lvmpolld - required by lvmlockd.])])
AC_MSG_CHECKING([defaults for use_lvmlockd])
AC_ARG_ENABLE(use_lvmlockd,
- [AS_HELP_STRING([--disable-use-lvmlockd], [disable usage of LVM lock daemon])],
- [AS_IF([test "$enableval" = "yes"], [DEFAULT_USE_LVMLOCKD=1], [DEFAULT_USE_LVMLOCKD=0])],
- [DEFAULT_USE_LVMLOCKD=1])
+ [AS_HELP_STRING([--disable-use-lvmlockd], [disable usage of LVM lock daemon])],
+ [use_lvmlockd=$enableval],[use_lvmlockd="yes"])
+ AS_IF([test "$use_lvmlockd" = "yes"], [DEFAULT_USE_LVMLOCKD=1])
AC_MSG_RESULT([$DEFAULT_USE_LVMLOCKD])
AC_DEFINE([LVMLOCKD_SUPPORT], 1, [Define to 1 to include code that uses lvmlockd.])
@@ -982,20 +983,19 @@ AS_IF([test "$BUILD_LVMLOCKD" = "yes"], [
LVMLOCKD_PIDFILE="$DEFAULT_PID_DIR/lvmlockd.pid")
AC_DEFINE_UNQUOTED(LVMLOCKD_PIDFILE, ["$LVMLOCKD_PIDFILE"],
[Path to lvmlockd pidfile.])
-], [
- DEFAULT_USE_LVMLOCKD=0
])
AC_DEFINE_UNQUOTED(DEFAULT_USE_LVMLOCKD, [$DEFAULT_USE_LVMLOCKD],
[Use lvmlockd by default.])
################################################################################
dnl -- Check lvmpolld
+DEFAULT_USE_LVMPOLLD=0
AS_IF([test "$BUILD_LVMPOLLD" = "yes"], [
AC_MSG_CHECKING([defaults for use_lvmpolld])
AC_ARG_ENABLE(use_lvmpolld,
- [AS_HELP_STRING([--disable-use-lvmpolld], [disable usage of LVM Poll Daemon])],
- [AS_IF([test "$enableval" = "yes"], [DEFAULT_USE_LVMPOLLD=1], [DEFAULT_USE_LVMPOLLD=0])],
- [DEFAULT_USE_LVMPOLLD=1])
+ [AS_HELP_STRING([--disable-use-lvmpolld], [disable usage of LVM Poll Daemon])],
+ [use_lvmpolld=$enableval], [use_lvmpolld="yes"])
+ AS_IF([test "$use_lvmpolld" = "yes"], [DEFAULT_USE_LVMPOLLD=1])
AC_MSG_RESULT([$DEFAULT_USE_LVMPOLLD])
AC_DEFINE([LVMPOLLD_SUPPORT], 1, [Define to 1 to include code that uses lvmpolld.])
@@ -1006,39 +1006,24 @@ AS_IF([test "$BUILD_LVMPOLLD" = "yes"], [
LVMPOLLD_PIDFILE="$DEFAULT_PID_DIR/lvmpolld.pid")
AC_DEFINE_UNQUOTED(LVMPOLLD_PIDFILE, ["$LVMPOLLD_PIDFILE"],
[Path to lvmpolld pidfile.])
-], [
- DEFAULT_USE_LVMPOLLD=0
])
AC_DEFINE_UNQUOTED(DEFAULT_USE_LVMPOLLD, [$DEFAULT_USE_LVMPOLLD],
[Use lvmpolld by default.])
-################################################################################
-dnl -- Check dmfilemapd
-AC_MSG_CHECKING([whether to build dmfilemapd])
-AC_ARG_ENABLE(dmfilemapd, AS_HELP_STRING([--enable-dmfilemapd],
- [enable the dmstats filemap daemon]),
- BUILD_DMFILEMAPD=$enableval, BUILD_DMFILEMAPD="no")
-AC_MSG_RESULT([$BUILD_DMFILEMAPD])
-AC_DEFINE([DMFILEMAPD], $BUILD_DMFILEMAPD, [Define to 1 to enable the device-mapper filemap daemon.])
-
-dnl -- dmfilemapd requires FIEMAP
-AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [
- AC_CHECK_HEADER([linux/fiemap.h], , [AC_MSG_ERROR(--enable-dmfilemapd requires fiemap.h)])
-])
SYSTEMD_MIN_VERSION=0
-PKG_CHECK_EXISTS(systemd >= 205, [SYSTEMD_MIN_VERSION=205], [])
+PKG_CHECK_EXISTS(systemd >= 221, [SYSTEMD_MIN_VERSION=221])
+PKG_CHECK_EXISTS(systemd >= 234, [SYSTEMD_MIN_VERSION=234])
################################################################################
dnl -- Build notifydbus
-PKG_CHECK_EXISTS(systemd >= 221, [SYSTEMD_MIN_VERSION=221], [])
AC_MSG_CHECKING([whether to build notifydbus])
AC_ARG_ENABLE(notify-dbus,
AS_HELP_STRING([--enable-notify-dbus],
[enable LVM notification using dbus]),
- AS_IF([test "$enableval" = "yes" && test "$SYSTEMD_MIN_VERSION" -lt 221],
- AC_MSG_ERROR([Enabling notify-dbus requires systemd >= 221]))
NOTIFYDBUS_SUPPORT=$enableval, NOTIFYDBUS_SUPPORT="no")
+AS_IF([test "$NOTIFYDBUS_SUPPORT" = "yes" && test "$SYSTEMD_MIN_VERSION" -lt 221],
+ [AC_MSG_ERROR([Enabling notify-dbus requires systemd >= 221])])
AC_MSG_RESULT([$NOTIFYDBUS_SUPPORT])
AS_IF([test "$NOTIFYDBUS_SUPPORT" = "yes"],
@@ -1064,7 +1049,7 @@ AS_IF([test "$SYSTEMD_JOURNAL_SUPPORT" = "yes"],
################################################################################
dnl -- Build appmachineid when header file sd-id128.h is present
-PKG_CHECK_EXISTS(systemd >= 234, [SYSTEMD_MIN_VERSION=234 APP_MACHINEID_SUPPORT="maybe"], [APP_MACHINEID_SUPPORT="no"])
+AS_IF([test "$SYSTEMD_MIN_VERSION" -ge 234], [APP_MACHINEID_SUPPORT="maybe"], [APP_MACHINEID_SUPPORT="no"])
AC_CHECK_HEADER([systemd/sd-id128.h],
[AS_IF([test "$APP_MACHINEID_SUPPORT" != "no"], [APP_MACHINEID_SUPPORT="yes"])],
[APP_MACHINEID_SUPPORT="no"])
@@ -1091,12 +1076,10 @@ AC_ARG_WITH(systemd-run,
AS_HELP_STRING([--with-systemd-run=PATH],
[systemd-run tool: [autodetect]]),
SYSTEMD_RUN_CMD=$withval, SYSTEMD_RUN_CMD="autodetect")
-
-AS_IF([test "$SYSTEMD_RUN_CMD" = "autodetect"],
- [AC_PATH_TOOL(SYSTEMD_RUN_CMD, systemd-run)
- AS_IF([test -z "$SYSTEMD_RUN_CMD"], [SYSTEMD_RUN_CMD="/usr/bin/systemd-run"])],
- [AC_MSG_CHECKING([for defined systemd-run])
- AC_MSG_RESULT([$SYSTEMD_RUN_CMD])])
+AS_IF([test "$SYSTEMD_RUN_CMD" = "autodetect"], [AC_PATH_TOOL(SYSTEMD_RUN_CMD, systemd-run)])
+AC_MSG_CHECKING([for app running udev background service])
+AS_IF([test -z "$SYSTEMD_RUN_CMD"], [SYSTEMD_RUN_CMD="/usr/bin/systemd-run"])
+AC_MSG_RESULT([$SYSTEMD_RUN_CMD])
################################################################################
@@ -1329,11 +1312,25 @@ AS_IF([test "$BUILD_DMEVENTD" = "yes"], [
AC_DEFINE([DMEVENTD], 1, [Define to 1 to enable the device-mapper event daemon.])
])
+################################################################################
+dnl -- Check dmfilemapd
+AC_MSG_CHECKING([whether to build dmfilemapd])
+AC_ARG_ENABLE(dmfilemapd, AS_HELP_STRING([--enable-dmfilemapd],
+ [enable the dmstats filemap daemon]),
+ BUILD_DMFILEMAPD=$enableval, BUILD_DMFILEMAPD="no")
+AC_MSG_RESULT([$BUILD_DMFILEMAPD])
+
+dnl -- dmfilemapd requires FIEMAP
+AS_IF([test "$BUILD_DMFILEMAPD" = "yes"],
+ [AC_CHECK_HEADER([linux/fiemap.h], [],
+ ,[AC_MSG_ERROR(--enable-dmfilemapd requires fiemap.h)])
+ AC_DEFINE([DMFILEMAPD], 1, [Define to 1 to enable the device-mapper filemap daemon.])])
+
################################################################################
dnl -- getline included in recent libc
-AC_CHECK_LIB(c, getline, AC_DEFINE([HAVE_GETLINE], 1,
- [Define to 1 if getline is available.]))
+AC_CHECK_LIB(c, getline,
+ [AC_DEFINE([HAVE_GETLINE], 1, [Define to 1 if getline is available.])])
################################################################################
dnl -- canonicalize_file_name included in recent libc
@@ -1586,17 +1583,13 @@ AC_ARG_WITH(systemdsystemunitdir,
AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
[systemd service files in DIR]))
-AS_IF([test -z "$with_systemdsystemunitdir"], [
- PKG_CHECK_VAR([systemdsystemunitdir], [systemd], [systemdsystemunitdir], [], [
- systemdsystemunitdir='${exec_prefix}/lib/systemd/system'
- ])
-], [
- systemdsystemunitdir="$with_systemdsystemunitdir"
-])
+AS_IF([test -z "$with_systemdsystemunitdir"],
+ [PKG_CHECK_VAR([systemdsystemunitdir], [systemd], [systemdsystemunitdir], [],
+ [systemdsystemunitdir='${exec_prefix}/lib/systemd/system'])],
+ [systemdsystemunitdir="$with_systemdsystemunitdir"])
-PKG_CHECK_VAR([systemdutildir], [systemd], [systemdutildir], [], [
- systemdutildir='${exec_prefix}/lib/systemd'
-])
+PKG_CHECK_VAR([systemdutildir], [systemd], [systemdutildir], [],
+ [systemdutildir='${exec_prefix}/lib/systemd'])
################################################################################
AC_ARG_WITH(tmpfilesdir,
@@ -1744,13 +1737,12 @@ DEFAULT_SYS_LOCK_DIR="$RUN_DIR/lock"
test -d "$DEFAULT_SYS_LOCK_DIR" || DEFAULT_SYS_LOCK_DIR="/var/lock"
# Support configurable locking subdir for lvm
+AC_MSG_CHECKING([for default lock directory])
AC_ARG_WITH(default-locking-dir,
AS_HELP_STRING([--with-default-locking-dir=DIR],
[default locking directory [autodetect_lock_dir/lvm]]),
- DEFAULT_LOCK_DIR=$withval,
- [AC_MSG_CHECKING([for default lock directory])
- DEFAULT_LOCK_DIR="$DEFAULT_SYS_LOCK_DIR/lvm"
- AC_MSG_RESULT([$DEFAULT_LOCK_DIR])])
+ [DEFAULT_LOCK_DIR=$withval], [DEFAULT_LOCK_DIR="$DEFAULT_SYS_LOCK_DIR/lvm"])
+AC_MSG_RESULT([$DEFAULT_LOCK_DIR])
AC_DEFINE_UNQUOTED(DEFAULT_LOCK_DIR, ["$DEFAULT_LOCK_DIR"],
[Name of default locking directory.])
1 year, 2 months
- 1
- 0
main - integrity: hide creation of internal LVs
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=51117b579350e2e44e3...
Commit: 51117b579350e2e44e3dae72642010a18b8506b1
Parent: 390ff5be2fd9dda47f2bfd2db96de64acc925002
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Feb 25 20:29:05 2023 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Apr 6 11:06:04 2023 +0200
integrity: hide creation of internal LVs
Creation of 'hidden' local LVs should be visible only in
verbose mode (-v) when creating a raid LV with integrity.
---
lib/metadata/integrity_manip.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/metadata/integrity_manip.c b/lib/metadata/integrity_manip.c
index e9895b836..ffb869b08 100644
--- a/lib/metadata/integrity_manip.c
+++ b/lib/metadata/integrity_manip.c
@@ -99,6 +99,7 @@ static int _lv_create_integrity_metadata(struct cmd_context *cmd,
.read_ahead = DM_READ_AHEAD_NONE,
.stripes = 1,
.vg_name = vg->name,
+ .temporary = 1,
.zero = 0,
.wipe_signatures = 0,
.suppress_zero_warn = 1,
@@ -118,8 +119,8 @@ static int _lv_create_integrity_metadata(struct cmd_context *cmd,
meta_sectors = meta_bytes / 512;
lp_meta.extents = meta_sectors / vg->extent_size;
- log_print_unless_silent("Creating integrity metadata LV %s with size %s.",
- metaname, display_size(cmd, meta_sectors));
+ log_verbose("Creating integrity metadata LV %s with size %s.",
+ metaname, display_size(cmd, meta_sectors));
dm_list_init(&lp_meta.tags);
1 year, 2 months
- 1
- 0
main - raidintegrity: allow writecache and cache
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=390ff5be2fd9dda47f2...
Commit: 390ff5be2fd9dda47f2bfd2db96de64acc925002
Parent: ebbc3f7ab31e8026499bddd93cde4db4921d2132
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Mar 17 16:39:48 2023 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Apr 5 14:24:07 2023 -0500
raidintegrity: allow writecache and cache
Allow writecache|cache over raid+integrity LV.
---
lib/metadata/snapshot_manip.c | 9 +
test/shell/integrity-caching.sh | 561 ++++++++++++++++++++++++++++++++++++++++
tools/command-lines.in | 5 -
tools/pvmove.c | 8 +
4 files changed, 578 insertions(+), 5 deletions(-)
diff --git a/lib/metadata/snapshot_manip.c b/lib/metadata/snapshot_manip.c
index 99eb9c30d..822b8da77 100644
--- a/lib/metadata/snapshot_manip.c
+++ b/lib/metadata/snapshot_manip.c
@@ -391,6 +391,14 @@ int validate_snapshot_origin(const struct logical_volume *origin_lv)
{
const char *err = NULL; /* For error string */
+ if (lv_is_cache(origin_lv) || lv_is_writecache(origin_lv)) {
+ struct logical_volume *lv = seg_lv(first_seg(origin_lv), 0);
+ if (lv_is_raid(lv) && lv_raid_has_integrity(lv)) {
+ err = "raid with integrity";
+ goto out;
+ }
+ }
+
if (lv_is_cow(origin_lv))
err = "snapshots";
else if (lv_is_locked(origin_lv))
@@ -419,6 +427,7 @@ int validate_snapshot_origin(const struct logical_volume *origin_lv)
err = "raid with integrity";
}
+ out:
if (err) {
log_error("Snapshots of %s are not supported.", err);
return 0;
diff --git a/test/shell/integrity-caching.sh b/test/shell/integrity-caching.sh
new file mode 100644
index 000000000..158a31932
--- /dev/null
+++ b/test/shell/integrity-caching.sh
@@ -0,0 +1,561 @@
+#!/usr/bin/env bash
+
+# Copyright (C) 2018 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+SKIP_WITH_LVMPOLLD=1
+
+. lib/inittest
+
+which mkfs.xfs || skip
+which xfs_growfs || skip
+aux have_integrity 1 5 0 || skip
+# Avoid 4K ramdisk devices on older kernels
+aux kernel_at_least 5 10 || export LVM_TEST_PREFER_BRD=0
+
+mnt="mnt"
+mkdir -p $mnt
+
+aux prepare_devs 6 80
+
+# Use awk instead of anoyingly long log out from printf
+#printf "%0.sA" {1..16384} >> fileA
+awk 'BEGIN { while (z++ < 16384) printf "A" }' > fileA
+awk 'BEGIN { while (z++ < 16384) printf "B" }' > fileB
+awk 'BEGIN { while (z++ < 16384) printf "C" }' > fileC
+
+# generate random data
+dd if=/dev/urandom of=randA bs=512K count=2
+dd if=/dev/urandom of=randB bs=512K count=3
+dd if=/dev/urandom of=randC bs=512K count=4
+
+_prepare_vg() {
+ # zero devs so we are sure to find the correct file data
+ # on the underlying devs when corrupting it
+ dd if=/dev/zero of="$dev1" bs=1M oflag=direct || true
+ dd if=/dev/zero of="$dev2" bs=1M oflag=direct || true
+ dd if=/dev/zero of="$dev3" bs=1M oflag=direct || true
+ dd if=/dev/zero of="$dev4" bs=1M oflag=direct || true
+ dd if=/dev/zero of="$dev5" bs=1M oflag=direct || true
+ vgcreate $SHARED $vg "$dev1" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6"
+ pvs
+}
+
+_test_fs_with_read_repair() {
+ mkfs.xfs -f -s size=4096 "$DM_DEV_DIR/$vg/$lv1"
+
+ mount "$DM_DEV_DIR/$vg/$lv1" $mnt
+
+ cp randA $mnt
+ cp randB $mnt
+ cp randC $mnt
+ cp fileA $mnt
+ cp fileB $mnt
+ cp fileC $mnt
+
+ # The files written above are in the writecache so reading
+ # them back later will come from the writecache and not from the
+ # corrupted dev. Write a bunch of new data to the fs to clear
+ # the original files from the writecache, so when they are read
+ # back the data will hopefully come from the underlying disk and
+ # trigger reading the corrupted data.
+ mkdir $mnt/new1
+ cat randA > $mnt/new1/randA
+ cat randB > $mnt/new1/randB
+ cat randC > $mnt/new1/randC
+ sync
+ du -h $mnt/new1
+ cp -r $mnt/new1 $mnt/new2 || true
+ cp -r $mnt/new1 $mnt/new3 || true
+ cp -r $mnt/new1 $mnt/new4 || true
+ sync
+ du -h $mnt
+ df -h
+ # hopefully fileA is no longer in the writecache.
+
+ umount $mnt
+ lvchange -an $vg/$lv1
+
+ for dev in "$@"; do
+ xxd "$dev" > dev.txt
+ # corrupt fileB
+ sed -e 's/4242 4242 4242 4242 4242 4242 4242 4242/4242 4242 4242 4242 4242 4242 4242 4243/' dev.txt > dev.bad
+ rm -f dev.txt
+ xxd -r dev.bad > "$dev"
+ rm -f dev.bad
+ done
+
+ lvchange -ay $vg/$lv1
+
+ mount "$DM_DEV_DIR/$vg/$lv1" $mnt
+
+ cmp -b $mnt/fileA fileA
+ cmp -b $mnt/fileB fileB
+ cmp -b $mnt/fileC fileC
+ umount $mnt
+}
+
+_add_new_data_to_mnt() {
+ mkfs.xfs -f -s size=4096 "$DM_DEV_DIR/$vg/$lv1"
+
+ mount "$DM_DEV_DIR/$vg/$lv1" $mnt
+
+ # add original data
+ cp randA $mnt
+ cp randB $mnt
+ cp randC $mnt
+ mkdir $mnt/1
+ cp fileA $mnt/1
+ cp fileB $mnt/1
+ cp fileC $mnt/1
+ mkdir $mnt/2
+ cp fileA $mnt/2
+ cp fileB $mnt/2
+ cp fileC $mnt/2
+}
+
+_add_more_data_to_mnt() {
+ mkdir $mnt/more
+ cp fileA $mnt/more
+ cp fileB $mnt/more
+ cp fileC $mnt/more
+ cp randA $mnt/more
+ cp randB $mnt/more
+ cp randC $mnt/more
+}
+
+_verify_data_on_mnt() {
+ cmp -b randA $mnt/randA
+ cmp -b randB $mnt/randB
+ cmp -b randC $mnt/randC
+ cmp -b fileA $mnt/1/fileA
+ cmp -b fileB $mnt/1/fileB
+ cmp -b fileC $mnt/1/fileC
+ cmp -b fileA $mnt/2/fileA
+ cmp -b fileB $mnt/2/fileB
+ cmp -b fileC $mnt/2/fileC
+}
+
+_verify_data_on_lv() {
+ lvchange -ay $vg/$lv1
+ mount "$DM_DEV_DIR/$vg/$lv1" $mnt
+ _verify_data_on_mnt
+ rm $mnt/randA
+ rm $mnt/randB
+ rm $mnt/randC
+ rm -rf $mnt/1
+ rm -rf $mnt/2
+ umount $mnt
+ lvchange -an $vg/$lv1
+}
+
+_sync_percent() {
+ local checklv=$1
+ get lv_field "$checklv" sync_percent | cut -d. -f1
+}
+
+_wait_recalc() {
+ local checklv=$1
+
+ for i in $(seq 1 10) ; do
+ sync=$(_sync_percent "$checklv")
+ echo "sync_percent is $sync"
+
+ if test "$sync" = "100"; then
+ return
+ fi
+
+ sleep 1
+ done
+
+ # TODO: There is some strange bug, first leg of RAID with integrity
+ # enabled never gets in sync. I saw this in BB, but not when executing
+ # the commands manually
+# if test -z "$sync"; then
+# echo "TEST\ WARNING: Resync of dm-integrity device '$checklv' failed"
+# dmsetup status "$DM_DEV_DIR/mapper/${checklv/\//-}"
+# exit
+# fi
+ echo "timeout waiting for recalc"
+ dmsetup status "$DM_DEV_DIR/mapper/${checklv/\//-}"
+ return 1
+}
+
+# lv1 is a raid+integrity LV
+# three variations of caching on lv1:
+#
+# 1. lvcreate --type cache-pool -n fast -l 4 $vg $dev6
+# lvconvert --type cache --cachepool fast $vg/$lv1
+#
+# 2. lvcreate --type linear -n fast -l 4 $vg $dev6
+# lvconvert --type cache --cachvol fast $vg/$lv1
+#
+# 3. lvcreate --type linear -n fast -l 4 $vg $dev6
+# lvconvert --type writecache --cachvol fast $vg/$lv1
+
+do_test() {
+
+# --cachepool | --cachevol
+local create_type=$1
+
+# cache | writecache
+local convert_type=$2
+
+# --type cache-pool | --type linear
+local convert_option=$3
+
+# corig | wcorig
+local suffix=$4
+
+_prepare_vg
+lvcreate --type raid1 -m1 --raidintegrity y -n $lv1 -l 8 $vg "$dev1" "$dev2"
+lvcreate --type $create_type -n fast -l 4 -an $vg "$dev6"
+lvconvert -y --type $convert_type $convert_option fast $vg/$lv1
+lvs -a -o name,size,segtype,devices,sync_percent $vg
+_wait_recalc $vg/${lv1}_${suffix}_rimage_0
+_wait_recalc $vg/${lv1}_${suffix}_rimage_1
+_wait_recalc $vg/${lv1}_${suffix}
+_test_fs_with_read_repair "$dev1"
+lvs -o integritymismatches $vg/${lv1}_${suffix}_rimage_0 |tee mismatch
+not grep ' 0 ' mismatch
+lvs -o integritymismatches $vg/${lv1}_${suffix} |tee mismatch
+not grep ' 0 ' mismatch
+lvchange -an $vg/$lv1
+lvconvert --raidintegrity n $vg/${lv1}_${suffix}
+lvs -a -o name,size,segtype,devices,sync_percent $vg
+lvremove $vg/$lv1
+vgremove -ff $vg
+
+_prepare_vg
+lvcreate --type raid1 -m2 --raidintegrity y -n $lv1 -l 8 $vg "$dev1" "$dev2" "$dev3"
+lvcreate --type $create_type -n fast -l 4 -an $vg "$dev6"
+lvconvert -y --type $convert_type $convert_option fast $vg/$lv1
+lvs -a -o name,size,segtype,devices,sync_percent $vg
+_wait_recalc $vg/${lv1}_${suffix}_rimage_0
+_wait_recalc $vg/${lv1}_${suffix}_rimage_1
+_wait_recalc $vg/${lv1}_${suffix}_rimage_2
+_wait_recalc $vg/${lv1}_${suffix}
+_test_fs_with_read_repair "$dev1" "$dev2"
+lvs -o integritymismatches $vg/${lv1}_${suffix}_rimage_0 |tee mismatch
+not grep ' 0 ' mismatch
+lvs -o integritymismatches $vg/${lv1}_${suffix} |tee mismatch
+not grep ' 0 ' mismatch
+lvchange -an $vg/$lv1
+lvconvert --raidintegrity n $vg/${lv1}_${suffix}
+lvconvert --splitcache $vg/$lv1
+lvremove $vg/$lv1
+vgremove -ff $vg
+
+_prepare_vg
+lvcreate --type raid5 --raidintegrity y -n $lv1 -l 8 $vg "$dev1" "$dev2" "$dev3"
+lvcreate --type $create_type -n fast -l 4 -an $vg "$dev6"
+lvconvert -y --type $convert_type $convert_option fast $vg/$lv1
+lvs -a -o name,size,segtype,devices,sync_percent $vg
+_wait_recalc $vg/${lv1}_${suffix}_rimage_0
+_wait_recalc $vg/${lv1}_${suffix}_rimage_1
+_wait_recalc $vg/${lv1}_${suffix}_rimage_2
+_wait_recalc $vg/${lv1}_${suffix}
+_test_fs_with_read_repair "$dev1" "$dev2" "$dev3"
+lvs -o integritymismatches $vg/${lv1}_${suffix}_rimage_0
+lvs -o integritymismatches $vg/${lv1}_${suffix}_rimage_1
+lvs -o integritymismatches $vg/${lv1}_${suffix}_rimage_2
+lvs -o integritymismatches $vg/${lv1}_${suffix} |tee mismatch
+not grep ' 0 ' mismatch
+lvconvert --splitcache $vg/$lv1
+lvchange -an $vg/$lv1
+lvconvert --raidintegrity n $vg/$lv1
+lvremove $vg/$lv1
+vgremove -ff $vg
+
+# Test removing integrity from an active LV
+
+_prepare_vg
+lvcreate --type raid1 -m1 --raidintegrity y -n $lv1 -l 8 $vg
+lvcreate --type $create_type -n fast -l 4 -an $vg "$dev6"
+lvconvert -y --type $convert_type $convert_option fast $vg/$lv1
+lvs -a -o name,size,segtype,devices,sync_percent $vg
+_wait_recalc $vg/${lv1}_${suffix}_rimage_0
+_wait_recalc $vg/${lv1}_${suffix}_rimage_1
+_wait_recalc $vg/${lv1}_${suffix}
+_add_new_data_to_mnt
+lvconvert --raidintegrity n $vg/${lv1}_${suffix}
+_add_more_data_to_mnt
+lvconvert --splitcache $vg/$lv1
+_verify_data_on_mnt
+umount $mnt
+lvchange -an $vg/$lv1
+_verify_data_on_lv
+lvremove $vg/$lv1
+vgremove -ff $vg
+
+# Test adding integrity to an active LV
+
+_prepare_vg
+lvcreate --type raid1 -m1 -n $lv1 -l 8 $vg
+_wait_recalc $vg/$lv1
+lvcreate --type $create_type -n fast -l 4 -an $vg "$dev6"
+lvconvert -y --type $convert_type $convert_option fast $vg/$lv1
+lvs -a -o name,size,segtype,devices,sync_percent $vg
+_add_new_data_to_mnt
+# Can only be enabled while raid is top level lv (for now.)
+not lvconvert --raidintegrity y $vg/${lv1}_${suffix}
+#_wait_recalc $vg/${lv1}_${suffix}_rimage_0
+#_wait_recalc $vg/${lv1}_${suffix}_rimage_1
+_add_more_data_to_mnt
+_verify_data_on_mnt
+umount $mnt
+lvchange -an $vg/$lv1
+_verify_data_on_lv
+lvremove $vg/$lv1
+vgremove -ff $vg
+
+# Test lvextend while inactive
+
+_prepare_vg
+lvcreate --type raid1 -m1 --raidintegrity y -n $lv1 -l 8 $vg
+_wait_recalc $vg/${lv1}_rimage_0
+_wait_recalc $vg/${lv1}_rimage_1
+_wait_recalc $vg/$lv1
+lvcreate --type $create_type -n fast -l 4 -an $vg "$dev6"
+lvconvert -y --type $convert_type $convert_option fast $vg/$lv1
+lvs -a -o name,size,segtype,devices,sync_percent $vg
+_add_new_data_to_mnt
+umount $mnt
+lvchange -an $vg/$lv1
+lvextend -l 16 $vg/$lv1
+lvchange -ay $vg/$lv1
+mount "$DM_DEV_DIR/$vg/$lv1" $mnt
+xfs_growfs $mnt
+_wait_recalc $vg/${lv1}_${suffix}_rimage_0
+_wait_recalc $vg/${lv1}_${suffix}_rimage_1
+_add_more_data_to_mnt
+_verify_data_on_mnt
+umount $mnt
+lvchange -an $vg/$lv1
+_verify_data_on_lv
+lvremove $vg/$lv1
+vgremove -ff $vg
+
+# Test lvextend while active
+
+_prepare_vg
+lvcreate --type raid1 -m1 --raidintegrity y -n $lv1 -l 8 $vg
+_wait_recalc $vg/${lv1}_rimage_0
+_wait_recalc $vg/${lv1}_rimage_1
+_wait_recalc $vg/$lv1
+lvcreate --type $create_type -n fast -l 4 -an $vg "$dev6"
+lvconvert -y --type $convert_type $convert_option fast $vg/$lv1
+lvs -a -o name,size,segtype,devices,sync_percent $vg
+_add_new_data_to_mnt
+lvextend -l 16 $vg/$lv1
+xfs_growfs $mnt
+_wait_recalc $vg/${lv1}_${suffix}_rimage_0
+_wait_recalc $vg/${lv1}_${suffix}_rimage_1
+_add_more_data_to_mnt
+_verify_data_on_mnt
+umount $mnt
+lvchange -an $vg/$lv1
+_verify_data_on_lv
+lvremove $vg/$lv1
+vgremove -ff $vg
+
+_prepare_vg
+lvcreate --type raid5 --raidintegrity y -n $lv1 -l 8 $vg
+_wait_recalc $vg/${lv1}_rimage_0
+_wait_recalc $vg/${lv1}_rimage_1
+_wait_recalc $vg/${lv1}_rimage_2
+_wait_recalc $vg/$lv1
+lvcreate --type $create_type -n fast -l 4 -an $vg "$dev6"
+lvconvert -y --type $convert_type $convert_option fast $vg/$lv1
+lvs -a -o name,size,segtype,devices,sync_percent $vg
+_add_new_data_to_mnt
+lvextend -l 16 $vg/$lv1
+xfs_growfs $mnt
+_wait_recalc $vg/${lv1}_${suffix}_rimage_0
+_wait_recalc $vg/${lv1}_${suffix}_rimage_1
+_add_more_data_to_mnt
+_verify_data_on_mnt
+umount $mnt
+lvchange -an $vg/$lv1
+_verify_data_on_lv
+lvremove $vg/$lv1
+vgremove -ff $vg
+
+# Test adding image to raid1
+
+_prepare_vg
+lvcreate --type raid1 -m1 --raidintegrity y -n $lv1 -l 8 $vg
+_wait_recalc $vg/${lv1}_rimage_0
+_wait_recalc $vg/${lv1}_rimage_1
+_wait_recalc $vg/$lv1
+lvcreate --type $create_type -n fast -l 4 -an $vg "$dev6"
+lvconvert -y --type $convert_type $convert_option fast $vg/$lv1
+lvs -a -o name,size,segtype,devices,sync_percent $vg
+_add_new_data_to_mnt
+# currently only allowed while raid is top level lv
+not lvconvert -y -m+1 $vg/${lv1}_${suffix}
+#_wait_recalc $vg/${lv1}_${suffix}_rimage_0
+#_wait_recalc $vg/${lv1}_${suffix}_rimage_1
+#_wait_recalc $vg/${lv1}_${suffix}_rimage_2
+_add_more_data_to_mnt
+_verify_data_on_mnt
+umount $mnt
+lvchange -an $vg/$lv1
+_verify_data_on_lv
+lvremove $vg/$lv1
+vgremove -ff $vg
+
+# Test removing image from raid1
+
+_prepare_vg
+lvcreate --type raid1 -m2 --raidintegrity y -n $lv1 -l 8 $vg
+_wait_recalc $vg/${lv1}_rimage_0
+_wait_recalc $vg/${lv1}_rimage_1
+_wait_recalc $vg/${lv1}_rimage_2
+_wait_recalc $vg/$lv1
+lvcreate --type $create_type -n fast -l 4 -an $vg "$dev6"
+lvconvert -y --type $convert_type $convert_option fast $vg/$lv1
+lvs -a -o name,size,segtype,devices,sync_percent $vg
+_add_new_data_to_mnt
+lvconvert -y -m-1 $vg/${lv1}_${suffix}
+lvs -a -o name,size,segtype,devices,sync_percent $vg
+_add_more_data_to_mnt
+_verify_data_on_mnt
+umount $mnt
+lvchange -an $vg/$lv1
+_verify_data_on_lv
+lvremove $vg/$lv1
+vgremove -ff $vg
+
+# Test disallowed operations on raid+integrity
+
+_prepare_vg
+lvcreate --type raid1 -m1 --raidintegrity y -n $lv1 -l 8 $vg "$dev1" "$dev2"
+_wait_recalc $vg/${lv1}_rimage_0
+_wait_recalc $vg/${lv1}_rimage_1
+_wait_recalc $vg/$lv1
+lvcreate --type $create_type -n fast -l 4 -an $vg "$dev6"
+lvconvert -y --type $convert_type $convert_option fast $vg/$lv1
+lvs -a -o name,size,segtype,devices,sync_percent $vg
+_add_new_data_to_mnt
+not lvconvert -y -m-1 $vg/$lv1
+not lvconvert -y -m-1 $vg/${lv1}_${suffix}
+not lvconvert --splitmirrors 1 -n tmp -y $vg/$lv1
+not lvconvert --splitmirrors 1 -n tmp -y $vg/${lv1}_${suffix}
+not lvconvert --splitmirrors 1 --trackchanges -y $vg/$lv1
+not lvconvert --splitmirrors 1 --trackchanges -y $vg/${lv1}_${suffix}
+not lvchange --syncaction repair $vg/$lv1
+not lvchange --syncaction repair $vg/${lv1}_${suffix}
+not lvreduce -L4M $vg/$lv1
+not lvreduce -L4M $vg/${lv1}_${suffix}
+not lvcreate -s -n snap -L4M $vg/${lv1}_${suffix}
+# plan to enable snap on top level raid+integrity, so then
+# snap+writecache+raid+integrity should be allowed.
+not lvcreate -s -n snap -L4M $vg/$lv1
+lvs -a -o name,size,segtype,devices
+not pvmove -n $vg/$lv1 "$dev1"
+not pvmove -n $vg/${lv1}_${suffix} "$dev1"
+not pvmove "$dev1"
+_verify_data_on_mnt
+umount $mnt
+lvchange -an $vg/$lv1
+_verify_data_on_lv
+lvremove $vg/$lv1
+vgremove -ff $vg
+
+# Repeat many of the tests above using bitmap mode
+
+_prepare_vg
+lvcreate --type raid1 -m1 --raidintegrity y --raidintegritymode bitmap -n $lv1 -l 8 $vg "$dev1" "$dev2"
+lvcreate --type $create_type -n fast -l 4 -an $vg "$dev6"
+lvconvert -y --type $convert_type $convert_option fast $vg/$lv1
+lvs -a -o name,size,segtype,devices,sync_percent $vg
+_wait_recalc $vg/${lv1}_${suffix}_rimage_0
+_wait_recalc $vg/${lv1}_${suffix}_rimage_1
+_wait_recalc $vg/${lv1}_${suffix}
+_test_fs_with_read_repair "$dev1"
+lvs -o integritymismatches $vg/${lv1}_${suffix}_rimage_0 |tee mismatch
+not grep ' 0 ' mismatch
+lvs -o integritymismatches $vg/${lv1}_${suffix} |tee mismatch
+not grep ' 0 ' mismatch
+lvchange -an $vg/$lv1
+lvconvert --raidintegrity n $vg/${lv1}_${suffix}
+lvremove $vg/$lv1
+vgremove -ff $vg
+
+_prepare_vg
+lvcreate --type raid6 --raidintegrity y --raidintegritymode bitmap -n $lv1 -l 8 $vg "$dev1" "$dev2" "$dev3" "$dev4" "$dev5"
+lvcreate --type $create_type -n fast -l 4 -an $vg "$dev6"
+lvconvert -y --type $convert_type $convert_option fast $vg/$lv1
+lvs -a -o name,size,segtype,devices,sync_percent $vg
+_wait_recalc $vg/${lv1}_${suffix}_rimage_0
+_wait_recalc $vg/${lv1}_${suffix}_rimage_1
+_wait_recalc $vg/${lv1}_${suffix}_rimage_2
+_wait_recalc $vg/${lv1}_${suffix}_rimage_3
+_wait_recalc $vg/${lv1}_${suffix}_rimage_4
+_wait_recalc $vg/${lv1}_${suffix}
+_test_fs_with_read_repair "$dev1" "$dev2" "$dev3" "$dev4" "$dev5"
+lvs -o integritymismatches $vg/${lv1}_${suffix}_rimage_0
+lvs -o integritymismatches $vg/${lv1}_${suffix}_rimage_1
+lvs -o integritymismatches $vg/${lv1}_${suffix}_rimage_2
+lvs -o integritymismatches $vg/${lv1}_${suffix}_rimage_3
+lvs -o integritymismatches $vg/${lv1}_${suffix}_rimage_4
+lvs -o integritymismatches $vg/${lv1}_${suffix} |tee mismatch
+not grep ' 0 ' mismatch
+lvchange -an $vg/$lv1
+lvconvert --raidintegrity n $vg/${lv1}_${suffix}
+lvremove $vg/$lv1
+vgremove -ff $vg
+
+# remove from active lv
+_prepare_vg
+lvcreate --type raid1 -m1 --raidintegrity y --raidintegritymode bitmap -n $lv1 -l 8 $vg "$dev1" "$dev2"
+_wait_recalc $vg/${lv1}_rimage_0
+_wait_recalc $vg/${lv1}_rimage_1
+_wait_recalc $vg/$lv1
+lvcreate --type $create_type -n fast -l 4 -an $vg "$dev6"
+lvconvert -y --type $convert_type $convert_option fast $vg/$lv1
+lvs -a -o name,size,segtype,devices,sync_percent $vg
+_add_new_data_to_mnt
+lvconvert --raidintegrity n $vg/${lv1}_${suffix}
+_add_more_data_to_mnt
+_verify_data_on_mnt
+umount $mnt
+lvchange -an $vg/$lv1
+_verify_data_on_lv
+lvremove $vg/$lv1
+vgremove -ff $vg
+
+# add to active lv
+_prepare_vg
+lvcreate --type raid1 -m1 -n $lv1 -l 8 $vg
+_add_new_data_to_mnt
+lvconvert --raidintegrity y --raidintegritymode bitmap $vg/$lv1
+lvcreate --type $create_type -n fast -l 4 -an $vg "$dev6"
+lvconvert -y --type $convert_type $convert_option fast $vg/$lv1
+lvs -a -o name,size,segtype,devices,sync_percent $vg
+_wait_recalc $vg/${lv1}_${suffix}_rimage_0
+_wait_recalc $vg/${lv1}_${suffix}_rimage_1
+_wait_recalc $vg/${lv1}_${suffix}
+_add_more_data_to_mnt
+_verify_data_on_mnt
+umount $mnt
+lvchange -an $vg/$lv1
+_verify_data_on_lv
+lvremove $vg/$lv1
+vgremove -ff $vg
+}
+
+do_test cache-pool cache --cachepool corig
+do_test linear cache --cachevol corig
+do_test linear writecache --cachevol wcorig
+
+# TODO: add do_test() variant that skips adding the cache to lv1.
+# This would be equivalent to integrity.sh which could be dropped.
diff --git a/tools/command-lines.in b/tools/command-lines.in
index 1cf6bba23..3d311288f 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -480,7 +480,6 @@ OO: --cache, OO_LVCONVERT_CACHE, OO_LVCONVERT_POOL, OO_LVCONVERT
ID: lvconvert_to_cache_with_cachepool
DESC: Attach a cache pool to an LV, converts the LV to type cache.
RULE: all and lv_is_visible
-RULE: all not lv_is_raid_with_integrity
RULE: --poolmetadata not --readahead --stripesize --stripes_long
# alternate form of lvconvert --type cache
@@ -489,7 +488,6 @@ OO: OO_LVCONVERT_CACHE, OO_LVCONVERT_POOL, OO_LVCONVERT
ID: lvconvert_to_cache_with_cachepool
DESC: Attach a cache pool to an LV.
RULE: all and lv_is_visible
-RULE: all not lv_is_raid_with_integrity
RULE: --poolmetadata not --readahead --stripesize --stripes_long
FLAGS: SECONDARY_SYNTAX
AUTOTYPE: cache
@@ -501,7 +499,6 @@ OO: OO_LVCONVERT, --cachesettings String
ID: lvconvert_to_writecache
DESC: Attach a writecache to an LV, converts the LV to type writecache.
RULE: all and lv_is_visible
-RULE: all not lv_is_raid_with_integrity
---
@@ -510,7 +507,6 @@ OO: --cache, OO_LVCONVERT_CACHE, OO_LVCONVERT, --poolmetadatasize SizeMB, --chun
ID: lvconvert_to_cache_with_cachevol
DESC: Attach a cache to an LV, converts the LV to type cache.
RULE: all and lv_is_visible
-RULE: all not lv_is_raid_with_integrity
# alternate form of lvconvert --type cache
lvconvert --cache --cachevol LV LV_linear_striped_raid_thinpool
@@ -518,7 +514,6 @@ OO: OO_LVCONVERT_CACHE, OO_LVCONVERT, --poolmetadatasize SizeMB, --chunksize Siz
ID: lvconvert_to_cache_with_cachevol
DESC: Attach a cache to an LV, converts the LV to type cache.
RULE: all and lv_is_visible
-RULE: all not lv_is_raid_with_integrity
FLAGS: SECONDARY_SYNTAX
---
diff --git a/tools/pvmove.c b/tools/pvmove.c
index ed92f3ce4..ebffe9acd 100644
--- a/tools/pvmove.c
+++ b/tools/pvmove.c
@@ -645,6 +645,14 @@ static int _pvmove_setup_single(struct cmd_context *cmd,
log_error("pvmove not allowed on raid LV with integrity.");
return ECMD_FAILED;
}
+
+ if (lv_is_cache(lv) || lv_is_writecache(lv)) {
+ struct logical_volume *lv_orig = seg_lv(first_seg(lv), 0);
+ if (lv_is_raid(lv_orig) && lv_raid_has_integrity(lv_orig)) {
+ log_error("pvmove not allowed on raid LV with integrity.");
+ return ECMD_FAILED;
+ }
+ }
}
/*
1 year, 2 months
- 1
- 0
main - tests: integrity fixes
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ebbc3f7ab31e8026499...
Commit: ebbc3f7ab31e8026499bddd93cde4db4921d2132
Parent: 300c8209a810f287992376e8a0561fdf878d1520
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Mar 16 13:59:56 2023 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Apr 5 14:24:07 2023 -0500
tests: integrity fixes
wait_recalc was mistakenly being called on raid without integrity
wait_recalc loop was exiting without error
---
test/shell/integrity.sh | 56 ++++++++++++++++++++++++++++++++-----------------
1 file changed, 37 insertions(+), 19 deletions(-)
diff --git a/test/shell/integrity.sh b/test/shell/integrity.sh
index 293cde84a..a7dd5b565 100644
--- a/test/shell/integrity.sh
+++ b/test/shell/integrity.sh
@@ -157,12 +157,13 @@ _wait_recalc() {
# TODO: There is some strange bug, first leg of RAID with integrity
# enabled never gets in sync. I saw this in BB, but not when executing
# the commands manually
- if test -z "$sync"; then
- echo "TEST\ WARNING: Resync of dm-integrity device '$checklv' failed"
- dmsetup status "$DM_DEV_DIR/mapper/${checklv/\//-}"
- exit
- fi
+# if test -z "$sync"; then
+# echo "TEST\ WARNING: Resync of dm-integrity device '$checklv' failed"
+# dmsetup status "$DM_DEV_DIR/mapper/${checklv/\//-}"
+# exit
+# fi
echo "timeout waiting for recalc"
+ dmsetup status "$DM_DEV_DIR/mapper/${checklv/\//-}"
return 1
}
@@ -171,6 +172,7 @@ _wait_recalc() {
_prepare_vg
lvcreate --type raid1 -m1 --raidintegrity y -n $lv1 -l 8 $vg "$dev1" "$dev2"
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/$lv1
@@ -186,6 +188,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid1 -m2 --raidintegrity y -n $lv1 -l 8 $vg "$dev1" "$dev2" "$dev3"
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/${lv1}_rimage_2
@@ -202,6 +205,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid4 --raidintegrity y -n $lv1 -l 8 $vg "$dev1" "$dev2" "$dev3"
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/${lv1}_rimage_2
@@ -219,6 +223,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid5 --raidintegrity y -n $lv1 -l 8 $vg "$dev1" "$dev2" "$dev3"
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/${lv1}_rimage_2
@@ -236,6 +241,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid6 --raidintegrity y -n $lv1 -l 8 $vg "$dev1" "$dev2" "$dev3" "$dev4" "$dev5"
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/${lv1}_rimage_2
@@ -257,6 +263,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid10 --raidintegrity y -n $lv1 -l 8 $vg "$dev1" "$dev2" "$dev3" "$dev4"
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/${lv1}_rimage_2
@@ -278,6 +285,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid1 -m1 --raidintegrity y -n $lv1 -l 8 $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/$lv1
@@ -293,6 +301,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid4 --raidintegrity y -n $lv1 -l 8 $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/${lv1}_rimage_2
@@ -309,6 +318,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid5 --raidintegrity y -n $lv1 -l 8 $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/${lv1}_rimage_2
@@ -325,6 +335,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid6 --raidintegrity y -n $lv1 -l 8 $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/${lv1}_rimage_2
@@ -343,6 +354,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid10 --raidintegrity y -n $lv1 -l 8 $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/$lv1
@@ -360,6 +372,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid1 -m1 -n $lv1 -l 8 $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/$lv1
_add_new_data_to_mnt
lvconvert --raidintegrity y $vg/$lv1
@@ -375,6 +388,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid4 -n $lv1 -l 8 $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/$lv1
_add_new_data_to_mnt
lvconvert --raidintegrity y $vg/$lv1
@@ -390,6 +404,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid5 -n $lv1 -l 8 $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/$lv1
_add_new_data_to_mnt
lvconvert --raidintegrity y $vg/$lv1
@@ -405,11 +420,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid6 -n $lv1 -l 8 $vg
-_wait_recalc $vg/${lv1}_rimage_0
-_wait_recalc $vg/${lv1}_rimage_1
-_wait_recalc $vg/${lv1}_rimage_2
-_wait_recalc $vg/${lv1}_rimage_3
-_wait_recalc $vg/${lv1}_rimage_4
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/$lv1
_add_new_data_to_mnt
lvconvert --raidintegrity y $vg/$lv1
@@ -425,6 +436,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid10 -n $lv1 -l 8 $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/$lv1
_add_new_data_to_mnt
lvconvert --raidintegrity y $vg/$lv1
@@ -442,10 +454,10 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid1 -m1 --raidintegrity y -n $lv1 -l 8 $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/$lv1
-lvs -a -o+devices $vg
_add_new_data_to_mnt
umount $mnt
lvchange -an $vg/$lv1
@@ -455,7 +467,7 @@ mount "$DM_DEV_DIR/$vg/$lv1" $mnt
xfs_growfs $mnt
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
-lvs -a -o+devices $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_add_more_data_to_mnt
_verify_data_on_mnt
umount $mnt
@@ -466,13 +478,13 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid6 --raidintegrity y -n $lv1 -l 8 $vg
+lvs -a -o name,segtype,sync_percent,devices $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/${lv1}_rimage_2
_wait_recalc $vg/${lv1}_rimage_3
_wait_recalc $vg/${lv1}_rimage_4
_wait_recalc $vg/$lv1
-lvs -a -o+devices $vg
_add_new_data_to_mnt
umount $mnt
lvchange -an $vg/$lv1
@@ -482,7 +494,7 @@ mount "$DM_DEV_DIR/$vg/$lv1" $mnt
xfs_growfs $mnt
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
-lvs -a -o+devices $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_add_more_data_to_mnt
_verify_data_on_mnt
umount $mnt
@@ -495,6 +507,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid1 -m1 --raidintegrity y -n $lv1 -l 8 $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/$lv1
@@ -515,6 +528,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid5 --raidintegrity y -n $lv1 -l 8 $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/${lv1}_rimage_2
@@ -536,6 +550,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid10 --raidintegrity y -n $lv1 -l 8 $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/$lv1
@@ -558,6 +573,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid1 -m1 --raidintegrity y -n $lv1 -l 8 $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/$lv1
@@ -580,11 +596,11 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid1 -m2 --raidintegrity y -n $lv1 -l 8 $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/${lv1}_rimage_2
_wait_recalc $vg/$lv1
-lvs -a -o+devices $vg
_add_new_data_to_mnt
lvconvert -y -m-1 $vg/$lv1
lvs -a -o+devices $vg
@@ -600,10 +616,10 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid1 -m1 --raidintegrity y -n $lv1 -l 8 $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/$lv1
-lvs -a -o+devices $vg
_add_new_data_to_mnt
not lvconvert -y -m-1 $vg/$lv1
not lvconvert --splitmirrors 1 -n tmp -y $vg/$lv1
@@ -624,6 +640,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid1 -m1 --raidintegrity y --raidintegritymode bitmap -n $lv1 -l 8 $vg "$dev1" "$dev2"
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/$lv1
@@ -639,6 +656,7 @@ vgremove -ff $vg
_prepare_vg
lvcreate --type raid6 --raidintegrity y --raidintegritymode bitmap -n $lv1 -l 8 $vg "$dev1" "$dev2" "$dev3" "$dev4" "$dev5"
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/${lv1}_rimage_2
@@ -661,6 +679,7 @@ vgremove -ff $vg
# remove from active lv
_prepare_vg
lvcreate --type raid1 -m1 --raidintegrity y --raidintegritymode bitmap -n $lv1 -l 8 $vg "$dev1" "$dev2"
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_add_new_data_to_mnt
@@ -691,9 +710,9 @@ vgremove -ff $vg
# lvextend active
_prepare_vg
lvcreate --type raid1 --raidintegrity y --raidintegritymode bitmap -m1 -n $lv1 -l 8 $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
-lvs -a -o+devices $vg
_add_new_data_to_mnt
lvextend -l 16 $vg/$lv1
_wait_recalc $vg/${lv1}_rimage_0
@@ -710,15 +729,14 @@ vgremove -ff $vg
# add image to raid1
_prepare_vg
lvcreate --type raid1 -m1 --raidintegrity y --raidintegritymode bitmap -n $lv1 -l 8 $vg
+lvs -a -o name,segtype,devices,sync_percent $vg
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
-lvs -a -o+devices $vg
_add_new_data_to_mnt
lvconvert -y -m+1 $vg/$lv1
_wait_recalc $vg/${lv1}_rimage_0
_wait_recalc $vg/${lv1}_rimage_1
_wait_recalc $vg/${lv1}_rimage_2
-lvs -a -o+devices $vg
_add_more_data_to_mnt
_verify_data_on_mnt
umount $mnt
1 year, 2 months
- 1
- 0