master - raid: remove double minimum area check on takeover
by Heinz Mauelshagen
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0c2fd133d7b690889ed...
Commit: 0c2fd133d7b690889ed4153853151db5b38eb060
Parent: d8a63f446e159bbd34292962e4ad9e25ea00cb95
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Thu Apr 20 21:35:06 2017 +0200
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Thu Apr 20 21:35:06 2017 +0200
raid: remove double minimum area check on takeover
---
lib/metadata/raid_manip.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 77ca006..03e32c6 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -5061,12 +5061,6 @@ static int _takeover_upconvert_wrapper(TAKEOVER_FN_ARGS)
}
}
- if (seg_is_any_raid5(seg) && segtype_is_any_raid6(new_segtype) && seg->area_count < 4) {
- log_error("Minimum of 3 stripes needed for conversion from %s to %s.",
- lvseg_name(seg), new_segtype->name);
- return 0;
- }
-
if (seg_is_raid1(seg)) {
if (seg->area_count != 2) {
log_error("Can't convert %s LV %s to %s with != 2 legs.",
7 years
master - raid: define return value on error paths
by Heinz Mauelshagen
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d8a63f446e159bbd342...
Commit: d8a63f446e159bbd34292962e4ad9e25ea00cb95
Parent: 5fb571740224a1a7670d20f23c444c602ef5cf85
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Thu Apr 20 21:32:40 2017 +0200
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Thu Apr 20 21:32:40 2017 +0200
raid: define return value on error paths
---
lib/metadata/raid_manip.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 9114f60..77ca006 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -530,18 +530,18 @@ static int _lv_update_reload_fns_reset_eliminate_lvs(struct logical_volume *lv,
* Returning 2 from pre function -> lv is suspended and
* metadata got updated, don't need to do it again
*/
- if (!(origin_only ? resume_lv_origin(lv->vg->cmd, lv_lock_holder(lv)) :
- resume_lv(lv->vg->cmd, lv_lock_holder(lv)))) {
+ if (!(r = (origin_only ? resume_lv_origin(lv->vg->cmd, lv_lock_holder(lv)) :
+ resume_lv(lv->vg->cmd, lv_lock_holder(lv))))) {
log_error("Failed to resume %s.", display_lvname(lv));
goto err;
}
/* Update metadata and reload mappings including flags (e.g. LV_REBUILD, LV_RESHAPE_DELTA_DISKS_PLUS) */
- } else if (!(origin_only ? lv_update_and_reload_origin(lv) : lv_update_and_reload(lv)))
+ } else if (!(r = (origin_only ? lv_update_and_reload_origin(lv) : lv_update_and_reload(lv))))
goto err;
/* Eliminate any residual LV and don't commit the metadata */
- if (!_eliminate_extracted_lvs_optional_write_vg(lv->vg, removal_lvs, 0))
+ if (!(r = _eliminate_extracted_lvs_optional_write_vg(lv->vg, removal_lvs, 0)))
goto err;
/*
@@ -554,7 +554,7 @@ static int _lv_update_reload_fns_reset_eliminate_lvs(struct logical_volume *lv,
* and if successful, performs metadata backup.
*/
log_debug_metadata("Clearing any flags for %s passed to the kernel.", display_lvname(lv));
- if (!_reset_flags_passed_to_kernel(lv, &flags_reset))
+ if (!(r = _reset_flags_passed_to_kernel(lv, &flags_reset)))
goto err;
/* Call any @fn_post_on_lv before the second update call (e.g. to rename LVs back) */
@@ -565,7 +565,7 @@ static int _lv_update_reload_fns_reset_eliminate_lvs(struct logical_volume *lv,
/* Update and reload to clear out reset flags in the metadata and in the kernel */
log_debug_metadata("Updating metadata mappings for %s.", display_lvname(lv));
- if ((r != 2 || flags_reset) && !(origin_only ? lv_update_and_reload_origin(lv) : lv_update_and_reload(lv))) {
+ if ((r != 2 || flags_reset) && !(r = (origin_only ? lv_update_and_reload_origin(lv) : lv_update_and_reload(lv)))) {
log_error(INTERNAL_ERROR "Update of LV %s failed.", display_lvname(lv));
goto err;
}
7 years
master - raid: avoid superfluous reload on takeover
by Heinz Mauelshagen
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5fb571740224a1a7670...
Commit: 5fb571740224a1a7670d20f23c444c602ef5cf85
Parent: c7fb0cb861104e99c11e8b4e031d981dab7891a1
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Thu Apr 20 21:17:08 2017 +0200
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Thu Apr 20 21:18:27 2017 +0200
raid: avoid superfluous reload on takeover
Allow any reset rebuild flags to trigger the second update on takeover.
Use descriptive callback names.
Fix typo and add comments.
---
lib/metadata/raid_manip.c | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 173b5bf..9114f60 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -518,7 +518,8 @@ static int _lv_update_reload_fns_reset_eliminate_lvs(struct logical_volume *lv,
fn_pre_data = va_arg(ap, void *);
}
- /* Call any efn_pre_on_lv before the first update and reload call (e.g. to rename LVs) */
+ /* Call any fn_pre_on_lv before the first update and reload call (e.g. to rename LVs) */
+ /* returns 1: ok+ask caller to update, 2: metadata commited+ask caller to resume */
if (fn_pre_on_lv && !(r = fn_pre_on_lv(lv, fn_pre_data))) {
log_error(INTERNAL_ERROR "Pre callout function failed.");
goto err;
@@ -2100,7 +2101,7 @@ static int _activate_sub_lvs_excl_local(struct logical_volume *lv, uint32_t star
for (s = start_idx; s < seg->area_count; s++)
if (!_activate_sub_lv_excl_local(seg_lv(seg, s)) ||
(seg->meta_areas && !_activate_sub_lv_excl_local(seg_metalv(seg, s))))
- return 0;
+ return_0;
return 1;
}
@@ -2123,17 +2124,18 @@ static int _activate_sub_lvs_excl_local_list(struct logical_volume *lv, struct d
return r;
}
-/* Helper: callback function to activate any new image component pairs @lv */
-static int _pre_raid_add_legs(struct logical_volume *lv, void *data)
+/* Helper: callback function to activate image component pairs of @lv to update size after reshape space allocation */
+static int _pre_raid_reactivate_legs(struct logical_volume *lv, void *data)
{
if (!_vg_write_lv_suspend_vg_commit(lv, 1))
return 0;
- /* Reload any changed image component pairs for out-of-place reshape apace */
+ /* Reload any changed image component pairs for out-of-place reshape space */
if (!_activate_sub_lvs_excl_local(lv, 0))
return 0;
- return 2; /* 1: ok, 2: metadata commited */
+ /* 1: ok+ask caller to update, 2: metadata commited+ask caller to resume */
+ return 2;
}
/* Helper: callback function to activate any rmetas on @data list */
@@ -2145,16 +2147,24 @@ static int _pre_raid0_remove_rmeta(struct logical_volume *lv, void *data)
if (!_vg_write_lv_suspend_vg_commit(lv, 1))
return 0;
- /* 1: ok, 2: metadata commited */
+ /* 1: ok+ask caller to update, 2: metadata commited+ask caller to resume */
return _activate_sub_lvs_excl_local_list(lv, lv_list) ? 2 : 0;
}
-/* Helper: callback dummy needed for */
-static int _post_raid_dummy(struct logical_volume *lv, void *data)
+/* Helper: callback dummy needed for takeover+reshape */
+static int _post_raid_reshape(struct logical_volume *lv, void *data)
{
+ /* 1: ask caller to update, 2: don't ask caller to update */
return 1;
}
+/* Helper: callback dummy needed for takeover+reshape */
+static int _post_raid_takeover(struct logical_volume *lv, void *data)
+{
+ /* 1: ask caller to update, 2: don't ask caller to update */
+ return 2;
+}
+
/*
* Reshape logical volume @lv by adding/removing stripes
* (absolute new stripes given in @new_stripes), changing
@@ -2317,8 +2327,8 @@ static int _raid_reshape(struct logical_volume *lv,
if (seg->area_count != 2 || old_image_count != seg->area_count) {
if (!_lv_update_reload_fns_reset_eliminate_lvs(lv, 0, &removal_lvs,
- _post_raid_dummy, NULL,
- _pre_raid_add_legs, NULL))
+ _post_raid_reshape, NULL,
+ _pre_raid_reactivate_legs, NULL))
return 0;
} if (!_vg_write_commit_backup(lv->vg))
return 0;
@@ -5106,7 +5116,7 @@ static int _takeover_upconvert_wrapper(TAKEOVER_FN_ARGS)
/* raid0_meta -> raid4 needs clearing of MetaLVs in order to avoid raid disk role change issues in the kernel */
}
- if (seg_is_raid0_meta(seg) &&
+ if (segtype_is_raid0_meta(initial_segtype) &&
segtype_is_raid4(new_segtype) &&
!_clear_meta_lvs(lv))
return_0;
@@ -5155,7 +5165,6 @@ static int _takeover_upconvert_wrapper(TAKEOVER_FN_ARGS)
seg = first_seg(lv);
}
-
seg->data_copies = new_data_copies;
if (segtype_is_raid4(new_segtype) &&
@@ -5193,8 +5202,8 @@ static int _takeover_upconvert_wrapper(TAKEOVER_FN_ARGS)
log_debug_metadata("Updating VG metadata and reloading %s LV %s.",
lvseg_name(seg), display_lvname(lv));
if (!_lv_update_reload_fns_reset_eliminate_lvs(lv, 0, &removal_lvs,
- _post_raid_dummy, NULL,
- _pre_raid_add_legs, NULL))
+ _post_raid_takeover, NULL,
+ _pre_raid_reactivate_legs, NULL))
return 0;
if (segtype_is_raid4(new_segtype) &&
7 years
master - test: Skip some reshape tests that hang on single core machines
by Alasdair Kergon
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c7fb0cb861104e99c11...
Commit: c7fb0cb861104e99c11e8b4e031d981dab7891a1
Parent: 83cdba75bde734027984af9642f161c5693a5458
Author: Alasdair G Kergon <agk(a)redhat.com>
AuthorDate: Thu Apr 20 20:05:07 2017 +0100
Committer: Alasdair G Kergon <agk(a)redhat.com>
CommitterDate: Thu Apr 20 20:05:07 2017 +0100
test: Skip some reshape tests that hang on single core machines
Skip hanging raid reshape tests until https://bugzilla.redhat.com/1443999
is fixed
---
test/lib/aux.sh | 5 +++++
.../lvconvert-raid-reshape-linear_to_striped.sh | 4 ++++
.../lvconvert-raid-reshape-striped_to_linear.sh | 4 ++++
3 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 5303adc..b05c59d 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -1490,6 +1490,11 @@ have_readline() {
echo version | lvm &>/dev/null
}
+have_single_core() {
+ which nproc &>/dev/null || return 0
+ [ $(nproc) -eq 1 ] && return 1
+}
+
dmsetup_wrapped() {
udev_wait
dmsetup "$@"
diff --git a/test/shell/lvconvert-raid-reshape-linear_to_striped.sh b/test/shell/lvconvert-raid-reshape-linear_to_striped.sh
index 29a293e..13769ec 100644
--- a/test/shell/lvconvert-raid-reshape-linear_to_striped.sh
+++ b/test/shell/lvconvert-raid-reshape-linear_to_striped.sh
@@ -17,6 +17,10 @@ SKIP_WITH_LVMPOLLD=1
which mkfs.ext4 || skip
aux have_raid 1 10 1 || skip
+# Temporarily skip reshape tests on single-core CPUs until there's a fix for
+# https://bugzilla.redhat.com/1443999 - AGK 2017/04/20
+aux have_single_core || skip
+
aux prepare_vg 5
#
diff --git a/test/shell/lvconvert-raid-reshape-striped_to_linear.sh b/test/shell/lvconvert-raid-reshape-striped_to_linear.sh
index 357763e..8f53a42 100644
--- a/test/shell/lvconvert-raid-reshape-striped_to_linear.sh
+++ b/test/shell/lvconvert-raid-reshape-striped_to_linear.sh
@@ -17,6 +17,10 @@ SKIP_WITH_LVMPOLLD=1
which mkfs.ext4 || skip
aux have_raid 1 10 1 || skip
+# Temporarily skip reshape tests on single-core CPUs until there's a fix for
+# https://bugzilla.redhat.com/1443999 - AGK 2017/04/20
+aux have_single_core || skip
+
aux prepare_vg 5
#
7 years
master - mirror/raid: display adjusted region size with units
by Heinz Mauelshagen
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=83cdba75bde73402798...
Commit: 83cdba75bde734027984af9642f161c5693a5458
Parent: b9d10857b26533dcd52c4d482af0a9291670858e
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Thu Apr 20 20:42:21 2017 +0200
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Thu Apr 20 20:42:21 2017 +0200
mirror/raid: display adjusted region size with units
Display adjusted region size in units (e.g. "4.00 MiB") rather than sectors.
---
lib/metadata/lv_manip.c | 3 ++-
lib/metadata/metadata-exported.h | 3 ++-
lib/metadata/mirror.c | 26 ++++++++++++++------------
lib/mirror/mirrored.c | 3 ++-
tools/lvconvert.c | 4 ++--
5 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 50f5167..8f38839 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -7514,7 +7514,8 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
status |= LV_NOTSYNCED;
}
- lp->region_size = adjusted_mirror_region_size(vg->extent_size,
+ lp->region_size = adjusted_mirror_region_size(vg->cmd,
+ vg->extent_size,
lp->extents,
lp->region_size, 0,
vg_is_clustered(vg));
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index 3e6da63..8e03e20 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -1158,7 +1158,8 @@ uint32_t lv_mirror_count(const struct logical_volume *lv);
/* Remove CMIRROR_REGION_COUNT_LIMIT when http://bugzilla.redhat.com/682771 is fixed */
#define CMIRROR_REGION_COUNT_LIMIT (256*1024 * 8)
-uint32_t adjusted_mirror_region_size(uint32_t extent_size, uint32_t extents,
+uint32_t adjusted_mirror_region_size(struct cmd_context *cmd,
+ uint32_t extent_size, uint32_t extents,
uint32_t region_size, int internal, int clustered);
int remove_mirrors_from_segments(struct logical_volume *lv,
diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c
index c668ea0..9dee0ab 100644
--- a/lib/metadata/mirror.c
+++ b/lib/metadata/mirror.c
@@ -157,7 +157,8 @@ struct lv_segment *find_mirror_seg(struct lv_segment *seg)
*
* For internal use only log only in verbose mode
*/
-uint32_t adjusted_mirror_region_size(uint32_t extent_size, uint32_t extents,
+uint32_t adjusted_mirror_region_size(struct cmd_context *cmd,
+ uint32_t extent_size, uint32_t extents,
uint32_t region_size, int internal, int clustered)
{
uint64_t region_max;
@@ -168,11 +169,11 @@ uint32_t adjusted_mirror_region_size(uint32_t extent_size, uint32_t extents,
if (region_max < UINT32_MAX && region_size > region_max) {
region_size = (uint32_t) region_max;
if (!internal)
- log_print_unless_silent("Using reduced mirror region size of %"
- PRIu32 " sectors.", region_size);
+ log_print_unless_silent("Using reduced mirror region size of %s",
+ display_size(cmd, region_size));
else
- log_verbose("Using reduced mirror region size of %"
- PRIu32 " sectors.", region_size);
+ log_verbose("Using reduced mirror region size of %s",
+ display_size(cmd, region_size));
}
#ifdef CMIRROR_REGION_COUNT_LIMIT
@@ -199,13 +200,13 @@ uint32_t adjusted_mirror_region_size(uint32_t extent_size, uint32_t extents,
if (region_size < region_min_pow2) {
if (internal)
- log_print_unless_silent("Increasing mirror region size from %"
- PRIu32 " to %" PRIu64 " sectors.",
- region_size, region_min_pow2);
+ log_print_unless_silent("Increasing mirror region size from %s to %s",
+ display_size(cmd, region_size),
+ display_size(cmd, region_min_pow2));
else
- log_verbose("Increasing mirror region size from %"
- PRIu32 " to %" PRIu64 " sectors.",
- region_size, region_min_pow2);
+ log_verbose("Increasing mirror region size from %s to %s",
+ display_size(cmd, region_size),
+ display_size(cmd, region_min_pow2));
region_size = region_min_pow2;
}
}
@@ -1665,7 +1666,8 @@ static int _add_mirrors_that_preserve_segments(struct logical_volume *lv,
if (!(segtype = get_segtype_from_string(cmd, SEG_TYPE_NAME_MIRROR)))
return_0;
- adjusted_region_size = adjusted_mirror_region_size(lv->vg->extent_size,
+ adjusted_region_size = adjusted_mirror_region_size(cmd,
+ lv->vg->extent_size,
lv->le_count,
region_size, 1,
vg_is_clustered(lv->vg));
diff --git a/lib/mirror/mirrored.c b/lib/mirror/mirrored.c
index c4ba70a..f4c1567 100644
--- a/lib/mirror/mirrored.c
+++ b/lib/mirror/mirrored.c
@@ -370,7 +370,8 @@ static int _mirrored_add_target_line(struct dev_manager *dm, struct dm_pool *mem
region_size = seg->region_size;
} else
- region_size = adjusted_mirror_region_size(seg->lv->vg->extent_size,
+ region_size = adjusted_mirror_region_size(cmd,
+ seg->lv->vg->extent_size,
seg->area_len,
mirr_state->default_region_size, 1,
vg_is_clustered(seg->lv->vg));
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index f4ee660..5b9510b 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -622,7 +622,7 @@ static int _lv_update_log_type(struct cmd_context *cmd,
/* Adding redundancy to the log */
if (old_log_count < log_count) {
- region_size = adjusted_mirror_region_size(lv->vg->extent_size,
+ region_size = adjusted_mirror_region_size(cmd, lv->vg->extent_size,
lv->le_count,
region_size, 0,
vg_is_clustered(lv->vg));
@@ -827,7 +827,7 @@ static int _lvconvert_mirrors_aux(struct cmd_context *cmd,
return 1;
}
- region_size = adjusted_mirror_region_size(lv->vg->extent_size,
+ region_size = adjusted_mirror_region_size(cmd, lv->vg->extent_size,
lv->le_count,
lp->region_size ? : seg->region_size, 0,
vg_is_clustered(lv->vg));
7 years
master - man: quote the word no
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b9d10857b26533dcd52...
Commit: b9d10857b26533dcd52c4d482af0a9291670858e
Parent: 658d524d26f2cff9bde31142ecab6d17fd2c54dd
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Apr 18 15:55:57 2017 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Apr 18 15:56:48 2017 -0500
man: quote the word no
---
tools/args.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/args.h b/tools/args.h
index 24e3918..be1711b 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -1234,7 +1234,7 @@ arg(physicalvolume_ARG, 'P', "physicalvolume", 0, 0, 0, NULL)
arg(quiet_ARG, 'q', "quiet", 0, ARG_COUNTABLE, 0,
"Suppress output and log messages. Overrides --debug and --verbose.\n"
- "Repeat once to also suppress any prompts with answer no.\n")
+ "Repeat once to also suppress any prompts with answer 'no'.\n")
arg(readahead_ARG, 'r', "readahead", readahead_VAL, 0, 0,
"Sets read ahead sector count of an LV.\n"
7 years
master - configure: Fix notify-dbus and dmfilemapd options.
by Alasdair Kergon
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=658d524d26f2cff9bde...
Commit: 658d524d26f2cff9bde31142ecab6d17fd2c54dd
Parent: 2d9097e9ca2c07cff1870349bd15e30e151e709e
Author: Alasdair G Kergon <agk(a)redhat.com>
AuthorDate: Tue Apr 18 20:37:53 2017 +0100
Committer: Alasdair G Kergon <agk(a)redhat.com>
CommitterDate: Tue Apr 18 20:37:53 2017 +0100
configure: Fix notify-dbus and dmfilemapd options.
---
WHATS_NEW | 3 +-
WHATS_NEW_DM | 1 +
configure | 62 ++++++++++++++++++++++++++----------------------------
configure.in | 23 ++++++++------------
man/Makefile.in | 2 +-
5 files changed, 43 insertions(+), 48 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 39ad2af..5a13744 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,6 +1,7 @@
Version 2.02.171 -
==================================
- Change configure option names from enable-lockd to enable-lvmlockd.
+ Fix configure --enable-notify-dbus status message.
+ Change configure option name prefix from --enable-lockd to --enable-lvmlockd.
lvcreate - raise mirror/raid default regionsize to 2MiB
Add missing configurable prefix to configuration file installation directory.
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index e6f7729..c88516d 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
Version 1.02.140 -
==================================
+ Add missing configure --enable-dmfilemapd status message and fix --disable.
Version 1.02.139 - 13th April 2017
==================================
diff --git a/configure b/configure
index 4b83118..ffef9b9 100755
--- a/configure
+++ b/configure
@@ -703,7 +703,6 @@ FSADM_PATH
FSADM
ELDFLAGS
DM_LIB_PATCHLEVEL
-DMFILEMAPD
DMEVENTD_PATH
DMEVENTD
DL_LIBS
@@ -738,7 +737,6 @@ CLDWHOLEARCHIVE
CLDNOWHOLEARCHIVE
CLDFLAGS
CACHE
-BUILD_NOTIFYDBUS
BUILD_DMFILEMAPD
BUILD_LOCKDDLM
BUILD_LOCKDSANLOCK
@@ -955,8 +953,8 @@ enable_valgrind_pool
enable_devmapper
enable_lvmetad
enable_lvmpolld
-enable_lockd_sanlock
-enable_lockd_dlm
+enable_lvmlockd_sanlock
+enable_lvmlockd_dlm
enable_use_lvmlockd
with_lvmlockd_pidfile
enable_use_lvmetad
@@ -1693,8 +1691,9 @@ Optional Features:
--disable-devmapper disable LVM2 device-mapper interaction
--enable-lvmetad enable the LVM Metadata Daemon
--enable-lvmpolld enable the LVM Polling Daemon
- --enable-lockd-sanlock enable the LVM lock daemon using sanlock
- --enable-lockd-dlm enable the LVM lock daemon using dlm
+ --enable-lvmlockd-sanlock
+ enable the LVM lock daemon using sanlock
+ --enable-lvmlockd-dlm enable the LVM lock daemon using dlm
--disable-use-lvmlockd disable usage of LVM lock daemon
--disable-use-lvmetad disable usage of LVM Metadata Daemon
--disable-use-lvmpolld disable usage of LVM Poll Daemon
@@ -11774,11 +11773,11 @@ $as_echo "$BUILD_LVMPOLLD" >&6; }
################################################################################
BUILD_LVMLOCKD=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build lockdsanlock" >&5
-$as_echo_n "checking whether to build lockdsanlock... " >&6; }
-# Check whether --enable-lockd-sanlock was given.
-if test "${enable_lockd_sanlock+set}" = set; then :
- enableval=$enable_lockd_sanlock; LOCKDSANLOCK=$enableval
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build lvmlockdsanlock" >&5
+$as_echo_n "checking whether to build lvmlockdsanlock... " >&6; }
+# Check whether --enable-lvmlockd-sanlock was given.
+if test "${enable_lvmlockd_sanlock+set}" = set; then :
+ enableval=$enable_lvmlockd_sanlock; LOCKDSANLOCK=$enableval
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCKDSANLOCK" >&5
@@ -11865,11 +11864,11 @@ $as_echo "#define LOCKDSANLOCK_SUPPORT 1" >>confdefs.h
fi
################################################################################
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build lockddlm" >&5
-$as_echo_n "checking whether to build lockddlm... " >&6; }
-# Check whether --enable-lockd-dlm was given.
-if test "${enable_lockd_dlm+set}" = set; then :
- enableval=$enable_lockd_dlm; LOCKDDLM=$enableval
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build lvmlockddlm" >&5
+$as_echo_n "checking whether to build lvmlockddlm... " >&6; }
+# Check whether --enable-lvmlockd-dlm was given.
+if test "${enable_lvmlockd_dlm+set}" = set; then :
+ enableval=$enable_lvmlockd_dlm; LOCKDDLM=$enableval
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCKDDLM" >&5
@@ -12105,17 +12104,18 @@ _ACEOF
$as_echo_n "checking whether to build dmfilemapd... " >&6; }
# Check whether --enable-dmfilemapd was given.
if test "${enable_dmfilemapd+set}" = set; then :
- enableval=$enable_dmfilemapd; DMFILEMAPD=$enableval
+ enableval=$enable_dmfilemapd; BUILD_DMFILEMAPD=$enableval
+else
+ BUILD_DMFILEMAPD=no
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DMFILEMAPD" >&5
-$as_echo "$DMFILEMAPD" >&6; }
-BUILD_DMFILEMAPD=$DMFILEMAPD
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_DMFILEMAPD" >&5
+$as_echo "$BUILD_DMFILEMAPD" >&6; }
-$as_echo "#define DMFILEMAPD 1" >>confdefs.h
+$as_echo "#define DMFILEMAPD \$BUILD_DMFILEMAPD" >>confdefs.h
-if test "$DMFILEMAPD" = yes; then
+if test "$BUILD_DMFILEMAPD" = yes; then
ac_fn_c_check_header_mongrel "$LINENO" "linux/fiemap.h" "ac_cv_header_linux_fiemap_h" "$ac_includes_default"
if test "x$ac_cv_header_linux_fiemap_h" = xyes; then :
@@ -12131,15 +12131,15 @@ fi
$as_echo_n "checking whether to build notifydbus... " >&6; }
# Check whether --enable-notify-dbus was given.
if test "${enable_notify_dbus+set}" = set; then :
- enableval=$enable_notify_dbus; NOTIFYDBUS=$enableval
+ enableval=$enable_notify_dbus; NOTIFYDBUS_SUPPORT=$enableval
+else
+ NOTIFYDBUS_SUPPORT=no
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $NOTIFYDBUS" >&5
-$as_echo "$NOTIFYDBUS" >&6; }
-
-BUILD_NOTIFYDBUS=$NOTIFYDBUS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $NOTIFYDBUS_SUPPORT" >&5
+$as_echo "$NOTIFYDBUS_SUPPORT" >&6; }
-if test "$BUILD_NOTIFYDBUS" = yes; then
+if test "$NOTIFYDBUS_SUPPORT" = yes; then
$as_echo "#define NOTIFYDBUS_SUPPORT 1" >>confdefs.h
@@ -12147,7 +12147,7 @@ $as_echo "#define NOTIFYDBUS_SUPPORT 1" >>confdefs.h
fi
################################################################################
-if test "$BUILD_NOTIFYDBUS" = yes; then
+if test "$NOTIFYDBUS_SUPPORT" = yes; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY_DBUS" >&5
@@ -15175,7 +15175,7 @@ done
fi
-if test "$DMFILEMAPD" = yes; then
+if test "$BUILD_DMFILEMAPD" = yes; then
for ac_header in sys/inotify.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
@@ -15669,8 +15669,6 @@ _ACEOF
-
-
################################################################################
ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile include/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile lib/cache_segtype/Makefile libdaemon/Makefile libdaemon
/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/
lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile"
diff --git a/configure.in b/configure.in
index 33cff4f..2ff4f99 100644
--- a/configure.in
+++ b/configure.in
@@ -1278,13 +1278,12 @@ dnl -- Check dmfilemapd
AC_MSG_CHECKING(whether to build dmfilemapd)
AC_ARG_ENABLE(dmfilemapd, AC_HELP_STRING([--enable-dmfilemapd],
[enable the dmstats filemap daemon]),
- DMFILEMAPD=$enableval)
-AC_MSG_RESULT($DMFILEMAPD)
-BUILD_DMFILEMAPD=$DMFILEMAPD
-AC_DEFINE([DMFILEMAPD], 1, [Define to 1 to enable the device-mapper 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
-if test "$DMFILEMAPD" = yes; then
+if test "$BUILD_DMFILEMAPD" = yes; then
AC_CHECK_HEADER([linux/fiemap.h], , [AC_MSG_ERROR(--enable-dmfilemapd requires fiemap.h)])
fi
@@ -1294,19 +1293,17 @@ AC_MSG_CHECKING(whether to build notifydbus)
AC_ARG_ENABLE(notify-dbus,
AC_HELP_STRING([--enable-notify-dbus],
[enable LVM notification using dbus]),
- NOTIFYDBUS=$enableval)
-AC_MSG_RESULT($NOTIFYDBUS)
+ NOTIFYDBUS_SUPPORT=$enableval, NOTIFYDBUS_SUPPORT=no)
+AC_MSG_RESULT($NOTIFYDBUS_SUPPORT)
-BUILD_NOTIFYDBUS=$NOTIFYDBUS
-
-if test "$BUILD_NOTIFYDBUS" = yes; then
+if test "$NOTIFYDBUS_SUPPORT" = yes; then
AC_DEFINE([NOTIFYDBUS_SUPPORT], 1, [Define to 1 to include code that uses dbus notification.])
LIBS="-lsystemd $LIBS"
fi
################################################################################
dnl -- Look for dbus libraries
-if test "$BUILD_NOTIFYDBUS" = yes; then
+if test "$NOTIFYDBUS_SUPPORT" = yes; then
PKG_CHECK_MODULES(NOTIFY_DBUS, systemd >= 221, [HAVE_NOTIFY_DBUS=yes], $bailout)
fi
@@ -1872,7 +1869,7 @@ if test "$UDEV_SYNC" = yes; then
AC_CHECK_HEADERS(sys/ipc.h sys/sem.h,,hard_bailout)
fi
-if test "$DMFILEMAPD" = yes; then
+if test "$BUILD_DMFILEMAPD" = yes; then
AC_CHECK_HEADERS([sys/inotify.h],,hard_bailout)
fi
@@ -2022,7 +2019,6 @@ AC_SUBST(BUILD_LVMLOCKD)
AC_SUBST(BUILD_LOCKDSANLOCK)
AC_SUBST(BUILD_LOCKDDLM)
AC_SUBST(BUILD_DMFILEMAPD)
-AC_SUBST(BUILD_NOTIFYDBUS)
AC_SUBST(CACHE)
AC_SUBST(CFLAGS)
AC_SUBST(CFLOW_CMD)
@@ -2071,7 +2067,6 @@ AC_SUBST(DLM_LIBS)
AC_SUBST(DL_LIBS)
AC_SUBST(DMEVENTD)
AC_SUBST(DMEVENTD_PATH)
-AC_SUBST(DMFILEMAPD)
AC_SUBST(DM_LIB_PATCHLEVEL)
AC_SUBST(ELDFLAGS)
AC_SUBST(FSADM)
diff --git a/man/Makefile.in b/man/Makefile.in
index 25b1c95..d0efb5d 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -89,7 +89,7 @@ else
MAN8DM+=$(DMEVENTDMAN)
endif
- ifeq ("@DMFILEMAPD@", "yes")
+ ifeq ("@BUILD_DMFILEMAPD@", "yes")
MAN8DM+=$(DMFILEMAPDMAN)
endif
7 years
master - WHATS_NEW: configure option enable-lvmlockd
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2d9097e9ca2c07cff18...
Commit: 2d9097e9ca2c07cff1870349bd15e30e151e709e
Parent: a5256d1353ef60a3f29a7af1a9d1389bc7d64104
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Apr 18 12:58:18 2017 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Apr 18 12:58:18 2017 -0500
WHATS_NEW: configure option enable-lvmlockd
---
WHATS_NEW | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index e59024b..39ad2af 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.171 -
==================================
+ Change configure option names from enable-lockd to enable-lvmlockd.
lvcreate - raise mirror/raid default regionsize to 2MiB
Add missing configurable prefix to configuration file installation directory.
7 years
master - spec: rename lockd to lvmlockd
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a5256d1353ef60a3f29...
Commit: a5256d1353ef60a3f29a7af1a9d1389bc7d64104
Parent: a41a8430d6101af83160109f50df052aecc3818b
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Apr 18 11:22:07 2017 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Apr 18 11:22:07 2017 -0500
spec: rename lockd to lvmlockd
---
spec/build.inc | 4 ++--
spec/packages.inc | 4 ++--
spec/source.inc | 22 +++++++++++-----------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/spec/build.inc b/spec/build.inc
index 88846c6..5321a70 100644
--- a/spec/build.inc
+++ b/spec/build.inc
@@ -27,8 +27,8 @@
%enableif %{enable_lvmpolld} lvmpolld
%global enable_lvmlockd %(if echo %{services} | grep -q lvmlockd; then echo 1; else echo 0; fi)
%if %{enable_lvmlockd}
-%enableif %{enable_lockd_dlm} lockd-dlm
-%enableif %{enable_lockd_sanlock} lockd-sanlock
+%enableif %{enable_lvmlockd_dlm} lvmlockd-dlm
+%enableif %{enable_lvmlockd_sanlock} lvmlockd-sanlock
%endif
%enableif %{enable_python} python2-bindings
%enableif %{enable_python3} python3-bindings
diff --git a/spec/packages.inc b/spec/packages.inc
index 74c4270..cdcc197 100644
--- a/spec/packages.inc
+++ b/spec/packages.inc
@@ -275,10 +275,10 @@ This package contains shared lvm2 libraries for applications.
Summary: LVM locking daemon
Group: System Environment/Base
Requires: lvm2 = %{version}-%{release}
-%if %{enable_lockd_dlm}
+%if %{enable_lvmlockd_dlm}
Requires: dlm-lib >= %{dlm_version}
%endif
-%if %{enable_lockd_sanlock}
+%if %{enable_lvmlockd_sanlock}
Requires: sanlock-lib >= %{sanlock_version}
%endif
Requires(post): systemd-units
diff --git a/spec/source.inc b/spec/source.inc
index a49b454..fb7ccf5 100644
--- a/spec/source.inc
+++ b/spec/source.inc
@@ -16,8 +16,8 @@
%global enable_lvmetad 1
%global enable_lvmpolld 1
%global enable_dmfilemapd 0
-#%global enable_lockd_dlm 0
-#%global enable_lockd_sanlock 0
+#%global enable_lvmlockd_dlm 0
+#%global enable_lvmlockd_sanlock 0
%if %{enable_udev}
%service lvmetad 1
@@ -52,24 +52,24 @@
%if %{fedora} >= 24 || %{rhel} >= 7
%service lvmlockd 1
%global sanlock_version 3.3.0-1
- %global enable_lockd_dlm 1
- %global enable_lockd_sanlock 1
+ %global enable_lvmlockd_dlm 1
+ %global enable_lvmlockd_sanlock 1
%if %{rhel}
%ifarch i686 x86_64 s390x
- %global buildreq_lockd_dlm dlm-devel >= %{dlm_version}
+ %global buildreq_lvmlockd_dlm dlm-devel >= %{dlm_version}
%else
- %global enable_lockd_dlm 0
+ %global enable_lvmlockd_dlm 0
%endif
%ifarch x86_64 ppc64le ppc64 aarch64
- %global buildreq_lockd_sanlock sanlock-devel >= %{sanlock_version}
+ %global buildreq_lvmlockd_sanlock sanlock-devel >= %{sanlock_version}
%else
- %global enable_lockd_sanlock 0
+ %global enable_lvmlockd_sanlock 0
%endif
%endif
%else
%if %{fedora} >= 22
%service lvmlockd 1
- %global enable_lockd_dlm 1
+ %global enable_lvmlockd_dlm 1
%endif
%endif
@@ -192,8 +192,8 @@ BuildRequires: pkgconfig
%maybe BuildRequires: %{?buildreq_udev}
%maybe BuildRequires: %{?buildreq_cluster}
-%maybe BuildRequires: %{?buildreq_lockd_dlm}
-%maybe BuildRequires: %{?buildreq_lockd_sanlock}
+%maybe BuildRequires: %{?buildreq_lvmlockd_dlm}
+%maybe BuildRequires: %{?buildreq_lvmlockd_sanlock}
%maybe BuildRequires: %{?buildreq_python2_devel}
%maybe BuildRequires: %{?buildreq_python3_devel}
%maybe BuildRequires: %{?buildreq_python_setuptools}
7 years
master - configure: rename lockd to lvmlockd
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a41a8430d6101af8316...
Commit: a41a8430d6101af83160109f50df052aecc3818b
Parent: aa25cfe084adf360c4ab1333a927b49279796f00
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Apr 18 11:02:49 2017 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Apr 18 11:18:07 2017 -0500
configure: rename lockd to lvmlockd
---
configure.in | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/configure.in b/configure.in
index 7dc3095..33cff4f 100644
--- a/configure.in
+++ b/configure.in
@@ -1150,10 +1150,10 @@ AC_MSG_RESULT($BUILD_LVMPOLLD)
################################################################################
BUILD_LVMLOCKD=no
-dnl -- Build lockdsanlock
-AC_MSG_CHECKING(whether to build lockdsanlock)
-AC_ARG_ENABLE(lockd-sanlock,
- AC_HELP_STRING([--enable-lockd-sanlock],
+dnl -- Build lvmlockdsanlock
+AC_MSG_CHECKING(whether to build lvmlockdsanlock)
+AC_ARG_ENABLE(lvmlockd-sanlock,
+ AC_HELP_STRING([--enable-lvmlockd-sanlock],
[enable the LVM lock daemon using sanlock]),
LOCKDSANLOCK=$enableval)
AC_MSG_RESULT($LOCKDSANLOCK)
@@ -1168,10 +1168,10 @@ if test "$BUILD_LOCKDSANLOCK" = yes; then
fi
################################################################################
-dnl -- Build lockddlm
-AC_MSG_CHECKING(whether to build lockddlm)
-AC_ARG_ENABLE(lockd-dlm,
- AC_HELP_STRING([--enable-lockd-dlm],
+dnl -- Build lvmlockddlm
+AC_MSG_CHECKING(whether to build lvmlockddlm)
+AC_ARG_ENABLE(lvmlockd-dlm,
+ AC_HELP_STRING([--enable-lvmlockd-dlm],
[enable the LVM lock daemon using dlm]),
LOCKDDLM=$enableval)
AC_MSG_RESULT($LOCKDDLM)
7 years