master - tests: lower memory usage
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7f019f2580eadbb7893...
Commit: 7f019f2580eadbb7893388e0be0e095753f4a9d6
Parent: 72b931d66407fedc68735324996fa190ebaf1a3f
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Sep 17 23:25:23 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Sep 17 23:27:45 2020 +0200
tests: lower memory usage
Reduce memory needed by test at one time.
---
test/shell/integrity.sh | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/test/shell/integrity.sh b/test/shell/integrity.sh
index 95c8557cc..f2acc1ee4 100644
--- a/test/shell/integrity.sh
+++ b/test/shell/integrity.sh
@@ -24,8 +24,9 @@ mkdir -p $mnt
aux prepare_devs 5 64
printf "%0.sA" {1..16384} >> fileA
-printf "%0.sB" {1..16384} >> fileB
-printf "%0.sC" {1..16384} >> fileC
+# instead of long debug 'printf' log use 'sed' and just replace A->B|C
+sed -e 's,A,B,g' fileA > fileB
+sed -e 's,A,C,g' fileA > fileC
# generate random data
dd if=/dev/urandom of=randA bs=512K count=2
@@ -35,11 +36,11 @@ 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" || true
- dd if=/dev/zero of="$dev2" || true
- dd if=/dev/zero of="$dev3" || true
- dd if=/dev/zero of="$dev4" || true
- dd if=/dev/zero of="$dev5" || true
+ dd if=/dev/zero of="$dev1" bs=1M || true
+ dd if=/dev/zero of="$dev2" bs=1M || true
+ dd if=/dev/zero of="$dev3" bs=1M || true
+ dd if=/dev/zero of="$dev4" bs=1M || true
+ dd if=/dev/zero of="$dev5" bs=1M || true
vgcreate $SHARED $vg "$dev1" "$dev2" "$dev3" "$dev4" "$dev5"
pvs
}
@@ -66,10 +67,13 @@ _test_fs_with_error() {
# on the last 4096 byte block.
xxd "$dev1" > dev1.txt
tac dev1.txt > dev1.rev
+ rm -f dev1.txt
sed -e '0,/4242 4242 4242 4242 4242 4242 4242 4242/ s/4242 4242 4242 4242 4242 4242 4242 4242/4242 4242 4242 4242 4242 4242 4242 4243/' dev1.rev > dev1.rev.bad
+ rm -f dev1.rev
tac dev1.rev.bad > dev1.bad
+ rm -f dev1.rev.bad
xxd -r dev1.bad > "$dev1"
- rm dev1.txt dev1.rev dev1.rev.bad dev1.bad
+ rm -f dev1.bad
lvchange -ay $vg/$lv1
mount "$DM_DEV_DIR/$vg/$lv1" $mnt
3 years, 8 months
master - configure: enable integrity by default
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=72b931d66407fedc687...
Commit: 72b931d66407fedc68735324996fa190ebaf1a3f
Parent: 46f43589d00d0bcb74028df602897509db7d93b9
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Sep 16 15:14:51 2020 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Sep 16 15:14:51 2020 -0500
configure: enable integrity by default
---
WHATS_NEW | 1 +
configure | 2 +-
configure.ac | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 15f4d8e6a..0f6412fc5 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.03.11 -
==================================
+ Configure --with-integrity enabled.
Restore lost signal blocking while VG lock is held.
Improve estimation of needed extents when creating thin-pool.
Use extra 1% when resizing thin-pool metadata LV with --use-policy.
diff --git a/configure b/configure
index 219a3ba2f..f7b681cad 100755
--- a/configure
+++ b/configure
@@ -9771,7 +9771,7 @@ $as_echo_n "checking whether to include integrity... " >&6; }
if test "${with_integrity+set}" = set; then :
withval=$with_integrity; INTEGRITY=$withval
else
- INTEGRITY="none"
+ INTEGRITY="internal"
fi
diff --git a/configure.ac b/configure.ac
index 537dc801c..c2a72abf2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -673,7 +673,7 @@ AC_MSG_CHECKING(whether to include integrity)
AC_ARG_WITH(integrity,
AC_HELP_STRING([--with-integrity=TYPE],
[integrity support: internal/none [none]]),
- INTEGRITY=$withval, INTEGRITY="none")
+ INTEGRITY=$withval, INTEGRITY="internal")
AC_MSG_RESULT($INTEGRITY)
3 years, 8 months
master - hints: enhance debug messages
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=46f43589d00d0bcb740...
Commit: 46f43589d00d0bcb74028df602897509db7d93b9
Parent: 491eb258327ca07d1fe98e8bb344f63e14d97c0a
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Sep 16 14:46:50 2020 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Sep 16 15:01:10 2020 -0500
hints: enhance debug messages
---
lib/label/hints.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/lib/label/hints.c b/lib/label/hints.c
index 5ca2c3638..4a51ec918 100644
--- a/lib/label/hints.c
+++ b/lib/label/hints.c
@@ -192,7 +192,7 @@ static int _hints_exists(void)
return 1;
if (errno != ENOENT)
- log_sys_debug("stat", _hints_file);
+ log_debug("hints_exist errno %d %s", errno, _hints_file);
return 0;
}
@@ -205,7 +205,7 @@ static int _nohints_exists(void)
return 1;
if (errno != ENOENT)
- log_sys_debug("stat", _nohints_file);
+ log_debug("nohints_exist errno %d %s", errno, _nohints_file);
return 0;
}
@@ -218,7 +218,7 @@ static int _newhints_exists(void)
return 1;
if (errno != ENOENT)
- log_sys_debug("stat", _newhints_file);
+ log_debug("newhints_exist errno %d %s", errno, _newhints_file);
return 0;
}
@@ -250,11 +250,11 @@ static int _touch_hints(void)
FILE *fp;
if (!(fp = fopen(_hints_file, "w"))) {
- log_sys_debug("fopen", _hints_file);
+ log_debug("touch_hints errno %d %s", errno, _hints_file);
return 0;
}
if (fclose(fp))
- log_sys_debug("fclose", _hints_file);
+ log_debug("touch_hints close errno %d %s", errno, _hints_file);
return 1;
}
@@ -262,20 +262,20 @@ static int _touch_hints(void)
static void _unlink_nohints(void)
{
if (unlink(_nohints_file))
- log_sys_debug("unlink", _nohints_file);
+ log_debug("unlink_nohints errno %d %s", errno, _nohints_file);
}
static void _unlink_hints(void)
{
if (unlink(_hints_file))
- log_sys_debug("unlink", _hints_file);
+ log_debug("unlink_hints errno %d %s", errno, _hints_file);
}
static void _unlink_newhints(void)
{
if (unlink(_newhints_file))
- log_sys_debug("unlink", _newhints_file);
+ log_debug("unlink_newhints errno %d %s", errno, _newhints_file);
}
static int _clear_hints(struct cmd_context *cmd)
@@ -295,10 +295,10 @@ static int _clear_hints(struct cmd_context *cmd)
fprintf(fp, "# Created empty by %s pid %d %s", cmd->name, getpid(), ctime(&t));
if (fflush(fp))
- log_debug("clear_hints flush errno %d", errno);
+ log_debug("clear_hints flush errno %d %s", errno, _hints_file);
if (fclose(fp))
- log_debug("clear_hints close errno %d", errno);
+ log_debug("clear_hints close errno %d %s", errno, _hints_file);
return 1;
}
@@ -322,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_sys_debug("open", _hints_file);
+ log_debug("lock_hints open errno %d %s", errno, _hints_file);
return 0;
}
@@ -334,7 +334,7 @@ static int _lock_hints(struct cmd_context *cmd, int mode, int nonblock)
}
if (close(fd))
- log_sys_debug("close", _hints_file);
+ log_debug("lock_hints close errno %d %s", errno, _hints_file);
return 0;
}
@@ -810,7 +810,7 @@ static int _read_hint_file(struct cmd_context *cmd, struct dm_list *hints, int *
}
if (fclose(fp))
- log_sys_debug("fclose", _hints_file);
+ log_debug("read_hint_file close errno %d", errno);
if (!ret)
return 0;
@@ -1031,7 +1031,7 @@ int write_hint_file(struct cmd_context *cmd, int newhints)
out_close:
if (fclose(fp))
- log_sys_debug("fclose", _hints_file);
+ log_debug("write_hint_file close errno %d", errno);
out_unlock:
/* get_hints() took ex lock before returning with newhints set */
3 years, 8 months
master - label: cleanup set_byte error exit
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=491eb258327ca07d1fe...
Commit: 491eb258327ca07d1fe98e8bb344f63e14d97c0a
Parent: 37bcd7ce840c7c18d41e9e308aba2be7b33e7eec
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Sep 16 13:54:16 2020 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Sep 16 13:54:16 2020 -0500
label: cleanup set_byte error exit
---
lib/label/label.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/lib/label/label.c b/lib/label/label.c
index ba3b1f9c7..3b2011f6e 100644
--- a/lib/label/label.c
+++ b/lib/label/label.c
@@ -1519,6 +1519,8 @@ bool dev_write_zeros(struct device *dev, uint64_t start, size_t len)
bool dev_set_bytes(struct device *dev, uint64_t start, size_t len, uint8_t val)
{
+ bool rv;
+
if (test_mode())
return true;
@@ -1547,25 +1549,30 @@ bool dev_set_bytes(struct device *dev, uint64_t start, size_t len, uint8_t val)
dev_set_last_byte(dev, start + len);
- 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.",
+ if (!val)
+ rv = bcache_zero_bytes(scan_bcache, dev->bcache_fd, start, len);
+ else
+ rv = bcache_set_bytes(scan_bcache, dev->bcache_fd, start, len, val);
+
+ if (!rv) {
+ log_error("Error writing device value %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;
+ goto fail;
}
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;
+ goto fail;
}
dev_unset_last_byte(dev);
return true;
+
+fail:
+ dev_unset_last_byte(dev);
+ label_scan_invalidate(dev);
+ return false;
}
void dev_set_last_byte(struct device *dev, uint64_t offset)
3 years, 8 months
master - Revert "label: use formaters FMTu64 and FMTsize_t"
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=37bcd7ce840c7c18d41...
Commit: 37bcd7ce840c7c18d41e9e308aba2be7b33e7eec
Parent: 52d3c4de6e989ee0bef3df65593e567051cc6cec
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Sep 16 13:47:06 2020 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Sep 16 13:47:06 2020 -0500
Revert "label: use formaters FMTu64 and FMTsize_t"
This reverts commit d0ccb2521ba4f34455078f87f46cc41f5761ffc0.
---
lib/label/label.c | 73 ++++++++++++++++++++++++++++---------------------------
1 file changed, 37 insertions(+), 36 deletions(-)
diff --git a/lib/label/label.c b/lib/label/label.c
index 1b138a5a3..ba3b1f9c7 100644
--- a/lib/label/label.c
+++ b/lib/label/label.c
@@ -132,8 +132,8 @@ int label_remove(struct device *dev)
memset(readbuf, 0, sizeof(readbuf));
if (!dev_read_bytes(dev, sector << SECTOR_SHIFT, LABEL_SIZE, readbuf)) {
- log_error("Failed to read label from %s sector " FMTu64,
- dev_name(dev), sector);
+ log_error("Failed to read label from %s sector %llu",
+ dev_name(dev), (unsigned long long)sector);
continue;
}
@@ -154,12 +154,12 @@ int label_remove(struct device *dev)
}
if (wipe) {
- log_very_verbose("%s: Wiping label at sector " FMTu64,
- dev_name(dev), sector);
+ log_very_verbose("%s: Wiping label at sector %llu",
+ dev_name(dev), (unsigned long long)sector);
if (!dev_write_zeros(dev, sector << SECTOR_SHIFT, LABEL_SIZE)) {
- log_error("Failed to remove label from %s at sector " FMTu64,
- dev_name(dev), sector);
+ log_error("Failed to remove label from %s at sector %llu",
+ dev_name(dev), (unsigned long long)sector);
r = 0;
} else {
/* Also remove the PV record from cache. */
@@ -187,7 +187,7 @@ int label_write(struct device *dev, struct label *label)
}
if ((LABEL_SIZE + (label->sector << SECTOR_SHIFT)) > LABEL_SCAN_SIZE) {
- log_error("Label sector " FMTu64 " beyond range (%ld)",
+ log_error("Label sector %" PRIu64 " beyond range (%ld)",
label->sector, LABEL_SCAN_SECTORS);
return 0;
}
@@ -204,8 +204,8 @@ int label_write(struct device *dev, struct label *label)
lh->crc_xl = xlate32(calc_crc(INITIAL_CRC, (uint8_t *)&lh->offset_xl, LABEL_SIZE -
((uint8_t *) &lh->offset_xl - (uint8_t *) lh)));
- log_very_verbose("%s: Writing label to sector " FMTu64 " with stored offset "
- FMTu32 ".", dev_name(dev), label->sector,
+ log_very_verbose("%s: Writing label to sector %" PRIu64 " with stored offset %"
+ PRIu32 ".", dev_name(dev), label->sector,
xlate32(lh->offset_xl));
if (!label_scan_open(dev)) {
@@ -297,13 +297,14 @@ static struct labeller *_find_lvm_header(struct device *dev,
if (!memcmp(lh->id, LABEL_ID, sizeof(lh->id))) {
if (found) {
- log_error("Ignoring additional label on %s at sector " FMTu64,
- dev_name(dev), (block_sector + sector));
+ log_error("Ignoring additional label on %s at sector %llu",
+ dev_name(dev), (unsigned long long)(block_sector + sector));
}
if (xlate64(lh->sector_xl) != sector) {
- log_warn("%s: Label for sector " FMTu64 " found at sector " FMTu64 " - ignoring.",
- dev_name(dev), xlate64(lh->sector_xl),
- (block_sector + sector));
+ log_warn("%s: Label for sector %llu found at sector %llu - ignoring.",
+ dev_name(dev),
+ (unsigned long long)xlate64(lh->sector_xl),
+ (unsigned long long)(block_sector + sector));
continue;
}
if (calc_crc(INITIAL_CRC, (uint8_t *)&lh->offset_xl,
@@ -317,13 +318,13 @@ static struct labeller *_find_lvm_header(struct device *dev,
dm_list_iterate_items(li, &_labellers) {
if (li->l->ops->can_handle(li->l, (char *) lh, block_sector + sector)) {
- log_very_verbose("%s: %s label detected at sector " FMTu64,
+ log_very_verbose("%s: %s label detected at sector %llu",
dev_name(dev), li->name,
- (block_sector + sector));
+ (unsigned long long)(block_sector + sector));
if (found) {
- log_error("Ignoring additional label on %s at sector " FMTu64,
+ log_error("Ignoring additional label on %s at sector %llu",
dev_name(dev),
- (block_sector + sector));
+ (unsigned long long)(block_sector + sector));
continue;
}
@@ -1136,8 +1137,8 @@ int label_scan(struct cmd_context *cmd)
log_warn("WARNING: metadata may not be usable with current io_memory_size %d KiB",
io_memory_size());
- log_warn("WARNING: increase lvm.conf io_memory_size to at least " FMTu64 " KiB",
- want_size_kb);
+ log_warn("WARNING: increase lvm.conf io_memory_size to at least %llu KiB",
+ (unsigned long long)want_size_kb);
}
dm_list_init(&cmd->hints);
@@ -1441,15 +1442,15 @@ bool dev_read_bytes(struct device *dev, uint64_t start, size_t len, void *data)
if (dev->bcache_fd <= 0) {
/* This is not often needed. */
if (!label_scan_open(dev)) {
- log_error("Error opening device %s for reading at " FMTu64 " length " FMTsize_t ".",
- dev_name(dev), start, len);
+ log_error("Error opening device %s for reading at %llu length %u.",
+ dev_name(dev), (unsigned long long)start, (uint32_t)len);
return false;
}
}
if (!bcache_read_bytes(scan_bcache, dev->bcache_fd, start, len, data)) {
- log_error("Error reading device %s at " FMTu64 " length " FMTsize_t ".",
- dev_name(dev), start, len);
+ log_error("Error reading device %s at %llu length %u.",
+ dev_name(dev), (unsigned long long)start, (uint32_t)len);
label_scan_invalidate(dev);
return false;
}
@@ -1482,23 +1483,23 @@ bool dev_write_bytes(struct device *dev, uint64_t start, size_t len, void *data)
/* This is not often needed. */
dev->flags |= DEV_BCACHE_WRITE;
if (!label_scan_open(dev)) {
- log_error("Error opening device %s for writing at " FMTu64 " length " FMTsize_t ".",
- dev_name(dev), start, len);
+ log_error("Error opening device %s for writing at %llu length %u.",
+ dev_name(dev), (unsigned long long)start, (uint32_t)len);
return false;
}
}
if (!bcache_write_bytes(scan_bcache, dev->bcache_fd, start, len, data)) {
- log_error("Error writing device %s at " FMTu64 " length " FMTsize_t ".",
- dev_name(dev), 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 " FMTu64 " length " FMTsize_t ".",
- dev_name(dev), 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;
@@ -1538,8 +1539,8 @@ bool dev_set_bytes(struct device *dev, uint64_t start, size_t len, uint8_t val)
/* This is not often needed. */
dev->flags |= DEV_BCACHE_WRITE;
if (!label_scan_open(dev)) {
- log_error("Error opening device %s for writing at " FMTu64 " length " FMTsize_t ".",
- dev_name(dev), start, len);
+ log_error("Error opening device %s for writing at %llu length %u.",
+ dev_name(dev), (unsigned long long)start, (uint32_t)len);
return false;
}
}
@@ -1548,16 +1549,16 @@ bool dev_set_bytes(struct device *dev, uint64_t start, size_t len, uint8_t 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 " FMTu64 " length " FMTsize_t ".",
- dev_name(dev), 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 " FMTu64 " length " FMTsize_t ".",
- dev_name(dev), 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;
3 years, 8 months
master - tests: smaller delay and lowered version
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=52d3c4de6e989ee0bef...
Commit: 52d3c4de6e989ee0bef3df65593e567051cc6cec
Parent: 49292bccc3ce15a729086cc34cbe8b8230948b3b
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Sep 16 13:21:16 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Sep 16 14:08:05 2020 +0200
tests: smaller delay and lowered version
See if this will still work. Some boxes are delayed too much.
Also try to check for raid extend progress from version 1.13.
---
test/shell/lvextend-raid.sh | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/test/shell/lvextend-raid.sh b/test/shell/lvextend-raid.sh
index 054f436ba..e8bd7deea 100644
--- a/test/shell/lvextend-raid.sh
+++ b/test/shell/lvextend-raid.sh
@@ -16,8 +16,8 @@ SKIP_WITH_LVMPOLLD=1
. lib/inittest
aux have_raid 1 3 0 || skip
-v1_15_0=0
-aux have_raid 1 15 0 && v1_15_0=1
+PROGRESS=0
+aux have_raid 1 13 0 && PROGRESS=1
# Use smallest regionsize to save VG space
regionsize=$(getconf PAGESIZE) # in bytes
@@ -42,7 +42,7 @@ lvcreate -l1 $vg "$dev2"
sector=$(( $(get first_extent_sector "$dev2") + 2048 ))
aux zero_dev "$dev1" "${sector}:"
-aux delayzero_dev "$dev2" 0 30 "${sector}:"
+aux delayzero_dev "$dev2" 0 10 "${sector}:"
# Create raid1 LV consuming 1 MD bitmap page
lvcreate --yes --type raid1 --regionsize ${regionsize}K -L$(($lvsz-$lvext))M -n $lv1 $vg
@@ -56,12 +56,12 @@ check lv_field $vg/$lv1 sync_percent "100.00"
check lv_field $vg/$lv1 region_size "4.00k"
# to slow down extension - slowdown readings
-aux delayzero_dev "$dev1" 100 0 "${sector}:"
-aux delayzero_dev "$dev2" 0 100 "${sector}:"
+aux delayzero_dev "$dev1" 50 0 "${sector}:"
+aux delayzero_dev "$dev2" 0 50 "${sector}:"
# Extend so that full MD bitmap page is consumed
lvextend -y -L+${lvext}M $vg/$lv1
-if [ $v1_15_0 -eq 1 ]
+if [ $PROGRESS -eq 1 ]
then
not check lv_field $vg/$lv1 sync_percent "100.00"
check lv_field $vg/$lv1 size "$(($lvsz)).00m" $vg/$lv1
@@ -71,7 +71,7 @@ check lv_field $vg/$lv1 sync_percent "100.00"
# Extend so that another MD bitmap page is allocated
lvextend -y -L+${lvext}M $vg/$lv1
-if [ $v1_15_0 -eq 1 ]
+if [ $PROGRESS -eq 1 ]
then
not check lv_field $vg/$lv1 sync_percent "100.00"
else
3 years, 8 months
master - tests: fix bash regex syntax
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=49292bccc3ce15a7290...
Commit: 49292bccc3ce15a729086cc34cbe8b8230948b3b
Parent: 2c6bd480b28bec43c7c2652938233d8850f00928
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Sep 16 13:12:17 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Sep 16 14:08:05 2020 +0200
tests: fix bash regex syntax
Typo before last commit.
---
test/shell/cache-single-split.sh | 2 +-
test/shell/lvextend-thin-metadata-dmeventd.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/shell/cache-single-split.sh b/test/shell/cache-single-split.sh
index a6deb0dc9..ffe4292de 100644
--- a/test/shell/cache-single-split.sh
+++ b/test/shell/cache-single-split.sh
@@ -50,7 +50,7 @@ which mkfs.xfs || skip
case $(cache_check -V) in
# support for v2 starts with version 0.7
-0.[0..6]*) skip 'At least version 0.7 of cache_check tool is needed.' ;;
+0.[0-6]*) skip 'At least version 0.7 of cache_check tool is needed.' ;;
esac
mount_dir="mnt"
diff --git a/test/shell/lvextend-thin-metadata-dmeventd.sh b/test/shell/lvextend-thin-metadata-dmeventd.sh
index db4f7c156..3a837326c 100644
--- a/test/shell/lvextend-thin-metadata-dmeventd.sh
+++ b/test/shell/lvextend-thin-metadata-dmeventd.sh
@@ -63,7 +63,7 @@ aux have_thin 1 10 0 || skip
BIG_DATA=""
case $("$LVM_TEST_THIN_RESTORE_CMD" -V) in
# With older version of thin-tool we got slightly more compact metadata
- 0.[0..6]*) BIG_DATA="generate_more_metadata" ;;
+ 0.[0-6]*) BIG_DATA="generate_more_metadata" ;;
esac
aux prepare_dmeventd
3 years, 8 months
master - tests: switch for checking version of installed tools
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2c6bd480b28bec43c7c...
Commit: 2c6bd480b28bec43c7c2652938233d8850f00928
Parent: cf4fed37617c71f6fd3f00f80beafb4737d53ced
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Sep 14 21:25:04 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Sep 15 23:07:06 2020 +0200
tests: switch for checking version of installed tools
It looks like older tools were compacting metadata more.
---
test/shell/lvextend-thin-metadata-dmeventd.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/test/shell/lvextend-thin-metadata-dmeventd.sh b/test/shell/lvextend-thin-metadata-dmeventd.sh
index ccdf9e853..db4f7c156 100644
--- a/test/shell/lvextend-thin-metadata-dmeventd.sh
+++ b/test/shell/lvextend-thin-metadata-dmeventd.sh
@@ -20,12 +20,6 @@ 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
}
@@ -66,6 +60,12 @@ test -n "$LVM_TEST_THIN_RESTORE_CMD" || LVM_TEST_THIN_RESTORE_CMD=$(which thin_r
"$LVM_TEST_THIN_RESTORE_CMD" -V || skip
aux have_thin 1 10 0 || skip
+BIG_DATA=""
+case $("$LVM_TEST_THIN_RESTORE_CMD" -V) in
+ # With older version of thin-tool we got slightly more compact metadata
+ 0.[0..6]*) BIG_DATA="generate_more_metadata" ;;
+esac
+
aux prepare_dmeventd
aux prepare_pvs 3 256
3 years, 8 months
master - tests: skip kernel for this test
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=cf4fed37617c71f6fd3...
Commit: cf4fed37617c71f6fd3f00f80beafb4737d53ced
Parent: d0ccb2521ba4f34455078f87f46cc41f5761ffc0
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Sep 14 21:23:16 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Sep 15 23:07:06 2020 +0200
tests: skip kernel for this test
Kills this kernel ATM
---
test/shell/lvconvert-raid-reshape-stripes-load.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/test/shell/lvconvert-raid-reshape-stripes-load.sh b/test/shell/lvconvert-raid-reshape-stripes-load.sh
index ad8f37351..6184e9d64 100644
--- a/test/shell/lvconvert-raid-reshape-stripes-load.sh
+++ b/test/shell/lvconvert-raid-reshape-stripes-load.sh
@@ -15,6 +15,10 @@ SKIP_WITH_LVMPOLLD=1
. lib/inittest
+case "$(uname -r)" in
+ 3.10.0-862*) die "Cannot run this test on unfixed kernel." ;;
+esac
+
# Test reshaping under io load
which mkfs.ext4 || skip
3 years, 8 months
master - label: use formaters FMTu64 and FMTsize_t
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d0ccb2521ba4f344550...
Commit: d0ccb2521ba4f34455078f87f46cc41f5761ffc0
Parent: 2b36542f419ca66c0ee7de4537b5a9dd7a902e3d
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Sep 15 21:47:39 2020 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Sep 15 23:07:06 2020 +0200
label: use formaters FMTu64 and FMTsize_t
Produces code without casts to differntly signed types
and also shortens and enhances readbility.
---
lib/label/label.c | 73 +++++++++++++++++++++++++++----------------------------
1 file changed, 36 insertions(+), 37 deletions(-)
diff --git a/lib/label/label.c b/lib/label/label.c
index ba3b1f9c7..1b138a5a3 100644
--- a/lib/label/label.c
+++ b/lib/label/label.c
@@ -132,8 +132,8 @@ int label_remove(struct device *dev)
memset(readbuf, 0, sizeof(readbuf));
if (!dev_read_bytes(dev, sector << SECTOR_SHIFT, LABEL_SIZE, readbuf)) {
- log_error("Failed to read label from %s sector %llu",
- dev_name(dev), (unsigned long long)sector);
+ log_error("Failed to read label from %s sector " FMTu64,
+ dev_name(dev), sector);
continue;
}
@@ -154,12 +154,12 @@ int label_remove(struct device *dev)
}
if (wipe) {
- log_very_verbose("%s: Wiping label at sector %llu",
- dev_name(dev), (unsigned long long)sector);
+ log_very_verbose("%s: Wiping label at sector " FMTu64,
+ dev_name(dev), sector);
if (!dev_write_zeros(dev, sector << SECTOR_SHIFT, LABEL_SIZE)) {
- log_error("Failed to remove label from %s at sector %llu",
- dev_name(dev), (unsigned long long)sector);
+ log_error("Failed to remove label from %s at sector " FMTu64,
+ dev_name(dev), sector);
r = 0;
} else {
/* Also remove the PV record from cache. */
@@ -187,7 +187,7 @@ int label_write(struct device *dev, struct label *label)
}
if ((LABEL_SIZE + (label->sector << SECTOR_SHIFT)) > LABEL_SCAN_SIZE) {
- log_error("Label sector %" PRIu64 " beyond range (%ld)",
+ log_error("Label sector " FMTu64 " beyond range (%ld)",
label->sector, LABEL_SCAN_SECTORS);
return 0;
}
@@ -204,8 +204,8 @@ int label_write(struct device *dev, struct label *label)
lh->crc_xl = xlate32(calc_crc(INITIAL_CRC, (uint8_t *)&lh->offset_xl, LABEL_SIZE -
((uint8_t *) &lh->offset_xl - (uint8_t *) lh)));
- log_very_verbose("%s: Writing label to sector %" PRIu64 " with stored offset %"
- PRIu32 ".", dev_name(dev), label->sector,
+ log_very_verbose("%s: Writing label to sector " FMTu64 " with stored offset "
+ FMTu32 ".", dev_name(dev), label->sector,
xlate32(lh->offset_xl));
if (!label_scan_open(dev)) {
@@ -297,14 +297,13 @@ static struct labeller *_find_lvm_header(struct device *dev,
if (!memcmp(lh->id, LABEL_ID, sizeof(lh->id))) {
if (found) {
- log_error("Ignoring additional label on %s at sector %llu",
- dev_name(dev), (unsigned long long)(block_sector + sector));
+ log_error("Ignoring additional label on %s at sector " FMTu64,
+ dev_name(dev), (block_sector + sector));
}
if (xlate64(lh->sector_xl) != sector) {
- log_warn("%s: Label for sector %llu found at sector %llu - ignoring.",
- dev_name(dev),
- (unsigned long long)xlate64(lh->sector_xl),
- (unsigned long long)(block_sector + sector));
+ log_warn("%s: Label for sector " FMTu64 " found at sector " FMTu64 " - ignoring.",
+ dev_name(dev), xlate64(lh->sector_xl),
+ (block_sector + sector));
continue;
}
if (calc_crc(INITIAL_CRC, (uint8_t *)&lh->offset_xl,
@@ -318,13 +317,13 @@ static struct labeller *_find_lvm_header(struct device *dev,
dm_list_iterate_items(li, &_labellers) {
if (li->l->ops->can_handle(li->l, (char *) lh, block_sector + sector)) {
- log_very_verbose("%s: %s label detected at sector %llu",
+ log_very_verbose("%s: %s label detected at sector " FMTu64,
dev_name(dev), li->name,
- (unsigned long long)(block_sector + sector));
+ (block_sector + sector));
if (found) {
- log_error("Ignoring additional label on %s at sector %llu",
+ log_error("Ignoring additional label on %s at sector " FMTu64,
dev_name(dev),
- (unsigned long long)(block_sector + sector));
+ (block_sector + sector));
continue;
}
@@ -1137,8 +1136,8 @@ int label_scan(struct cmd_context *cmd)
log_warn("WARNING: metadata may not be usable with current io_memory_size %d KiB",
io_memory_size());
- log_warn("WARNING: increase lvm.conf io_memory_size to at least %llu KiB",
- (unsigned long long)want_size_kb);
+ log_warn("WARNING: increase lvm.conf io_memory_size to at least " FMTu64 " KiB",
+ want_size_kb);
}
dm_list_init(&cmd->hints);
@@ -1442,15 +1441,15 @@ bool dev_read_bytes(struct device *dev, uint64_t start, size_t len, void *data)
if (dev->bcache_fd <= 0) {
/* This is not often needed. */
if (!label_scan_open(dev)) {
- log_error("Error opening device %s for reading at %llu length %u.",
- dev_name(dev), (unsigned long long)start, (uint32_t)len);
+ log_error("Error opening device %s for reading at " FMTu64 " length " FMTsize_t ".",
+ dev_name(dev), start, len);
return false;
}
}
if (!bcache_read_bytes(scan_bcache, dev->bcache_fd, start, len, data)) {
- log_error("Error reading device %s at %llu length %u.",
- dev_name(dev), (unsigned long long)start, (uint32_t)len);
+ log_error("Error reading device %s at " FMTu64 " length " FMTsize_t ".",
+ dev_name(dev), start, len);
label_scan_invalidate(dev);
return false;
}
@@ -1483,23 +1482,23 @@ bool dev_write_bytes(struct device *dev, uint64_t start, size_t len, void *data)
/* 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);
+ log_error("Error opening device %s for writing at " FMTu64 " length " FMTsize_t ".",
+ dev_name(dev), start, len);
return false;
}
}
if (!bcache_write_bytes(scan_bcache, dev->bcache_fd, start, len, data)) {
- log_error("Error writing device %s at %llu length %u.",
- dev_name(dev), (unsigned long long)start, (uint32_t)len);
+ log_error("Error writing device %s at " FMTu64 " length " FMTsize_t ".",
+ dev_name(dev), start, 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);
+ log_error("Error writing device %s at " FMTu64 " length " FMTsize_t ".",
+ dev_name(dev), start, len);
dev_unset_last_byte(dev);
label_scan_invalidate(dev);
return false;
@@ -1539,8 +1538,8 @@ bool dev_set_bytes(struct device *dev, uint64_t start, size_t len, uint8_t val)
/* 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);
+ log_error("Error opening device %s for writing at " FMTu64 " length " FMTsize_t ".",
+ dev_name(dev), start, len);
return false;
}
}
@@ -1549,16 +1548,16 @@ bool dev_set_bytes(struct device *dev, uint64_t start, size_t len, uint8_t 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);
+ log_error("Error writing device %s at " FMTu64 " length " FMTsize_t ".",
+ dev_name(dev), start, 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);
+ log_error("Error writing device %s at " FMTu64 " length " FMTsize_t ".",
+ dev_name(dev), start, len);
dev_unset_last_byte(dev);
label_scan_invalidate(dev);
return false;
3 years, 8 months