master - wipe: dev_set_bytes resolves zeroing
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2b36542f419ca66c0ee...
Commit: 2b36542f419ca66c0ee7de4537b5a9dd7a902e3d
Parent: d588de77aa720b31ea54594b75a1182b7e3a5255
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Sep 15 20:35:48 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Sep 15 23:07:06 2020 +0200
wipe: dev_set_bytes resolves zeroing
Since dev_write_zeros() is just subset of dev_set_bytes()
use it directly and simplify code.
---
lib/metadata/lv_manip.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index e3a1cbaff..063ff3e03 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -7641,6 +7641,7 @@ int wipe_lv(struct logical_volume *lv, struct wipe_params wp)
log_debug("Metadata logical volume %s will be fully zeroed.",
display_lvname(lv));
zero_sectors = lv->size;
+ wp.zero_value = 0;
} else {
if (wp.is_metadata) /* Verbosely notify metadata will not be fully zeroed */
log_verbose("Metadata logical volume %s not fully zeroed and may contain stale data.",
@@ -7657,11 +7658,7 @@ int wipe_lv(struct logical_volume *lv, struct wipe_params wp)
display_size(lv->vg->cmd, zero_sectors),
display_lvname(lv), wp.zero_value);
- if ((!wp.is_metadata &&
- wp.zero_value && !dev_set_bytes(dev, UINT64_C(0),
- (size_t) zero_sectors << SECTOR_SHIFT,
- (uint8_t)wp.zero_value)) ||
- !dev_write_zeros(dev, UINT64_C(0), (size_t) zero_sectors << SECTOR_SHIFT)) {
+ if (!dev_set_bytes(dev, UINT64_C(0), (size_t) zero_sectors << SECTOR_SHIFT, wp.zero_value)) {
label_scan_invalidate(dev);
log_error("Failed to initialize %s of logical volume %s with value %d.",
display_size(lv->vg->cmd, zero_sectors),
3 years, 8 months
master - wipe: convert zero_value to uint8_t
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d588de77aa720b31ea5...
Commit: d588de77aa720b31ea54594b75a1182b7e3a5255
Parent: ec4e8b5c0e33faed644e3a8b0f038181cfc69de3
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Sep 15 16:40:53 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Sep 15 22:52:25 2020 +0200
wipe: convert zero_value to uint8_t
We always write this value as byte.
---
lib/metadata/metadata-exported.h | 4 ++--
lib/metadata/mirror.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index 670656a0f..b109d5b6d 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -797,9 +797,9 @@ struct logical_volume *lv_create_empty(const char *name,
struct volume_group *vg);
struct wipe_params {
- int do_zero; /* should we do zeroing of LV start? */
uint64_t zero_sectors; /* sector count to zero */
- int zero_value; /* zero-out with this value */
+ uint8_t zero_value; /* zero-out with this value */
+ int do_zero; /* should we do zeroing of LV start? */
int do_wipe_signatures; /* should we wipe known signatures found on LV? */
int yes; /* answer yes automatically to all questions */
force_t force; /* force mode */
diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c
index d8803b3e3..c1934b5b7 100644
--- a/lib/metadata/mirror.c
+++ b/lib/metadata/mirror.c
@@ -325,8 +325,8 @@ static int _init_mirror_log(struct cmd_context *cmd,
if (activation()) {
if (!wipe_lv(log_lv, (struct wipe_params)
- { .do_zero = 1, .zero_sectors = log_lv->size,
- .zero_value = in_sync ? -1 : 0 })) {
+ { .zero_sectors = log_lv->size, .do_zero = 1,
+ .zero_value = in_sync ? 0xff : 0 })) {
log_error("Aborting. Failed to wipe mirror log.");
goto deactivate_and_revert_new_lv;
}
3 years, 8 months
master - wipe: zeroing of 8 sectors is granted
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ec4e8b5c0e33faed644...
Commit: ec4e8b5c0e33faed644e3a8b0f038181cfc69de3
Parent: 7bcc99477638eee4c813acf1ca60233ed0c6bb61
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Sep 15 16:38:50 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Sep 15 22:52:25 2020 +0200
wipe: zeroing of 8 sectors is granted
With do_zero min is always 8 sectors, so use 0 as default.
---
lib/metadata/integrity_manip.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/metadata/integrity_manip.c b/lib/metadata/integrity_manip.c
index 42e6d936e..00d310e36 100644
--- a/lib/metadata/integrity_manip.c
+++ b/lib/metadata/integrity_manip.c
@@ -533,7 +533,7 @@ int lv_add_integrity_to_raid(struct logical_volume *lv, struct integrity_setting
*/
for (s = 0; s < area_count; s++) {
struct logical_volume *meta_lv;
- struct wipe_params wipe = { .do_zero = 1, .zero_sectors = 8 };
+ struct wipe_params wipe = { .do_zero = 1 };
if (s >= DEFAULT_RAID_MAX_IMAGES)
goto_bad;
3 years, 8 months
master - label: deduplicate dev_set_bytes
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7bcc99477638eee4c81...
Commit: 7bcc99477638eee4c813acf1ca60233ed0c6bb61
Parent: 7b0813384463d9c6e0e5d815658350f75d55ebb5
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Sep 15 16:29:12 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Sep 15 22:52:25 2020 +0200
label: deduplicate dev_set_bytes
As dev_write_zeros() is same as dev_set_bytes() reused the code
directly.
---
lib/label/label.c | 51 +++------------------------------------------------
1 file changed, 3 insertions(+), 48 deletions(-)
diff --git a/lib/label/label.c b/lib/label/label.c
index 6c86e9ab2..ba3b1f9c7 100644
--- a/lib/label/label.c
+++ b/lib/label/label.c
@@ -1514,53 +1514,7 @@ bool dev_invalidate_bytes(struct device *dev, uint64_t start, size_t len)
bool dev_write_zeros(struct device *dev, uint64_t start, size_t len)
{
- if (test_mode())
- return true;
-
- if (!scan_bcache) {
- log_error("dev_write_zeros bcache not set up %s", dev_name(dev));
- return false;
- }
-
- if (_in_bcache(dev) && !(dev->flags & DEV_BCACHE_WRITE)) {
- /* FIXME: avoid tossing out bcache blocks just to replace fd. */
- log_debug("Close and reopen to write %s", dev_name(dev));
- _invalidate_fd(scan_bcache, dev->bcache_fd);
- _scan_dev_close(dev);
-
- dev->flags |= DEV_BCACHE_WRITE;
- label_scan_open(dev);
- }
-
- if (dev->bcache_fd <= 0) {
- /* This is not often needed. */
- dev->flags |= DEV_BCACHE_WRITE;
- if (!label_scan_open(dev)) {
- log_error("Error opening device %s for writing at %llu length %u.",
- dev_name(dev), (unsigned long long)start, (uint32_t)len);
- return false;
- }
- }
-
- dev_set_last_byte(dev, start + len);
-
- if (!bcache_zero_bytes(scan_bcache, dev->bcache_fd, start, len)) {
- log_error("Error writing device %s at %llu length %u.",
- dev_name(dev), (unsigned long long)start, (uint32_t)len);
- dev_unset_last_byte(dev);
- label_scan_invalidate(dev);
- return false;
- }
-
- if (!bcache_flush(scan_bcache)) {
- log_error("Error writing device %s at %llu length %u.",
- dev_name(dev), (unsigned long long)start, (uint32_t)len);
- dev_unset_last_byte(dev);
- label_scan_invalidate(dev);
- return false;
- }
- dev_unset_last_byte(dev);
- return true;
+ return dev_set_bytes(dev, start, len, 0);
}
bool dev_set_bytes(struct device *dev, uint64_t start, size_t len, uint8_t val)
@@ -1593,7 +1547,8 @@ bool dev_set_bytes(struct device *dev, uint64_t start, size_t len, uint8_t val)
dev_set_last_byte(dev, start + len);
- if (!bcache_set_bytes(scan_bcache, dev->bcache_fd, start, len, val)) {
+ if ((!val && !bcache_zero_bytes(scan_bcache, dev->bcache_fd, start, len)) ||
+ !bcache_set_bytes(scan_bcache, dev->bcache_fd, start, len, val)) {
log_error("Error writing device %s at %llu length %u.",
dev_name(dev), (unsigned long long)start, (uint32_t)len);
dev_unset_last_byte(dev);
3 years, 8 months
master - label: code deduplication
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7b0813384463d9c6e0e...
Commit: 7b0813384463d9c6e0e5d815658350f75d55ebb5
Parent: 6d344b4ac05cab54d65cc5380afeb7931873d6f0
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Sep 15 16:20:16 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Sep 15 22:52:25 2020 +0200
label: code deduplication
---
lib/label/label.c | 29 ++++++-----------------------
1 file changed, 6 insertions(+), 23 deletions(-)
diff --git a/lib/label/label.c b/lib/label/label.c
index 8e68f9303..6c86e9ab2 100644
--- a/lib/label/label.c
+++ b/lib/label/label.c
@@ -1060,10 +1060,7 @@ int label_scan(struct cmd_context *cmd)
* label_scan should not generally be called a second time,
* so this will usually not be true.
*/
- if (_in_bcache(dev)) {
- _invalidate_fd(scan_bcache, dev->bcache_fd);
- _scan_dev_close(dev);
- }
+ label_scan_invalidate(dev);
};
dev_iter_destroy(iter);
@@ -1232,12 +1229,8 @@ int label_scan_devs(struct cmd_context *cmd, struct dev_filter *f, struct dm_lis
return 0;
}
- dm_list_iterate_items(devl, devs) {
- if (_in_bcache(devl->dev)) {
- _invalidate_fd(scan_bcache, devl->dev->bcache_fd);
- _scan_dev_close(devl->dev);
- }
- }
+ dm_list_iterate_items(devl, devs)
+ label_scan_invalidate(devl->dev);
_scan_list(cmd, f, devs, NULL);
@@ -1260,10 +1253,7 @@ int label_scan_devs_rw(struct cmd_context *cmd, struct dev_filter *f, struct dm_
}
dm_list_iterate_items(devl, devs) {
- if (_in_bcache(devl->dev)) {
- _invalidate_fd(scan_bcache, devl->dev->bcache_fd);
- _scan_dev_close(devl->dev);
- }
+ label_scan_invalidate(devl->dev);
/*
* With this flag set, _scan_dev_open() done by
* _scan_list() will do open RW
@@ -1282,10 +1272,7 @@ int label_scan_devs_excl(struct dm_list *devs)
int failed = 0;
dm_list_iterate_items(devl, devs) {
- if (_in_bcache(devl->dev)) {
- _invalidate_fd(scan_bcache, devl->dev->bcache_fd);
- _scan_dev_close(devl->dev);
- }
+ label_scan_invalidate(devl->dev);
/*
* With this flag set, _scan_dev_open() done by
* _scan_list() will do open EXCL
@@ -1384,10 +1371,7 @@ int label_read(struct device *dev)
dm_list_init(&one_dev);
dm_list_add(&one_dev, &devl->list);
- if (_in_bcache(dev)) {
- _invalidate_fd(scan_bcache, dev->bcache_fd);
- _scan_dev_close(dev);
- }
+ label_scan_invalidate(dev);
_scan_list(NULL, NULL, &one_dev, &failed);
@@ -1665,4 +1649,3 @@ void dev_unset_last_byte(struct device *dev)
{
bcache_unset_last_byte(scan_bcache, dev->bcache_fd);
}
-
3 years, 8 months
master - hints: enhance debug with log_sys_debug
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=6d344b4ac05cab54d65...
Commit: 6d344b4ac05cab54d65cc5380afeb7931873d6f0
Parent: 187cc8d344ed806194ac7a8ce7582d043cf1d673
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Sep 15 21:33:30 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Sep 15 22:52:25 2020 +0200
hints: enhance debug with log_sys_debug
---
lib/label/hints.c | 43 ++++++++++++++++++++++++++++---------------
1 file changed, 28 insertions(+), 15 deletions(-)
diff --git a/lib/label/hints.c b/lib/label/hints.c
index 4177c678f..5ca2c3638 100644
--- a/lib/label/hints.c
+++ b/lib/label/hints.c
@@ -190,8 +190,10 @@ static int _hints_exists(void)
if (!stat(_hints_file, &buf))
return 1;
+
if (errno != ENOENT)
- log_debug("hints_exist errno %d", errno);
+ log_sys_debug("stat", _hints_file);
+
return 0;
}
@@ -201,8 +203,10 @@ static int _nohints_exists(void)
if (!stat(_nohints_file, &buf))
return 1;
+
if (errno != ENOENT)
- log_debug("nohints_exist errno %d", errno);
+ log_sys_debug("stat", _nohints_file);
+
return 0;
}
@@ -212,8 +216,10 @@ static int _newhints_exists(void)
if (!stat(_newhints_file, &buf))
return 1;
+
if (errno != ENOENT)
- log_debug("newhints_exist errno %d", errno);
+ log_sys_debug("stat", _newhints_file);
+
return 0;
}
@@ -243,29 +249,33 @@ static int _touch_hints(void)
{
FILE *fp;
- if (!(fp = fopen(_hints_file, "w")))
- return_0;
+ if (!(fp = fopen(_hints_file, "w"))) {
+ log_sys_debug("fopen", _hints_file);
+ return 0;
+ }
if (fclose(fp))
- stack;
+ log_sys_debug("fclose", _hints_file);
+
return 1;
}
static void _unlink_nohints(void)
{
if (unlink(_nohints_file))
- log_debug("unlink_nohints errno %d", errno);
+ log_sys_debug("unlink", _nohints_file);
}
+
static void _unlink_hints(void)
{
if (unlink(_hints_file))
- log_debug("unlink_hints errno %d", errno);
+ log_sys_debug("unlink", _hints_file);
}
static void _unlink_newhints(void)
{
if (unlink(_newhints_file))
- log_debug("unlink_newhints errno %d", errno);
+ log_sys_debug("unlink", _newhints_file);
}
static int _clear_hints(struct cmd_context *cmd)
@@ -312,7 +322,7 @@ static int _lock_hints(struct cmd_context *cmd, int mode, int nonblock)
fd = open(_hints_file, O_RDWR);
if (fd < 0) {
- log_debug("lock_hints open errno %d", errno);
+ log_sys_debug("open", _hints_file);
return 0;
}
@@ -324,7 +334,8 @@ static int _lock_hints(struct cmd_context *cmd, int mode, int nonblock)
}
if (close(fd))
- stack;
+ log_sys_debug("close", _hints_file);
+
return 0;
}
@@ -434,7 +445,7 @@ static int _dev_in_hint_hash(struct cmd_context *cmd, struct device *dev)
return 0;
if (!dev_get_size(dev, &devsize) || !devsize)
- return 0;
+ return_0;
return 1;
}
@@ -799,7 +810,7 @@ static int _read_hint_file(struct cmd_context *cmd, struct dm_list *hints, int *
}
if (fclose(fp))
- stack;
+ log_sys_debug("fclose", _hints_file);
if (!ret)
return 0;
@@ -1020,7 +1031,7 @@ int write_hint_file(struct cmd_context *cmd, int newhints)
out_close:
if (fclose(fp))
- stack;
+ log_sys_debug("fclose", _hints_file);
out_unlock:
/* get_hints() took ex lock before returning with newhints set */
@@ -1118,8 +1129,10 @@ void pvscan_recreate_hints_begin(struct cmd_context *cmd)
log_debug("pvscan_recreate_hints_begin");
- if (!_touch_hints())
+ if (!_touch_hints()) {
+ stack;
return;
+ }
/* limit potential delay blocking on hints lock next */
if (!_touch_nohints())
3 years, 8 months
master - lvcreate: change error message
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=187cc8d344ed806194a...
Commit: 187cc8d344ed806194ac7a8ce7582d043cf1d673
Parent: 39198eb2cebb6a45e148d554d1ed474bda5cbbde
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Sep 15 22:45:49 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Sep 15 22:52:25 2020 +0200
lvcreate: change error message
Provide more useful error message.
---
lib/metadata/vdo_manip.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/metadata/vdo_manip.c b/lib/metadata/vdo_manip.c
index 7862682d8..30682449c 100644
--- a/lib/metadata/vdo_manip.c
+++ b/lib/metadata/vdo_manip.c
@@ -390,7 +390,8 @@ struct logical_volume *convert_vdo_pool_lv(struct logical_volume *data_lv,
}
if (!deactivate_lv(data_lv->vg->cmd, data_lv)) {
- log_error("Aborting. Manual intervention required.");
+ log_error("Cannot deactivate formated VDO pool volume %s.",
+ display_lvname(data_lv));
return NULL;
}
3 years, 8 months
master - lvcreate: add extra synchronization at error path
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=39198eb2cebb6a45e14...
Commit: 39198eb2cebb6a45e148d554d1ed474bda5cbbde
Parent: 18a60c634094273b92182734ceb2013817c497ab
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Sep 4 18:08:59 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Sep 15 22:52:25 2020 +0200
lvcreate: add extra synchronization at error path
Put explict udev synchronization before we try to deactive devices.
---
lib/metadata/lv_manip.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index d1389d725..e3a1cbaff 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -8598,6 +8598,9 @@ out:
return lv;
deactivate_and_revert_new_lv:
+ if (!sync_local_dev_names(lv->vg->cmd))
+ log_error("Failed to sync local devices before reverting %s.",
+ display_lvname(lv));
if (!deactivate_lv(cmd, lv)) {
log_error("Unable to deactivate failed new LV %s. "
"Manual intervention required.", display_lvname(lv));
3 years, 8 months
master - tests: protect this test for another kernel
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=18a60c634094273b921...
Commit: 18a60c634094273b92182734ceb2013817c497ab
Parent: 9c0d11ecc952ff32b3b5746478d9c76de761775e
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Sep 12 19:08:24 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Sep 14 00:15:14 2020 +0200
tests: protect this test for another kernel
Thisi 3.10.0-862 kernel also dies with this test.
---
test/shell/lvconvert-raid-reshape-stripes-load-reload.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/shell/lvconvert-raid-reshape-stripes-load-reload.sh b/test/shell/lvconvert-raid-reshape-stripes-load-reload.sh
index 59e147436..b79561fbb 100644
--- a/test/shell/lvconvert-raid-reshape-stripes-load-reload.sh
+++ b/test/shell/lvconvert-raid-reshape-stripes-load-reload.sh
@@ -22,7 +22,7 @@ which mkfs.ext4 || skip
aux have_raid 1 13 2 || skip
case "$(uname -r)" in
- 5.[89]*) die "Cannot run this test on unfixed kernel." ;;
+ 5.[89]*|3.10.0-862*) die "Cannot run this test on unfixed kernel." ;;
esac
mount_dir="mnt"
3 years, 8 months
master - tests: tune usage of smaller metadata
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9c0d11ecc952ff32b3b...
Commit: 9c0d11ecc952ff32b3b5746478d9c76de761775e
Parent: 1005fd7b067320d03067229912bf4844d1a54836
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Sep 12 19:06:05 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Sep 14 00:15:14 2020 +0200
tests: tune usage of smaller metadata
While the previous commit c9b40083fc34b5e2a1bfc7b251b38c0b8737483f
decresed version to 1.19 for using bigger datasets, it's not
been quite right - so from our bb machine it looks like
bigger metadata consumption started with 1.19 and kernel 4.18
(fc27)
---
test/shell/lvextend-thin-metadata-dmeventd.sh | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/test/shell/lvextend-thin-metadata-dmeventd.sh b/test/shell/lvextend-thin-metadata-dmeventd.sh
index 38a405668..ccdf9e853 100644
--- a/test/shell/lvextend-thin-metadata-dmeventd.sh
+++ b/test/shell/lvextend-thin-metadata-dmeventd.sh
@@ -19,6 +19,13 @@ export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest
+
+# With thin-pool version >= 1.19 and kernel >= 4.18
+# slightly less metadata can fit.
+BIG_DATA="generate_more_metadata"
+aux target_at_least dm-thin-pool 1 19 0 && \
+ aux kernel_at_least 4 18 0 && BIG_DATA=""
+
meta_percent_() {
get lv_field $vg/pool metadata_percent | cut -d. -f1
}
@@ -91,7 +98,7 @@ lvchange -an $vg/pool
# Consume more then (100% - 4MiB) out of 32MiB metadata volume (>87.5%)
# (Test for less than 4MiB free space in metadata, which is less than 25%)
DATA=7200 # Newer version of thin-pool have hidden reserve, so use lower value
-aux target_at_least dm-thin-pool 1 19 0 || DATA=7400
+test -z "$BIG_DATA" || DATA=7400
fake_metadata_ "$DATA" 2 >data
"$LVM_TEST_THIN_RESTORE_CMD" -i data -o "$DM_DEV_DIR/mapper/$vg-$lv2"
# Swap volume with restored fake metadata
@@ -177,7 +184,7 @@ lvchange -an $vg
#
DATA=300 # Newer version of thin-pool have hidden reserve, so use lower value
-aux target_at_least dm-thin-pool 1 19 0 || DATA=350
+test -z "$BIG_DATA" || DATA=350
fake_metadata_ $DATA 2 >data
lvchange -ay $vg/$lv1
"$LVM_TEST_THIN_RESTORE_CMD" -i data -o "$DM_DEV_DIR/mapper/$vg-$lv1"
3 years, 8 months