December 2017 - lvm2-commits - Fedora mailing-lists

master - tests: sleep first
by Zdenek Kabelac 19 Dec '17

19 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0bf1cc2320cb96cde9be7… Commit: 0bf1cc2320cb96cde9be742bed2aa391c998588a Parent: 3a841515af623b86be0628ef6568ff74009ea643 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Dec 13 16:17:56 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Dec 19 15:28:07 2017 +0100 tests: sleep first Sleep a bit before checking /sys/block dir so the kernel has a moment to actually put scsi debug device in it... Some quite old kernels are in troubles with this plain searching grep without sleep (namely 2.6.32) modprobe scsi_debug <sleep .1> grep -H scsi_debug /sys/block/*/device/model modprobe -r scsi_debug --- test/lib/aux.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 6bc7bd4..fa9a1a2 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -703,10 +703,10 @@ prepare_scsi_debug_dev() { modprobe scsi_debug dev_size_mb="$DEV_SIZE" "$@" num_tgts=1 || skip for i in {1..20} ; do - DEBUG_DEV="/dev/$(grep -H scsi_debug /sys/block/*/device/model | cut -f4 -d /)" - test -b "$DEBUG_DEV" && break sleep .1 # allow for async Linux SCSI device registration - done + DEBUG_DEV="/dev/$(grep -H scsi_debug /sys/block/sd*/device/model | cut -f4 -d /)" + test -b "$DEBUG_DEV" && break + done test -b "$DEBUG_DEV" || return 1 # should not happen # Create symlink to scsi_debug device in $DM_DEV_DIR

1 0

master - lvm-string: add function to detect component LV suffix
by Zdenek Kabelac 19 Dec '17

19 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3a841515af623b86be062… Commit: 3a841515af623b86be0628ef6568ff74009ea643 Parent: 17649d4ac8d4c7d10bf58feefa5f1faae89713ca Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 11 18:12:47 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Dec 19 15:28:07 2017 +0100 lvm-string: add function to detect component LV suffix Add is_component_lvname() function to recognize component LV name. --- lib/misc/lvm-string.c | 30 +++++++++++++++++++++++++++--- lib/misc/lvm-string.h | 1 + 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/lib/misc/lvm-string.c b/lib/misc/lvm-string.c index cdcc993..a2098fd 100644 --- a/lib/misc/lvm-string.c +++ b/lib/misc/lvm-string.c @@ -150,22 +150,41 @@ static const char *_lvname_has_reserved_prefix(const char *lvname) return NULL; } -static const char *_lvname_has_reserved_string(const char *lvname) +static const char *_lvname_has_reserved_component_string(const char *lvname) { static const char _strings[][12] = { + /* Suffixes for compoment LVs */ "_cdata", "_cmeta", "_corig", "_mimage", "_mlog", - "_pmspare", "_rimage", "_rmeta", "_tdata", - "_tmeta", + "_tmeta" + }; + unsigned i; + + for (i = 0; i < DM_ARRAY_SIZE(_strings); ++i) + if (strstr(lvname, _strings[i])) + return _strings[i]; + + return NULL; +} + +static const char *_lvname_has_reserved_string(const char *lvname) +{ + static const char _strings[][12] = { + /* Additional suffixes for non-compoment LVs */ + "_pmspare", "_vorigin" }; unsigned i; + const char *cs; + + if ((cs = _lvname_has_reserved_component_string(lvname))) + return cs; for (i = 0; i < DM_ARRAY_SIZE(_strings); ++i) if (strstr(lvname, _strings[i])) @@ -208,6 +227,11 @@ int is_reserved_lvname(const char *name) _lvname_has_reserved_string(name)) ? 1 : 0; } +int is_component_lvname(const char *name) +{ + return (_lvname_has_reserved_component_string(name)) ? 1 : 0; +} + char *build_dm_uuid(struct dm_pool *mem, const struct logical_volume *lv, const char *layer) { diff --git a/lib/misc/lvm-string.h b/lib/misc/lvm-string.h index ebdf956..4e7404a 100644 --- a/lib/misc/lvm-string.h +++ b/lib/misc/lvm-string.h @@ -47,6 +47,7 @@ int validate_tag(const char *n); void copy_systemid_chars(const char *src, char *dst); int apply_lvname_restrictions(const char *name); +int is_component_lvname(const char *name); int is_reserved_lvname(const char *name); /*

1 0

master - device: Move dev_read memory allocation into device layer.
by Alasdair Kergon 18 Dec '17

18 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=17649d4ac8d4c7d10bf58… Commit: 17649d4ac8d4c7d10bf58feefa5f1faae89713ca Parent: 3f9ae846b89a2963a4ca72cfa0281aab0bedcc02 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Tue Dec 19 01:12:18 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Tue Dec 19 01:31:50 2017 +0000 device: Move dev_read memory allocation into device layer. Rename dev_read() to dev_read_buf() - the function that reads data into a supplied buffer. Introduce a new dev_read() that allocates the buffer it returns and switch the important users over to this. No caller may change the returned data. (For now, callers are responsible for freeing it after use, but later the device layer will take full ownership.) dev_read_buf() should only be used for tiny buffers or unimportant code (such as the old disk formats). --- WHATS_NEW | 1 + lib/config/config.c | 6 +---- lib/device/dev-io.c | 42 +++++++++++++++++++++++++++++++++++++--- lib/device/dev-luks.c | 2 +- lib/device/dev-md.c | 2 +- lib/device/dev-swap.c | 3 +- lib/device/dev-type.c | 2 +- lib/device/device.h | 8 ++++++- lib/format1/disk-rep.c | 10 ++++---- lib/format_pool/disk_rep.c | 2 +- lib/format_text/format-text.c | 28 +++++++++++++------------- lib/label/label.c | 29 +++++++++++++-------------- 12 files changed, 85 insertions(+), 50 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index e4b04b0..fa79068 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.178 - ===================================== + Move memory allocation for the key dev_reads into the device layer. Version 2.02.177 - 18th December 2017 ===================================== diff --git a/lib/config/config.c b/lib/config/config.c index fac7e4c..bbbcc3d 100644 --- a/lib/config/config.c +++ b/lib/config/config.c @@ -533,11 +533,7 @@ int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, dev_io_r if (!(buf = dev_read_circular(dev, (uint64_t) offset, size, (uint64_t) offset2, size2, reason))) goto_out; } else { - if (!(buf = dm_malloc(size))) { - log_error("Failed to allocate buffer for metadata read."); - return 0; - } - if (!dev_read(dev, (uint64_t) offset, size, reason, buf)) + if (!(buf = dev_read(dev, (uint64_t) offset, size, reason))) goto_out; } fb = buf; diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c index 0545d8c..72d6768 100644 --- a/lib/device/dev-io.c +++ b/lib/device/dev-io.c @@ -722,7 +722,7 @@ static void _dev_inc_error_count(struct device *dev) dev->max_error_count, dev_name(dev)); } -int dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason, void *buffer) +static int _dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason, char *buf) { struct device_area where; int ret; @@ -737,13 +737,47 @@ int dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t re where.start = offset; where.size = len; - ret = _aligned_io(&where, buffer, 0, reason); + ret = _aligned_io(&where, buf, 0, reason); if (!ret) _dev_inc_error_count(dev); return ret; } +/* Caller is responsible for dm_free */ +char *dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason) +{ + char *buf; + + if (!(buf = dm_malloc(len))) { + log_error("Buffer allocation failed for device read."); + return NULL; + } + + if (!_dev_read(dev, offset, len, reason, buf)) { + log_error("Read from %s failed", dev_name(dev)); + dm_free(buf); + return NULL; + } + + return buf; +} + +/* Read into supplied retbuf */ +int dev_read_buf(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason, void *retbuf) +{ + char *buf = NULL; + + if (!(buf = dev_read(dev, offset, len, reason))) + return_0; + + memcpy(retbuf, buf, len); + + dm_free(buf); + + return 1; +} + /* * Read from 'dev' in 2 distinct regions, denoted by (offset,len) and (offset2,len2). * Caller is responsible for dm_free(). @@ -758,13 +792,13 @@ char *dev_read_circular(struct device *dev, uint64_t offset, size_t len, return NULL; } - if (!dev_read(dev, offset, len, reason, buf)) { + if (!_dev_read(dev, offset, len, reason, buf)) { log_error("Read from %s failed", dev_name(dev)); dm_free(buf); return NULL; } - if (!dev_read(dev, offset2, len2, reason, buf + len)) { + if (!_dev_read(dev, offset2, len2, reason, buf + len)) { log_error("Circular read from %s failed", dev_name(dev)); dm_free(buf); return NULL; diff --git a/lib/device/dev-luks.c b/lib/device/dev-luks.c index 8513e14..f291615 100644 --- a/lib/device/dev-luks.c +++ b/lib/device/dev-luks.c @@ -31,7 +31,7 @@ int dev_is_luks(struct device *dev, uint64_t *offset_found) if (offset_found) *offset_found = 0; - if (!dev_read(dev, 0, LUKS_SIGNATURE_SIZE, DEV_IO_SIGNATURES, buf)) + if (!dev_read_buf(dev, 0, LUKS_SIGNATURE_SIZE, DEV_IO_SIGNATURES, buf)) goto_out; ret = memcmp(buf, LUKS_SIGNATURE, LUKS_SIGNATURE_SIZE) ? 0 : 1; diff --git a/lib/device/dev-md.c b/lib/device/dev-md.c index 92ee214..1a5d470 100644 --- a/lib/device/dev-md.c +++ b/lib/device/dev-md.c @@ -37,7 +37,7 @@ static int _dev_has_md_magic(struct device *dev, uint64_t sb_offset) uint32_t md_magic; /* Version 1 is little endian; version 0.90.0 is machine endian */ - if (dev_read(dev, sb_offset, sizeof(uint32_t), DEV_IO_SIGNATURES, &md_magic) && + if (dev_read_buf(dev, sb_offset, sizeof(uint32_t), DEV_IO_SIGNATURES, &md_magic) && ((md_magic == MD_SB_MAGIC) || ((MD_SB_MAGIC != xlate32(MD_SB_MAGIC)) && (md_magic == xlate32(MD_SB_MAGIC))))) return 1; diff --git a/lib/device/dev-swap.c b/lib/device/dev-swap.c index a7ff10b..094eb05 100644 --- a/lib/device/dev-swap.c +++ b/lib/device/dev-swap.c @@ -60,8 +60,7 @@ int dev_is_swap(struct device *dev, uint64_t *offset_found) continue; if (size < (page >> SECTOR_SHIFT)) break; - if (!dev_read(dev, page - SIGNATURE_SIZE, - SIGNATURE_SIZE, DEV_IO_SIGNATURES, buf)) { + if (!dev_read_buf(dev, page - SIGNATURE_SIZE, SIGNATURE_SIZE, DEV_IO_SIGNATURES, buf)) { ret = -1; break; } diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c index 9608146..b9e77f8 100644 --- a/lib/device/dev-type.c +++ b/lib/device/dev-type.c @@ -363,7 +363,7 @@ static int _has_partition_table(struct device *dev) uint16_t magic; } __attribute__((packed)) buf; /* sizeof() == SECTOR_SIZE */ - if (!dev_read(dev, UINT64_C(0), sizeof(buf), DEV_IO_SIGNATURES, &buf)) + if (!dev_read_buf(dev, UINT64_C(0), sizeof(buf), DEV_IO_SIGNATURES, &buf)) return_0; /* FIXME Check for other types of partition table too */ diff --git a/lib/device/device.h b/lib/device/device.h index a369195..dac638c 100644 --- a/lib/device/device.h +++ b/lib/device/device.h @@ -145,9 +145,15 @@ int dev_test_excl(struct device *dev); int dev_fd(struct device *dev); const char *dev_name(const struct device *dev); -int dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason, void *buffer); +/* Returns a read-only buffer */ +char *dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason); char *dev_read_circular(struct device *dev, uint64_t offset, size_t len, uint64_t offset2, size_t len2, dev_io_reason_t reason); + +/* Read data and copy it into a supplied private buffer. */ +/* Only use for tiny reads or on unimportant code paths. */ +int dev_read_buf(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason, void *retbuf); + int dev_write(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason, void *buffer); int dev_append(struct device *dev, size_t len, dev_io_reason_t reason, char *buffer); int dev_set(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason, int value); diff --git a/lib/format1/disk-rep.c b/lib/format1/disk-rep.c index 41955af..cf34e91 100644 --- a/lib/format1/disk-rep.c +++ b/lib/format1/disk-rep.c @@ -205,7 +205,7 @@ int munge_pvd(struct device *dev, struct pv_disk *pvd) static int _read_pvd(struct device *dev, struct pv_disk *pvd) { - if (!dev_read(dev, UINT64_C(0), sizeof(*pvd), DEV_IO_FMT1, pvd)) { + if (!dev_read_buf(dev, UINT64_C(0), sizeof(*pvd), DEV_IO_FMT1, pvd)) { log_very_verbose("Failed to read PV data from %s", dev_name(dev)); return 0; @@ -216,7 +216,7 @@ static int _read_pvd(struct device *dev, struct pv_disk *pvd) static int _read_lvd(struct device *dev, uint64_t pos, struct lv_disk *disk) { - if (!dev_read(dev, pos, sizeof(*disk), DEV_IO_FMT1, disk)) + if (!dev_read_buf(dev, pos, sizeof(*disk), DEV_IO_FMT1, disk)) return_0; _xlate_lvd(disk); @@ -228,7 +228,7 @@ int read_vgd(struct device *dev, struct vg_disk *vgd, struct pv_disk *pvd) { uint64_t pos = pvd->vg_on_disk.base; - if (!dev_read(dev, pos, sizeof(*vgd), DEV_IO_FMT1, vgd)) + if (!dev_read_buf(dev, pos, sizeof(*vgd), DEV_IO_FMT1, vgd)) return_0; _xlate_vgd(vgd); @@ -252,7 +252,7 @@ static int _read_uuids(struct disk_list *data) uint64_t end = pos + data->pvd.pv_uuidlist_on_disk.size; while (pos < end && num_read < data->vgd.pv_cur) { - if (!dev_read(data->dev, pos, sizeof(buffer), DEV_IO_FMT1, buffer)) + if (!dev_read_buf(data->dev, pos, sizeof(buffer), DEV_IO_FMT1, buffer)) return_0; if (!(ul = dm_pool_alloc(data->mem, sizeof(*ul)))) @@ -311,7 +311,7 @@ static int _read_extents(struct disk_list *data) if (!extents) return_0; - if (!dev_read(data->dev, pos, len, DEV_IO_FMT1, extents)) + if (!dev_read_buf(data->dev, pos, len, DEV_IO_FMT1, extents)) return_0; _xlate_extents(extents, data->pvd.pe_total); diff --git a/lib/format_pool/disk_rep.c b/lib/format_pool/disk_rep.c index 374ff44..4b2e7fb 100644 --- a/lib/format_pool/disk_rep.c +++ b/lib/format_pool/disk_rep.c @@ -40,7 +40,7 @@ static int __read_pool_disk(const struct format_type *fmt, struct device *dev, char buf[512] __attribute__((aligned(8))); /* FIXME: Need to check the cache here first */ - if (!dev_read(dev, UINT64_C(0), 512, DEV_IO_POOL, buf)) { + if (!dev_read_buf(dev, UINT64_C(0), 512, DEV_IO_POOL, buf)) { log_very_verbose("Failed to read PV data from %s", dev_name(dev)); return 0; diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 79bb9fa..c57ffd2 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -182,7 +182,7 @@ static int _pv_analyze_mda_raw (const struct format_type * fmt, uint64_t offset2; size_t size; size_t size2; - char *buf=NULL; + char *buf = NULL; struct device_area *area; struct mda_context *mdac; unsigned circular = 0; @@ -240,12 +240,8 @@ static int _pv_analyze_mda_raw (const struct format_type * fmt, if (circular) { if (!(buf = dev_read_circular(area->dev, offset, size, offset2, size2, MDA_CONTENT_REASON(mda_is_primary(mda))))) goto_out; - } else { - if (!(buf = dm_malloc(size))) - goto_out; - if (!dev_read(area->dev, offset, size, MDA_CONTENT_REASON(mda_is_primary(mda)), buf)) + } else if (!(buf = dev_read(area->dev, offset, size, MDA_CONTENT_REASON(mda_is_primary(mda))))) goto_out; - } /* * FIXME: We could add more sophisticated metadata detection @@ -334,7 +330,7 @@ static int _raw_read_mda_header(struct mda_header *mdah, struct device_area *dev if (!dev_open_readonly(dev_area->dev)) return_0; - if (!dev_read(dev_area->dev, dev_area->start, MDA_HEADER_SIZE, MDA_HEADER_REASON(primary_mda), mdah)) { + if (!dev_read_buf(dev_area->dev, dev_area->start, MDA_HEADER_SIZE, MDA_HEADER_REASON(primary_mda), mdah)) { if (!dev_close(dev_area->dev)) stack; return_0; @@ -420,13 +416,13 @@ static struct raw_locn *_find_vg_rlocn(struct device_area *dev_area, int *precommitted) { size_t len; - char vgnamebuf[NAME_LEN + 2] __attribute__((aligned(8))); struct raw_locn *rlocn, *rlocn_precommitted; struct lvmcache_info *info; struct lvmcache_vgsummary vgsummary_orphan = { .vgname = FMT_TEXT_ORPHAN_VG_NAME, }; int rlocn_was_ignored; + char *buf; memcpy(&vgsummary_orphan.vgid, FMT_TEXT_ORPHAN_VG_NAME, sizeof(FMT_TEXT_ORPHAN_VG_NAME)); @@ -461,13 +457,17 @@ static struct raw_locn *_find_vg_rlocn(struct device_area *dev_area, /* FIXME Loop through rlocns two-at-a-time. List null-terminated. */ /* FIXME Ignore if checksum incorrect!!! */ - if (!dev_read(dev_area->dev, dev_area->start + rlocn->offset, - sizeof(vgnamebuf), MDA_CONTENT_REASON(primary_mda), vgnamebuf)) + if (!(buf = dev_read(dev_area->dev, dev_area->start + rlocn->offset, + NAME_LEN + 2, MDA_CONTENT_REASON(primary_mda)))) goto_bad; - if (!strncmp(vgnamebuf, vgname, len = strlen(vgname)) && - (isspace(vgnamebuf[len]) || vgnamebuf[len] == '{')) + if (!strncmp(buf, vgname, len = strlen(vgname)) && + (isspace(*(buf + len)) || *(buf + len) == '{')) { + dm_free(buf); return rlocn; + } + + dm_free(buf); log_debug_metadata("Volume group name found in %smetadata on %s at " FMTu64 " does " "not match expected name %s.", @@ -1332,8 +1332,8 @@ int vgname_from_mda(const struct format_type *fmt, } /* Do quick check for a vgname */ - if (!dev_read(dev_area->dev, dev_area->start + rlocn->offset, - NAME_LEN, MDA_CONTENT_REASON(primary_mda), buf)) + if (!dev_read_buf(dev_area->dev, dev_area->start + rlocn->offset, + NAME_LEN, MDA_CONTENT_REASON(primary_mda), buf)) return_0; while (buf[len] && !isspace(buf[len]) && buf[len] != '{' && diff --git a/lib/label/label.c b/lib/label/label.c index 249927b..b90fff3 100644 --- a/lib/label/label.c +++ b/lib/label/label.c @@ -109,7 +109,7 @@ static void _update_lvmcache_orphan(struct lvmcache_info *info) stack; } -static struct labeller *_find_labeller(struct device *dev, char *buf, +static struct labeller *_find_labeller(struct device *dev, char *labelbuf, uint64_t *label_sector, uint64_t scan_sector) { @@ -119,10 +119,9 @@ static struct labeller *_find_labeller(struct device *dev, char *buf, struct lvmcache_info *info; uint64_t sector; int found = 0; - char readbuf[LABEL_SCAN_SIZE] __attribute__((aligned(8))); + char *buf = NULL; - if (!dev_read(dev, scan_sector << SECTOR_SHIFT, - LABEL_SCAN_SIZE, DEV_IO_LABEL, readbuf)) { + if (!(buf = dev_read(dev, scan_sector << SECTOR_SHIFT, LABEL_SCAN_SIZE, DEV_IO_LABEL))) { log_debug_devs("%s: Failed to read label area", dev_name(dev)); goto out; } @@ -130,8 +129,7 @@ static struct labeller *_find_labeller(struct device *dev, char *buf, /* Scan a few sectors for a valid label */ for (sector = 0; sector < LABEL_SCAN_SECTORS; sector += LABEL_SIZE >> SECTOR_SHIFT) { - lh = (struct label_header *) (readbuf + - (sector << SECTOR_SHIFT)); + lh = (struct label_header *) (buf + (sector << SECTOR_SHIFT)); if (!strncmp((char *)lh->id, LABEL_ID, sizeof(lh->id))) { if (found) { @@ -173,7 +171,7 @@ static struct labeller *_find_labeller(struct device *dev, char *buf, continue; } r = li->l; - memcpy(buf, lh, LABEL_SIZE); + memcpy(labelbuf, lh, LABEL_SIZE); if (label_sector) *label_sector = sector + scan_sector; found = 1; @@ -183,6 +181,8 @@ static struct labeller *_find_labeller(struct device *dev, char *buf, } out: + dm_free(buf); + if (!found) { if ((info = lvmcache_info_from_pvid(dev->pvid, dev, 0))) _update_lvmcache_orphan(info); @@ -195,16 +195,16 @@ static struct labeller *_find_labeller(struct device *dev, char *buf, /* FIXME Also wipe associated metadata area headers? */ int label_remove(struct device *dev) { - char buf[LABEL_SIZE] __attribute__((aligned(8))); - char readbuf[LABEL_SCAN_SIZE] __attribute__((aligned(8))); + char labelbuf[LABEL_SIZE] __attribute__((aligned(8))); int r = 1; uint64_t sector; int wipe; struct labeller_i *li; struct label_header *lh; struct lvmcache_info *info; + char *buf = NULL; - memset(buf, 0, LABEL_SIZE); + memset(labelbuf, 0, LABEL_SIZE); log_very_verbose("Scanning for labels to wipe from %s", dev_name(dev)); @@ -217,7 +217,7 @@ int label_remove(struct device *dev) */ dev_flush(dev); - if (!dev_read(dev, UINT64_C(0), LABEL_SCAN_SIZE, DEV_IO_LABEL, readbuf)) { + if (!(buf = dev_read(dev, UINT64_C(0), LABEL_SCAN_SIZE, DEV_IO_LABEL))) { log_debug_devs("%s: Failed to read label area", dev_name(dev)); goto out; } @@ -225,8 +225,7 @@ int label_remove(struct device *dev) /* Scan first few sectors for anything looking like a label */ for (sector = 0; sector < LABEL_SCAN_SECTORS; sector += LABEL_SIZE >> SECTOR_SHIFT) { - lh = (struct label_header *) (readbuf + - (sector << SECTOR_SHIFT)); + lh = (struct label_header *) (buf + (sector << SECTOR_SHIFT)); wipe = 0; @@ -246,8 +245,7 @@ int label_remove(struct device *dev) if (wipe) { log_very_verbose("%s: Wiping label at sector %" PRIu64, dev_name(dev), sector); - if (dev_write(dev, sector << SECTOR_SHIFT, LABEL_SIZE, DEV_IO_LABEL, - buf)) { + if (dev_write(dev, sector << SECTOR_SHIFT, LABEL_SIZE, DEV_IO_LABEL, labelbuf)) { /* Also remove the PV record from cache. */ info = lvmcache_info_from_pvid(dev->pvid, dev, 0); if (info) @@ -265,6 +263,7 @@ int label_remove(struct device *dev) if (!dev_close(dev)) stack; + dm_free(buf); return r; }

1 0

master - lvmlockd: clear coverity complaint
by David Teigland 18 Dec '17

18 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3f9ae846b89a2963a4ca7… Commit: 3f9ae846b89a2963a4ca72cfa0281aab0bedcc02 Parent: 81be333e9fcf1f73b23318a9b3e9c366bf1a6cd2 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Dec 18 15:19:17 2017 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon Dec 18 15:19:17 2017 -0600 lvmlockd: clear coverity complaint from previous coverity fix, it's never happy. --- lib/locking/lvmlockd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/locking/lvmlockd.c b/lib/locking/lvmlockd.c index 0365797..a4684b4 100644 --- a/lib/locking/lvmlockd.c +++ b/lib/locking/lvmlockd.c @@ -2148,7 +2148,7 @@ int lockd_lv_name(struct cmd_context *cmd, struct volume_group *vg, static int _lockd_lv_thin(struct cmd_context *cmd, struct logical_volume *lv, const char *def_mode, uint32_t flags) { - struct logical_volume *pool_lv; + struct logical_volume *pool_lv = NULL; if (lv_is_thin_volume(lv)) { struct lv_segment *pool_seg = first_seg(lv);

1 0

v2_02_177 annotated tag has been created
by Alasdair Kergon 18 Dec '17

18 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=6c8c8b1b244fc6a6a27c4… Commit: 6c8c8b1b244fc6a6a27c4b3888844ad8a4750394 Parent: 0000000000000000000000000000000000000000 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: 2017-12-18 20:36 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: 2017-12-18 20:36 +0000 annotated tag: v2_02_177 has been created at 6c8c8b1b244fc6a6a27c4b3888844ad8a4750394 (tag) tagging a1f7a483253b11e52ad5460b28cf0c75dba26659 (commit) replaces v2_02_176 Release 2.02.177. A wide-ranging bug fix and tidy-up release, covering in particular raid, pvmove, activation and also switching to aligned 4k blocks when writing out on-disk volume group metadata. 124 files changed, 3119 insertions(+), 2485 deletions(-) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) iEYEABECAAYFAlo4KDgACgkQIoGRwVZ+LBfTKwCgsJYQcXtiuHP5MWpJcCiZSDvZ rVkAnRcOvGOnfkpwX7aFrKecuoxjqTyv =KKDA -----END PGP SIGNATURE----- Alasdair G Kergon (31): post-release persistent filter: Skip import before rescan log: Improve various device-related messages metadata: Remove unused vg.cft_precommitted metadata: Eliminate redundant nested VG metadata log: Add io debug class regenerate man and conf lvmdiskscan: Remove unnecessary read. device: log debug when I/O bounce buffer used label: Remove unused verify functions. device: categorise block i/o device: Skip read-modify-write if replacing whole block. device: Tag I/O for each mda on a device separately in log messages. lvmetad: drop stray underscore format_text: Use explicit alignment in wrapping calc. format_text: Replace PRI with FMT. format_text: Log additional circular buffer information. format_text: Move metadata size checking into separate fn. format_text: Use absolute alignment to calculate metadata usage format_text: Adjust metadata alignment calculation. device: Internal error if writing 0 bytes to dev. metadata: Consistently skip metadata areas that failed. device: Fix an unpaired device close. format_text: Refactor and document metadata offset calculation. format_text: More refactoring of metadata offset calcs format_text: Change metadata alignment from 512 to 4096. format_text: Round size written up to multiple of 4096. format_text: Supply mempool directly to raw_read_mda_header. format_text: Separate out code paths for buffer wraparound format_text: Transfer circular buf alloc to device layer. pre-release David Teigland (11): lvmlockd: retry on other sanlock errors lvmlockd: override unknown lock manager error numbers man: lvmlockd steps for changing lock type lvconvert: prevent combining split snapshots in shared vg lvmlockd: avoid blocking in sanlock_convert lvmlockd: recognize normal errors from sanlock_convert lvmlockd: improve error message for VG lock conflict lvmlockd: fix log print lvmlockd: use pool lock for tmeta access lvmlock: return an error if lvb cannot be written lvmlockd: clear coverity complaint Eric Ren (1): clvmd: supress ENOENT error on testing connection Heinz Mauelshagen (17): raid: reject conversion request to striped/raid0 on 2-legged raid4/5 raid: reject message for 2-legged raid4/5 -> striped raid: correct raid6_n_6 -> raid5 convenience type test: avoid have_raid overhead test: additional avoid have_raid overhead raid: add validation checks for reshape flags raid: ignore --stripesize on raid4/5 conversion to 1 stripe test: new reshape test under io load test: disable new reshape test until target version 1.13.1 lv_manip: allow extension on --nosync raid lv test: cleanup command test: reduce pv sizes, fix comment and stripe size test: add large tests skip option test: allow to succeed in the cluster deactivate_lvs: deactivate any missing RaidLV legs test: new raid tests test: fix trap adding proper teardown to previous, new raid tests Marian Csontos (15): test: Rename test nothing methods test: D-Bus test_nesting requires filter Update WHATS_NEW tests: Fix common_dev_ argument handling Update WHATS_NEW Update WHATS_NEW configure: applib is not required by dbusd lvmdbusd: Fix path to python3 configure: Fix deprecation warning for lvmapp test: lvmdbusd is used for process name lvmdbusd: All tools use detected python3 test: Fix condition when detecting lvmdbusd docs: Add TESTING file lvmdbusd: Make lvmdbusd executable lvm2app: Suppress deprecation warnings for our builds Ondrej Kozina (2): dmsetup: hide integrity encryption keys on table output test: check dmsetup hides integrity encryption keys Zdenek Kabelac (91): snapshot: prevent repeated merging coverity: avoid memleak coverity: avoid overflow_before_widen blkdeactive: use /sbin for mdamd shellcheck: fsadm cleanup cleanup: gcc const warning cleanup: update messages in lvconvert cleanup: drop unneeded headerfiles coverity: add some initilizers tests: snasphot merging lvconvert: update delaying message tests: have some space for 2nd mda tests: detect racy systemd version tests: allow to proceed futher with test raid: protect raid4 activation cleanup: constify lv parameter cleanup: remove stack tracing for ok path reload: do not take backup with suspended devices lvremove: for unused cache deactive sublv lv_lock_holder: unused cache-pool is not lock holder tests: use nonflusing status pvmove: snapshots need to go with origin device pvmove: return pvmove itself layers: collect only lock holding LVs activate_lvs: deactivate on uniterate activation: check subLV before skipping resume activation: suspend pvmove using lv. pvmove: always flush when working with pvmove tree activate_lvs: use exclusive activation cleanup: update log messages pvmove: change locking on finish pvmove: activation changes pvmove: remove unusued code tests: pvmove supports more cases suspend: handle start of pvmove resume: secure critical section locking: pvmove is locking holding LV libdm: preload propagates delayed resume mirror: use lv_update_and_reload_origin activation: automaticaly discover pvmove holders pvmove: finish no longer needs explicit resumed toollib: avoid printing default stripe size cache: use conditional in warning message cleanup: reduce couple debug lines cleanup: using max args consistently cleanup: update error messages tests: typo tests: more places where missing should not appear activation: enhance holders detection pvmove: enhance delayed_resume logic toollib: improve stripes args reading cmdline: avoid overrun on very large numbers. cleanup: reuse existing macro pvmove: move code from tools to lib pvmove: add missing segment merging activation: split priority from memory locking activation: extend resume validation activation: avoid rechecking pvmove node suspend: optimize generated list cleanup: simplify _deps code cleanup: remove debug code libdm: watch for failing _info_by_dev libdm: support for replicator target is dropped cleanup: drop unused header cleanup: futher code reduction cleanup: simplier error message cleanup: drop impossible test case cleanup: mark success at the end cleanup: stack tracing cleanup: use _node_name clenaup: use log_warn cleanup: use log_warn cleanup: use existing define with prefix cleanup: drop unused define cleanup: messsage cleanup cleanup: drop unneeded check activation: also lock memory for clustered locking thin: always clear memory before parsing status thin: missing type is error libdm: add help func _get_last_load_segment libdm: avoid checking status on activation libdm: use delay_resume_if_extended libdm: drop extra structure copy cleanup: reorder calling of pool checking tools cleanup: use log_warn debug: update debug msg vgchange: drop extra counting activation: keep priority till memlock_unlock thin: regression fix for metadata checking cleanup: switch to standard query cleanup: debug message

1 0

v2.02.174 annotated tag has been created
by Alasdair Kergon 18 Dec '17

18 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=761691e233fabddfbf678… Commit: 761691e233fabddfbf678b3a988fce99d39591f4 Parent: 0000000000000000000000000000000000000000 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: 2017-09-13 19:38 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: 2017-09-13 19:38 +0000 annotated tag: v2.02.174 has been created at 761691e233fabddfbf678b3a988fce99d39591f4 (tag) tagging 918f0a92daef84867e0df4b422c3de2a36997f17 (commit) replaces v2_02_173 Release 2.02.174 Assorted fixes and small improvements, including an extension to dmsetup for activating more than one device with a single command. As of this release, we're also pushing the code to github: https://github.com/lvmteam/lvm2 and will handle any issues reported at https://github.com/lvmteam/lvm2/issues 81 files changed, 1782 insertions(+), 857 deletions(-) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) iEYEABECAAYFAlm5iu8ACgkQIoGRwVZ+LBdCwgCfWI67MvWO3jaZ0/xvgwl5qjU1 KBwAoM8aCqMfl6N6X8jDEhR8FGDoKJ62 =oAdS -----END PGP SIGNATURE----- Alasdair G Kergon (14): post-release dmsetup: Add concise table output format. make generate dmsetup: Add minor number to concise table output format. tools: Introduce exit code EINIT_FAILED. toolcontext: Improve invalid units error message. ioctl: Allow minor without major. dmsetup: Add --concise to dmsetup create. lvmconfig: Add options to produce file preamble pvcreate: Disallow --bootloaderareasize with --restorefile. pvcreate: Wipe cached bootloaderarea when wiping label. pvcreate: Use maximum metadata area size with --restorefile README: Include new github links pre-release David Teigland (16): vgchange: separate change locktype and allow recovery vgchange: split out code for lockstart and lockstop vgchange: split out code for systemid man: remove hyphen escapes from source commands: expand comment on configuring option vals lvmlockd: fix lm running check during adoption lvmlockd: global name doesn't apply to sanlock commands: recognize -? for help commands: recognize lvm command -? lvmlockd: zero extended lvmlock LV lvmlockd: add comment about temp ls name lvmlockd: fix mutex unlock man lvmthin: change fsck references lvmlockd: print error about starting lock manager lvmlockd: fix check for no running lock manager lvmlockd: always disallow mirror splitting Heinz Mauelshagen (1): raid: more validation checks for segment data_offset member Peter Rajnoha (2): pvcreate: fix check for 2nd mda at end of disk fits if using pvcreate --restorefile test: pvcreate-bootloaderarea: pvcreate --restorefile --bootloaderarea not supported anymore Zdenek Kabelac (31): raid: reshape synchronization point tidy: declaration names match implementation thin: warn about too big chunks size man: fix generated paths libdm: log_warn makefiles: RT_LIB makefiles: use gcc warns with gcc only makefiles: fixing linking makefiles: cleanups tests: update makefile configure: improve test for realtime clock configure: tune BUILD_DMEVENTD makefiles: fix tested vars makefiles: script executable missed dynamic makefiles: add DEFS_$@ for cxx tests: update makefiles tests: update checked message libdm: fix errpath for control node creation lvmlockd: shorter code lvmcache: check for lvmcache_foreach_mda return code debug: add stack trace point locking: avoid descriptor leak for nonblocking mode daemonize: more unified code lvmlockd: avoid double unlock of client_mutex lvmlockctl: fix check for failing close lvmlockd: log pthread_join errno code reporting: validate time parsing with strtol dmsetup: add missing -- for option dmsetup: validate strtol reading cleanup: easier to read code deamonize: restore detection of errors Zhang Huan (1): lvmlockd: reduce io impact for finding sanlock lv free lock offset

1 0

master - post-release
by Alasdair Kergon 18 Dec '17

18 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=81be333e9fcf1f73b2331… Commit: 81be333e9fcf1f73b23318a9b3e9c366bf1a6cd2 Parent: a1f7a483253b11e52ad5460b28cf0c75dba26659 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Mon Dec 18 20:43:09 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Mon Dec 18 20:43:09 2017 +0000 post-release --- VERSION | 2 +- VERSION_DM | 2 +- WHATS_NEW | 3 +++ WHATS_NEW_DM | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 414b4df..586bf0f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.02.177(2)-git (2017-12-18) +2.02.178(2)-git (2017-12-18) diff --git a/VERSION_DM b/VERSION_DM index 4c2ffa3..d55b61b 100644 --- a/VERSION_DM +++ b/VERSION_DM @@ -1 +1 @@ -1.02.146-git (2017-12-18) +1.02.147-git (2017-12-18) diff --git a/WHATS_NEW b/WHATS_NEW index 2163a5e..e4b04b0 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,3 +1,6 @@ +Version 2.02.178 - +===================================== + Version 2.02.177 - 18th December 2017 ===================================== When writing text metadata content, use complete 4096 byte blocks. diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 8b304e6..bcd6deb 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,3 +1,6 @@ +Version 1.02.147 - +===================================== + Version 1.02.146 - 18th December 2017 ===================================== Activation tree of thin pool skips duplicated check of pool status.

1 0

master - pre-release
by Alasdair Kergon 18 Dec '17

18 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a1f7a483253b11e52ad54… Commit: a1f7a483253b11e52ad5460b28cf0c75dba26659 Parent: 5f45cb90a7d6ca8ea3d0456c42d2fc4721cf5d79 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Mon Dec 18 20:36:10 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Mon Dec 18 20:36:10 2017 +0000 pre-release --- VERSION | 2 +- VERSION_DM | 2 +- WHATS_NEW | 4 ++-- WHATS_NEW_DM | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index 282f6f9..414b4df 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.02.177(2)-git (2017-11-03) +2.02.177(2)-git (2017-12-18) diff --git a/VERSION_DM b/VERSION_DM index 7aab7d6..4c2ffa3 100644 --- a/VERSION_DM +++ b/VERSION_DM @@ -1 +1 @@ -1.02.146-git (2017-11-03) +1.02.146-git (2017-12-18) diff --git a/WHATS_NEW b/WHATS_NEW index 5fc4cd3..2163a5e 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,5 @@ -Version 2.02.177 - -==================================== +Version 2.02.177 - 18th December 2017 +===================================== When writing text metadata content, use complete 4096 byte blocks. Change text format metadata alignment from 512 to 4096 bytes. When writing metadata, consistently skip mdas marked as failed. diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index d9503c2..8b304e6 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,5 @@ -Version 1.02.146 - -==================================== +Version 1.02.146 - 18th December 2017 +===================================== Activation tree of thin pool skips duplicated check of pool status. Remove code supporting replicator target. Do not ignore failure of _info_by_dev().

1 0

master - format_text: Transfer circular buf alloc to device layer.
by Alasdair Kergon 15 Dec '17

15 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5f45cb90a7d6ca8ea3d04… Commit: 5f45cb90a7d6ca8ea3d0456c42d2fc4721cf5d79 Parent: beee9940a503dd6165afd73835d3a6935afcce60 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Fri Dec 15 22:34:26 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Fri Dec 15 22:34:26 2017 +0000 format_text: Transfer circular buf alloc to device layer. Instead of the caller passing dev_read_circular() a buffer to fill with data, the device layer itself now allocates it. --- lib/config/config.c | 15 ++++----------- lib/device/dev-io.c | 27 +++++++++++++++++---------- lib/device/device.h | 4 ++-- lib/format_text/format-text.c | 12 +++++++----- 4 files changed, 30 insertions(+), 28 deletions(-) diff --git a/lib/config/config.c b/lib/config/config.c index f634e5b..fac7e4c 100644 --- a/lib/config/config.c +++ b/lib/config/config.c @@ -530,22 +530,15 @@ int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, dev_io_r fb = fb + mmap_offset; } else { if (circular) { - if (!(buf = dm_malloc(size + size2))) { - log_error("Failed to allocate circular buffer."); - return 0; - } - if (!dev_read_circular(dev, (uint64_t) offset, size, - (uint64_t) offset2, size2, reason, buf)) { - goto out; - } + if (!(buf = dev_read_circular(dev, (uint64_t) offset, size, (uint64_t) offset2, size2, reason))) + goto_out; } else { if (!(buf = dm_malloc(size))) { log_error("Failed to allocate buffer for metadata read."); return 0; } - if (!dev_read(dev, (uint64_t) offset, size, reason, buf)) { - goto out; - } + if (!dev_read(dev, (uint64_t) offset, size, reason, buf)) + goto_out; } fb = buf; } diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c index 1adf2ad..0545d8c 100644 --- a/lib/device/dev-io.c +++ b/lib/device/dev-io.c @@ -745,25 +745,32 @@ int dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t re } /* - * Read from 'dev' into 'buf' in 2 distinct regions, denoted - * by (offset,len) and (offset2,len2). Thus, the total size of - * 'buf' should be len+len2. + * Read from 'dev' in 2 distinct regions, denoted by (offset,len) and (offset2,len2). + * Caller is responsible for dm_free(). */ -int dev_read_circular(struct device *dev, uint64_t offset, size_t len, - uint64_t offset2, size_t len2, dev_io_reason_t reason, char *buf) +char *dev_read_circular(struct device *dev, uint64_t offset, size_t len, + uint64_t offset2, size_t len2, dev_io_reason_t reason) { + char *buf = NULL; + + if (!(buf = dm_malloc(len + len2))) { + log_error("Buffer allocation failed for split metadata."); + return NULL; + } + if (!dev_read(dev, offset, len, reason, buf)) { log_error("Read from %s failed", dev_name(dev)); - return 0; + dm_free(buf); + return NULL; } if (!dev_read(dev, offset2, len2, reason, buf + len)) { - log_error("Circular read from %s failed", - dev_name(dev)); - return 0; + log_error("Circular read from %s failed", dev_name(dev)); + dm_free(buf); + return NULL; } - return 1; + return buf; } /* FIXME If O_DIRECT can't extend file, dev_extend first; dev_truncate after. diff --git a/lib/device/device.h b/lib/device/device.h index 503373f..a369195 100644 --- a/lib/device/device.h +++ b/lib/device/device.h @@ -146,8 +146,8 @@ int dev_fd(struct device *dev); const char *dev_name(const struct device *dev); int dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason, void *buffer); -int dev_read_circular(struct device *dev, uint64_t offset, size_t len, - uint64_t offset2, size_t len2, dev_io_reason_t reason, char *buf); +char *dev_read_circular(struct device *dev, uint64_t offset, size_t len, + uint64_t offset2, size_t len2, dev_io_reason_t reason); int dev_write(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason, void *buffer); int dev_append(struct device *dev, size_t len, dev_io_reason_t reason, char *buffer); int dev_set(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason, int value); diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index ebc2dbb..79bb9fa 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -234,16 +234,18 @@ static int _pv_analyze_mda_raw (const struct format_type * fmt, * "dm_config_maybe_section" returning true when there's no valid * metadata in a sector (sectors with all nulls). */ - if (!(buf = dm_malloc(size + size2))) - goto_out; circular = size2 ? 1 : 0; if (circular) { - if (!dev_read_circular(area->dev, offset, size, offset2, size2, MDA_CONTENT_REASON(mda_is_primary(mda)), buf)) + if (!(buf = dev_read_circular(area->dev, offset, size, offset2, size2, MDA_CONTENT_REASON(mda_is_primary(mda))))) goto_out; - } else if (!dev_read(area->dev, offset, size, MDA_CONTENT_REASON(mda_is_primary(mda)), buf)) - goto_out; + } else { + if (!(buf = dm_malloc(size))) + goto_out; + if (!dev_read(area->dev, offset, size, MDA_CONTENT_REASON(mda_is_primary(mda)), buf)) + goto_out; + } /* * FIXME: We could add more sophisticated metadata detection

1 0

master - format_text: Separate out code paths for buffer wraparound
by Alasdair Kergon 15 Dec '17

15 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=beee9940a503dd6165afd… Commit: beee9940a503dd6165afd73835d3a6935afcce60 Parent: 145ded10c29a2e76ea12aab98a797e79135d6d44 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Fri Dec 15 21:12:19 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Fri Dec 15 21:12:19 2017 +0000 format_text: Separate out code paths for buffer wraparound The creation of wrapped around metadata - where the start of metadata is written up to the end of the buffer and the remainder follows back at the start of the buffer - is now restricted to cases where writing the metadata in one piece wouldn't fit. This shouldn't happen in 'normal' usage so let's begin treating the code for this as a special case that can be ignored when optimising 'normal' cases. --- lib/config/config.c | 27 +++++++++++++++++++-------- lib/device/dev-io.c | 9 +-------- lib/format_text/format-text.c | 10 ++++++++-- 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/lib/config/config.c b/lib/config/config.c index 8fca372..f634e5b 100644 --- a/lib/config/config.c +++ b/lib/config/config.c @@ -504,6 +504,7 @@ int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, dev_io_r int use_mmap = 1; off_t mmap_offset = 0; char *buf = NULL; + unsigned circular = size2 ? 1 : 0; /* Wrapped around end of disk metadata buffer? */ struct config_source *cs = dm_config_get_custom(cft); if (!_is_file_based_config_source(cs->type)) { @@ -514,7 +515,7 @@ int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, dev_io_r } /* Only use mmap with regular files */ - if (!(dev->flags & DEV_REGULAR) || size2) + if (!(dev->flags & DEV_REGULAR) || circular) use_mmap = 0; if (use_mmap) { @@ -528,13 +529,23 @@ int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, dev_io_r } fb = fb + mmap_offset; } else { - if (!(buf = dm_malloc(size + size2))) { - log_error("Failed to allocate circular buffer."); - return 0; - } - if (!dev_read_circular(dev, (uint64_t) offset, size, - (uint64_t) offset2, size2, reason, buf)) { - goto out; + if (circular) { + if (!(buf = dm_malloc(size + size2))) { + log_error("Failed to allocate circular buffer."); + return 0; + } + if (!dev_read_circular(dev, (uint64_t) offset, size, + (uint64_t) offset2, size2, reason, buf)) { + goto out; + } + } else { + if (!(buf = dm_malloc(size))) { + log_error("Failed to allocate buffer for metadata read."); + return 0; + } + if (!dev_read(dev, (uint64_t) offset, size, reason, buf)) { + goto out; + } } fb = buf; } diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c index c321e61..1adf2ad 100644 --- a/lib/device/dev-io.c +++ b/lib/device/dev-io.c @@ -745,7 +745,7 @@ int dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t re } /* - * Read from 'dev' into 'buf', possibly in 2 distinct regions, denoted + * Read from 'dev' into 'buf' in 2 distinct regions, denoted * by (offset,len) and (offset2,len2). Thus, the total size of * 'buf' should be len+len2. */ @@ -757,13 +757,6 @@ int dev_read_circular(struct device *dev, uint64_t offset, size_t len, return 0; } - /* - * The second region is optional, and allows for - * a circular buffer on the device. - */ - if (!len2) - return 1; - if (!dev_read(dev, offset2, len2, reason, buf + len)) { log_error("Circular read from %s failed", dev_name(dev)); diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index ab610ad..ebc2dbb 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -185,6 +185,7 @@ static int _pv_analyze_mda_raw (const struct format_type * fmt, char *buf=NULL; struct device_area *area; struct mda_context *mdac; + unsigned circular = 0; int r=0; mdac = (struct mda_context *) mda->metadata_locn; @@ -236,7 +237,12 @@ static int _pv_analyze_mda_raw (const struct format_type * fmt, if (!(buf = dm_malloc(size + size2))) goto_out; - if (!dev_read_circular(area->dev, offset, size, offset2, size2, MDA_CONTENT_REASON(mda_is_primary(mda)), buf)) + circular = size2 ? 1 : 0; + + if (circular) { + if (!dev_read_circular(area->dev, offset, size, offset2, size2, MDA_CONTENT_REASON(mda_is_primary(mda)), buf)) + goto_out; + } else if (!dev_read(area->dev, offset, size, MDA_CONTENT_REASON(mda_is_primary(mda)), buf)) goto_out; /* @@ -708,7 +714,7 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, int found = 0; int noprecommit = 0; const char *old_vg_name = NULL; - uint64_t new_size_rounded; + uint64_t new_size_rounded = 0; /* Ignore any mda on a PV outside the VG. vgsplit relies on this */ dm_list_iterate_items(pvl, &vg->pvs) {

1 0

master - format_text: Supply mempool directly to raw_read_mda_header.
by Alasdair Kergon 15 Dec '17

15 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=145ded10c29a2e76ea12a… Commit: 145ded10c29a2e76ea12aab98a797e79135d6d44 Parent: 83e1a0bad836f8950cb1e38924bf2600f118861e Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Fri Dec 15 14:57:05 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Fri Dec 15 14:57:05 2017 +0000 format_text: Supply mempool directly to raw_read_mda_header. --- lib/format_text/format-text.c | 21 ++++++++++----------- lib/format_text/layout.h | 3 +-- lib/format_text/text_label.c | 3 ++- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 1aa91c7..ab610ad 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -196,7 +196,7 @@ static int _pv_analyze_mda_raw (const struct format_type * fmt, if (!dev_open_readonly(area->dev)) return_0; - if (!(mdah = raw_read_mda_header(fmt, area, mda_is_primary(mda)))) + if (!(mdah = raw_read_mda_header(fmt->cmd->mem, area, mda_is_primary(mda)))) goto_out; rlocn = mdah->raw_locns; @@ -370,18 +370,17 @@ static int _raw_read_mda_header(struct mda_header *mdah, struct device_area *dev return 1; } -struct mda_header *raw_read_mda_header(const struct format_type *fmt, - struct device_area *dev_area, int primary_mda) +struct mda_header *raw_read_mda_header(struct dm_pool *mem, struct device_area *dev_area, int primary_mda) { struct mda_header *mdah; - if (!(mdah = dm_pool_alloc(fmt->cmd->mem, MDA_HEADER_SIZE))) { + if (!(mdah = dm_pool_alloc(mem, MDA_HEADER_SIZE))) { log_error("struct mda_header allocation failed"); return NULL; } if (!_raw_read_mda_header(mdah, dev_area, primary_mda)) { - dm_pool_free(fmt->cmd->mem, mdah); + dm_pool_free(mem, mdah); return NULL; } @@ -529,7 +528,7 @@ static int _raw_holds_vgname(struct format_instance *fid, if (!dev_open_readonly(dev_area->dev)) return_0; - if (!(mdah = raw_read_mda_header(fid->fmt, dev_area, 0))) + if (!(mdah = raw_read_mda_header(fid->fmt->cmd->mem, dev_area, 0))) return_0; if (_find_vg_rlocn(dev_area, mdah, 0, vgname, &noprecommit)) @@ -556,7 +555,7 @@ static struct volume_group *_vg_read_raw_area(struct format_instance *fid, char *desc; uint32_t wrap = 0; - if (!(mdah = raw_read_mda_header(fid->fmt, area, primary_mda))) + if (!(mdah = raw_read_mda_header(fid->fmt->cmd->mem, area, primary_mda))) goto_out; if (!(rlocn = _find_vg_rlocn(area, mdah, primary_mda, vgname, &precommitted))) { @@ -733,7 +732,7 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, if (!dev_open(mdac->area.dev)) return_0; - if (!(mdah = raw_read_mda_header(fid->fmt, &mdac->area, mda_is_primary(mda)))) + if (!(mdah = raw_read_mda_header(fid->fmt->cmd->mem, &mdac->area, mda_is_primary(mda)))) goto_out; /* Following space is zero-filled up to the next MDA_ALIGNMENT boundary */ @@ -865,7 +864,7 @@ static int _vg_commit_raw_rlocn(struct format_instance *fid, if (!found) return 1; - if (!(mdah = raw_read_mda_header(fid->fmt, &mdac->area, mda_is_primary(mda)))) + if (!(mdah = raw_read_mda_header(fid->fmt->cmd->mem, &mdac->area, mda_is_primary(mda)))) goto_out; if (!(rlocn = _find_vg_rlocn(&mdac->area, mdah, mda_is_primary(mda), old_vg_name ? : vg->name, &noprecommit))) { @@ -985,7 +984,7 @@ static int _vg_remove_raw(struct format_instance *fid, struct volume_group *vg, if (!dev_open(mdac->area.dev)) return_0; - if (!(mdah = raw_read_mda_header(fid->fmt, &mdac->area, mda_is_primary(mda)))) + if (!(mdah = raw_read_mda_header(fid->fmt->cmd->mem, &mdac->area, mda_is_primary(mda)))) goto_out; if (!(rlocn = _find_vg_rlocn(&mdac->area, mdah, mda_is_primary(mda), vg->name, &noprecommit))) { @@ -1414,7 +1413,7 @@ static int _scan_raw(const struct format_type *fmt, const char *vgname __attribu continue; } - if (!(mdah = raw_read_mda_header(fmt, &rl->dev_area, 0))) { + if (!(mdah = raw_read_mda_header(fmt->cmd->mem, &rl->dev_area, 0))) { stack; goto close_dev; } diff --git a/lib/format_text/layout.h b/lib/format_text/layout.h index bc25597..c0906a6 100644 --- a/lib/format_text/layout.h +++ b/lib/format_text/layout.h @@ -81,8 +81,7 @@ struct mda_header { struct raw_locn raw_locns[0]; /* NULL-terminated list */ } __attribute__ ((packed)); -struct mda_header *raw_read_mda_header(const struct format_type *fmt, - struct device_area *dev_area, int primary_mda); +struct mda_header *raw_read_mda_header(struct dm_pool *mem, struct device_area *dev_area, int primary_mda); struct mda_lists { struct dm_list dirs; diff --git a/lib/format_text/text_label.c b/lib/format_text/text_label.c index 7058f70..d5e4820 100644 --- a/lib/format_text/text_label.c +++ b/lib/format_text/text_label.c @@ -19,6 +19,7 @@ #include "label.h" #include "xlate.h" #include "lvmcache.h" +#include "toolcontext.h" #include <sys/stat.h> #include <fcntl.h> @@ -344,7 +345,7 @@ static int _update_mda(struct metadata_area *mda, void *baton) return 1; } - if (!(mdah = raw_read_mda_header(fmt, &mdac->area, mda_is_primary(mda)))) { + if (!(mdah = raw_read_mda_header(fmt->cmd->mem, &mdac->area, mda_is_primary(mda)))) { stack; goto close_dev; }

1 0

master - lvm2app: Suppress deprecation warnings for our builds
by Marian Csontos 14 Dec '17

14 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=83e1a0bad836f8950cb1e… Commit: 83e1a0bad836f8950cb1e38924bf2600f118861e Parent: c957d46f1d73891e3a7e9c1482c1d4a39ca0e79a Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Thu Dec 14 13:49:33 2017 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Thu Dec 14 16:45:53 2017 +0100 lvm2app: Suppress deprecation warnings for our builds --- liblvm/lvm2app.h | 2 ++ make.tmpl.in | 2 ++ python/liblvm.c | 1 + 3 files changed, 5 insertions(+), 0 deletions(-) diff --git a/liblvm/lvm2app.h b/liblvm/lvm2app.h index f64262d..10ecd2e 100644 --- a/liblvm/lvm2app.h +++ b/liblvm/lvm2app.h @@ -18,7 +18,9 @@ #include <stdint.h> +#ifndef _BUILDING_LVM #warning "liblvm2app is deprecated, use D-Bus API instead." +#endif #ifdef __cplusplus extern "C" { diff --git a/make.tmpl.in b/make.tmpl.in index 65362d8..bdf2349 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -261,6 +261,8 @@ endif # end of fPIC protection endif +DEFS += -D_BUILDING_LVM + LDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib CLDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib diff --git a/python/liblvm.c b/python/liblvm.c index 6d67b8b..06120e6 100644 --- a/python/liblvm.c +++ b/python/liblvm.c @@ -22,6 +22,7 @@ */ #include <Python.h> +#define _BUILDING_LVM #include "lvm2app.h" #include "defaults.h"

1 0

master - lvmdbusd: Make lvmdbusd executable
by Marian Csontos 14 Dec '17

14 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c957d46f1d73891e3a7e9… Commit: c957d46f1d73891e3a7e9c1482c1d4a39ca0e79a Parent: c48d22bd3cddfe540413ed591ea18399c571a852 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Thu Dec 14 13:40:05 2017 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Thu Dec 14 16:45:53 2017 +0100 lvmdbusd: Make lvmdbusd executable - Add files built from *.in to builddir files. - Add all files built from *.in to DISTCLEAN_TARGETS. --- daemons/lvmdbusd/Makefile.in | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in index 0d52406..7cd7724 100644 --- a/daemons/lvmdbusd/Makefile.in +++ b/daemons/lvmdbusd/Makefile.in @@ -26,9 +26,7 @@ LVMDBUS_SRCDIR_FILES = \ __init__.py \ job.py \ loader.py \ - lvmdb.py \ main.py \ - lvm_shell_proxy.py \ lv.py \ manager.py \ objectmanager.py \ @@ -40,14 +38,19 @@ LVMDBUS_SRCDIR_FILES = \ vg.py LVMDBUS_BUILDDIR_FILES = \ + lvmdb.py \ + lvm_shell_proxy.py \ path.py -LVMDBUSD = $(srcdir)/lvmdbusd +LVMDBUSD = lvmdbusd include $(top_builddir)/make.tmpl .PHONY: install_lvmdbusd +all: + test -x $(LVMDBUSD) || chmod 755 $(LVMDBUSD) + install_lvmdbusd: $(INSTALL_DIR) $(sbindir) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir) @@ -63,4 +66,5 @@ install_lvm2: install_lvmdbusd install: install_lvm2 DISTCLEAN_TARGETS+= \ - $(LVMDBUS_BUILDDIR_FILES) + $(LVMDBUS_BUILDDIR_FILES) \ + $(LVMDBUSD)

1 0

master - docs: Add TESTING file
by Marian Csontos 14 Dec '17

14 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c48d22bd3cddfe540413e… Commit: c48d22bd3cddfe540413ed591ea18399c571a852 Parent: 584ff361dff9dc27a05839ac179899a80007b56e Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Thu Dec 14 15:42:34 2017 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Thu Dec 14 16:45:47 2017 +0100 docs: Add TESTING file --- TESTING | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/TESTING b/TESTING new file mode 100644 index 0000000..57932f5 --- /dev/null +++ b/TESTING @@ -0,0 +1,62 @@ +LVM2 Test Suite +=============== + +The codebase contains many tests in the test subdirectory. + +Before running tests +-------------------- + +Keep in mind the testsuite MUST run under root user. + +It is recommended not to use LVM on the test machine, especially when running +tests with udev (`make check_system`.) + +You MUST disable (or mask) any LVM daemons: + +- lvmetad +- dmeventd +- lvmpolld +- lvmdbusd +- lvmlockd +- clvmd +- cmirrord + +For running cluster tests, we are using singlenode locking. Pass +`--with-clvmd=singlenode` to configure. + +NOTE: This is useful only for testing, and should not be used in produciton +code. + +To run D-Bus daemon tests, existing D-Bus session is required. + +Running tests +------------- + +As root run: + + make check + +To run only tests matching a string: + + make check T=test + +To skip tests matching a string: + + make check S=test + +There are other targets and many environment variables can be used to tweak the +testsuite - for full list and description run `make -C test help`. + +Installing testsuite +-------------------- + +It is possible to install and run a testsuite against installed LVM. Run the +following: + + make -C test install + +Then lvm2-testsuite binary can be executed to test installed binaries. + +See `lvm2-testsuite --help` for options. The same environment variables can be +used as with `make check`. +

1 0

master - test: fix trap adding proper teardown to previous, new raid tests
by Heinz Mauelshagen 13 Dec '17

13 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=584ff361dff9dc27a0583… Commit: 584ff361dff9dc27a05839ac179899a80007b56e Parent: 86fa0333fffe89547263f8b46b291d19726e7cca Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Wed Dec 13 14:39:06 2017 +0100 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Wed Dec 13 14:41:23 2017 +0100 test: fix trap adding proper teardown to previous, new raid tests Also remove superfluous variable. --- test/shell/lvconvert-raid-reshape-load.sh | 25 ++++++++++-------- .../lvconvert-raid-reshape-stripes-load-fail.sh | 27 +++++++++++--------- .../lvconvert-raid-reshape-stripes-load-reload.sh | 25 ++++++++++-------- test/shell/lvconvert-raid-reshape-stripes-load.sh | 25 ++++++++++-------- 4 files changed, 57 insertions(+), 45 deletions(-) diff --git a/test/shell/lvconvert-raid-reshape-load.sh b/test/shell/lvconvert-raid-reshape-load.sh index 55e2ad4..d17b186 100644 --- a/test/shell/lvconvert-raid-reshape-load.sh +++ b/test/shell/lvconvert-raid-reshape-load.sh @@ -13,8 +13,6 @@ SKIP_WITH_LVMLOCKD=1 SKIP_WITH_LVMPOLLD=1 -LVM_SKIP_LARGE_TESTS=1 - . lib/inittest # Test reshaping under io load @@ -22,9 +20,13 @@ LVM_SKIP_LARGE_TESTS=1 which mkfs.ext4 || skip aux have_raid 1 13 1 || skip -mpoint=/tmp/mpoint.$$ +mount_dir="mnt" -trap "[ -d $mpoint ] && rmdir $mpoint" 1 2 3 15 +cleanup_mounted_and_teardown() +{ + umount "$mount_dir" || true + aux teardown +} aux prepare_pvs 16 32 @@ -32,6 +34,8 @@ get_devs vgcreate -s 1M "$vg" "${DEVICES[@]}" +trap 'cleanup_mounted_and_teardown' EXIT + # Create 13-way striped raid5 (14 legs total) lvcreate --yes --type raid5_ls --stripes 13 -L190M -n$lv1 $vg check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" @@ -40,15 +44,15 @@ check lv_first_seg_field $vg/$lv1 stripes 14 echo y|mkfs -t ext4 /dev/$vg/$lv1 aux wait_for_sync $vg $lv1 -mkdir -p $mpoint -mount "$DM_DEV_DIR/$vg/$lv1" $mpoint -mkdir -p $mpoint/1 $mpoint/2 +mkdir -p $mount_dir +mount "$DM_DEV_DIR/$vg/$lv1" $mount_dir +mkdir -p $mount_dir/1 $mount_dir/2 aux delay_dev "$dev2" 0 100 echo 3 >/proc/sys/vm/drop_caches -cp -r /usr/bin $mpoint/1 >/dev/null 2>/dev/null & -cp -r /usr/bin $mpoint/2 >/dev/null 2>/dev/null & +cp -r /usr/bin $mount_dir/1 >/dev/null 2>/dev/null & +cp -r /usr/bin $mount_dir/2 >/dev/null 2>/dev/null & sync & # Reshape it to 256K stripe size @@ -59,8 +63,7 @@ check lv_first_seg_field $vg/$lv1 stripesize "256.00k" kill -9 %% wait -umount $mpoint -[ -d $mpoint ] && rmdir $mpoint +umount $mount_dir fsck -fn "$DM_DEV_DIR/$vg/$lv1" diff --git a/test/shell/lvconvert-raid-reshape-stripes-load-fail.sh b/test/shell/lvconvert-raid-reshape-stripes-load-fail.sh index 96bea52..38af778 100644 --- a/test/shell/lvconvert-raid-reshape-stripes-load-fail.sh +++ b/test/shell/lvconvert-raid-reshape-stripes-load-fail.sh @@ -13,8 +13,6 @@ SKIP_WITH_LVMLOCKD=1 SKIP_WITH_LVMPOLLD=1 -LVM_SKIP_LARGE_TESTS=1 - . lib/inittest # Test reshaping under io load @@ -22,9 +20,13 @@ LVM_SKIP_LARGE_TESTS=1 which mkfs.ext4 || skip aux have_raid 1 13 1 || skip -mpoint=/tmp/mpoint.$$ +mount_dir="mnt" -trap "[ -d $mpoint ] && rmdir $mpoint" 1 2 3 15 +cleanup_mounted_and_teardown() +{ + umount "$mount_dir" || true + aux teardown +} aux prepare_pvs 16 32 @@ -32,6 +34,8 @@ get_devs vgcreate -s 1M "$vg" "${DEVICES[@]}" +trap 'cleanup_mounted_and_teardown' EXIT + # Create 13-way striped raid5 (14 legs total) lvcreate --yes --type raid5_ls --stripesize 64K --stripes 10 -L200M -n$lv1 $vg check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" @@ -40,14 +44,14 @@ check lv_first_seg_field $vg/$lv1 data_stripes 10 check lv_first_seg_field $vg/$lv1 stripes 11 echo y|mkfs -t ext4 /dev/$vg/$lv1 -mkdir -p $mpoint -mount "$DM_DEV_DIR/$vg/$lv1" $mpoint -mkdir -p $mpoint/1 $mpoint/2 +mkdir -p $mount_dir +mount "$DM_DEV_DIR/$vg/$lv1" $mount_dir +mkdir -p $mount_dir/1 $mount_dir/2 echo 3 >/proc/sys/vm/drop_caches -cp -r /usr/bin $mpoint/1 >/dev/null 2>/dev/null & -cp -r /usr/bin $mpoint/2 >/dev/null 2>/dev/null & +cp -r /usr/bin $mount_dir/1 >/dev/null 2>/dev/null & +cp -r /usr/bin $mount_dir/2 >/dev/null 2>/dev/null & sync & aux wait_for_sync $vg $lv1 @@ -62,13 +66,12 @@ check lv_first_seg_field $vg/$lv1 stripesize "64.00k" check lv_first_seg_field $vg/$lv1 data_stripes 15 check lv_first_seg_field $vg/$lv1 stripes 16 -rm -fr $mpoint/2 +rm -fr $mount_dir/2 sync kill -9 %% wait -umount $mpoint -[ -d $mpoint ] && rmdir $mpoint +umount $mount_dir fsck -fn "$DM_DEV_DIR/$vg/$lv1" diff --git a/test/shell/lvconvert-raid-reshape-stripes-load-reload.sh b/test/shell/lvconvert-raid-reshape-stripes-load-reload.sh index 9ca3ded..f0a71c3 100644 --- a/test/shell/lvconvert-raid-reshape-stripes-load-reload.sh +++ b/test/shell/lvconvert-raid-reshape-stripes-load-reload.sh @@ -13,8 +13,6 @@ SKIP_WITH_LVMLOCKD=1 SKIP_WITH_LVMPOLLD=1 -LVM_SKIP_LARGE_TESTS=1 - . lib/inittest # Test reshaping under io load @@ -22,9 +20,13 @@ LVM_SKIP_LARGE_TESTS=1 which mkfs.ext4 || skip aux have_raid 1 13 2 || skip -mpoint=/tmp/mpoint.$$ +mount_dir="mnt" -trap "[ -d $mpoint ] && rmdir $mpoint" 1 2 3 15 +cleanup_mounted_and_teardown() +{ + umount "$mount_dir" || true + aux teardown +} aux prepare_pvs 16 32 @@ -32,6 +34,8 @@ get_devs vgcreate -s 1M "$vg" "${DEVICES[@]}" +trap 'cleanup_mounted_and_teardown' EXIT + # Create 13-way striped raid5 (14 legs total) lvcreate --yes --type raid5_ls --stripesize 64K --stripes 10 -L200M -n$lv1 $vg check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" @@ -40,13 +44,13 @@ check lv_first_seg_field $vg/$lv1 data_stripes 10 check lv_first_seg_field $vg/$lv1 stripes 11 echo y|mkfs -t ext4 /dev/$vg/$lv1 -mkdir -p $mpoint -mount "$DM_DEV_DIR/$vg/$lv1" $mpoint -mkdir -p $mpoint/1 $mpoint/2 +mkdir -p $mount_dir +mount "$DM_DEV_DIR/$vg/$lv1" $mount_dir +mkdir -p $mount_dir/1 $mount_dir/2 echo 3 >/proc/sys/vm/drop_caches -cp -r /usr/bin $mpoint/1 >/dev/null 2>/dev/null & -cp -r /usr/bin $mpoint/2 >/dev/null 2>/dev/null & +cp -r /usr/bin $mount_dir/1 >/dev/null 2>/dev/null & +cp -r /usr/bin $mount_dir/2 >/dev/null 2>/dev/null & sync & aux wait_for_sync $vg $lv1 @@ -73,8 +77,7 @@ aux delay_dev "$dev2" 0 kill -9 %% wait -umount $mpoint -[ -d $mpoint ] && rmdir $mpoint +umount $mount_dir fsck -fn "$DM_DEV_DIR/$vg/$lv1" diff --git a/test/shell/lvconvert-raid-reshape-stripes-load.sh b/test/shell/lvconvert-raid-reshape-stripes-load.sh index 53bba2e..785ee76 100644 --- a/test/shell/lvconvert-raid-reshape-stripes-load.sh +++ b/test/shell/lvconvert-raid-reshape-stripes-load.sh @@ -13,8 +13,6 @@ SKIP_WITH_LVMLOCKD=1 SKIP_WITH_LVMPOLLD=1 -LVM_SKIP_LARGE_TESTS=1 - . lib/inittest # Test reshaping under io load @@ -22,9 +20,13 @@ LVM_SKIP_LARGE_TESTS=1 which mkfs.ext4 || skip aux have_raid 1 13 1 || skip -mpoint=/tmp/mpoint.$$ +mount_dir="mnt" -trap "[ -d $mpoint ] && rmdir $mpoint" 1 2 3 15 +cleanup_mounted_and_teardown() +{ + umount "$mount_dir" || true + aux teardown +} aux prepare_pvs 16 32 @@ -32,6 +34,8 @@ get_devs vgcreate -s 1M "$vg" "${DEVICES[@]}" +trap 'cleanup_mounted_and_teardown' EXIT + # Create 13-way striped raid5 (14 legs total) lvcreate --yes --type raid5_ls --stripesize 64K --stripes 10 -L200M -n$lv1 $vg check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" @@ -40,14 +44,14 @@ check lv_first_seg_field $vg/$lv1 data_stripes 10 check lv_first_seg_field $vg/$lv1 stripes 11 echo y|mkfs -t ext4 /dev/$vg/$lv1 -mkdir -p $mpoint -mount "$DM_DEV_DIR/$vg/$lv1" $mpoint -mkdir -p $mpoint/1 $mpoint/2 +mkdir -p $mount_dir +mount "$DM_DEV_DIR/$vg/$lv1" $mount_dir +mkdir -p $mount_dir/1 $mount_dir/2 echo 3 >/proc/sys/vm/drop_caches -cp -r /usr/bin $mpoint/1 >/dev/null 2>/dev/null & -cp -r /usr/bin $mpoint/2 >/dev/null 2>/dev/null & +cp -r /usr/bin $mount_dir/1 >/dev/null 2>/dev/null & +cp -r /usr/bin $mount_dir/2 >/dev/null 2>/dev/null & sync & aux wait_for_sync $vg $lv1 @@ -64,8 +68,7 @@ check lv_first_seg_field $vg/$lv1 stripes 16 kill -9 %% wait -umount $mpoint -[ -d $mpoint ] && rmdir $mpoint +umount $mount_dir fsck -fn "$DM_DEV_DIR/$vg/$lv1"

1 0

master - test: new raid tests
by Heinz Mauelshagen 13 Dec '17

13 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=86fa0333fffe89547263f… Commit: 86fa0333fffe89547263f8b46b291d19726e7cca Parent: 3edc25dbdfc5d8d5ba109921dae87c5415a0b460 Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Wed Dec 13 02:55:06 2017 +0100 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Wed Dec 13 13:30:53 2017 +0100 test: new raid tests Add three new raid tests with io load and table reloads during reshape for target 1.13.2. Add a raid0 to raid10 conversion test. Also add more signals to trap in lvconvert-raid-reshape-load.sh. --- test/shell/lvconvert-raid-reshape-load.sh | 2 +- .../lvconvert-raid-reshape-stripes-load-fail.sh | 75 ++++++++++++++++++ .../lvconvert-raid-reshape-stripes-load-reload.sh | 81 ++++++++++++++++++++ test/shell/lvconvert-raid-reshape-stripes-load.sh | 72 +++++++++++++++++ test/shell/lvconvert-raid0_to_raid10.sh | 32 ++++++++ 5 files changed, 261 insertions(+), 1 deletions(-) diff --git a/test/shell/lvconvert-raid-reshape-load.sh b/test/shell/lvconvert-raid-reshape-load.sh index 4ccf01f..55e2ad4 100644 --- a/test/shell/lvconvert-raid-reshape-load.sh +++ b/test/shell/lvconvert-raid-reshape-load.sh @@ -24,7 +24,7 @@ aux have_raid 1 13 1 || skip mpoint=/tmp/mpoint.$$ -trap "[ -d $mpoint ] && rmdir $mpoint" 15 +trap "[ -d $mpoint ] && rmdir $mpoint" 1 2 3 15 aux prepare_pvs 16 32 diff --git a/test/shell/lvconvert-raid-reshape-stripes-load-fail.sh b/test/shell/lvconvert-raid-reshape-stripes-load-fail.sh new file mode 100644 index 0000000..96bea52 --- /dev/null +++ b/test/shell/lvconvert-raid-reshape-stripes-load-fail.sh @@ -0,0 +1,75 @@ +#!/usr/bin/env bash + +# Copyright (C) 2017 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, MA2110-1301 USA + +SKIP_WITH_LVMLOCKD=1 +SKIP_WITH_LVMPOLLD=1 + +LVM_SKIP_LARGE_TESTS=1 + +. lib/inittest + +# Test reshaping under io load + +which mkfs.ext4 || skip +aux have_raid 1 13 1 || skip + +mpoint=/tmp/mpoint.$$ + +trap "[ -d $mpoint ] && rmdir $mpoint" 1 2 3 15 + +aux prepare_pvs 16 32 + +get_devs + +vgcreate -s 1M "$vg" "${DEVICES[@]}" + +# Create 13-way striped raid5 (14 legs total) +lvcreate --yes --type raid5_ls --stripesize 64K --stripes 10 -L200M -n$lv1 $vg +check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" +check lv_first_seg_field $vg/$lv1 stripesize "64.00k" +check lv_first_seg_field $vg/$lv1 data_stripes 10 +check lv_first_seg_field $vg/$lv1 stripes 11 +echo y|mkfs -t ext4 /dev/$vg/$lv1 + +mkdir -p $mpoint +mount "$DM_DEV_DIR/$vg/$lv1" $mpoint +mkdir -p $mpoint/1 $mpoint/2 + + +echo 3 >/proc/sys/vm/drop_caches +cp -r /usr/bin $mpoint/1 >/dev/null 2>/dev/null & +cp -r /usr/bin $mpoint/2 >/dev/null 2>/dev/null & +sync & + +aux wait_for_sync $vg $lv1 +aux delay_dev "$dev2" 0 100 + +# Reshape it to 15 data stripes +lvconvert --yes --stripes 15 $vg/$lv1 +aux disable_dev $dev1 +aux delay_dev "$dev2" 0 0 +check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" +check lv_first_seg_field $vg/$lv1 stripesize "64.00k" +check lv_first_seg_field $vg/$lv1 data_stripes 15 +check lv_first_seg_field $vg/$lv1 stripes 16 + +rm -fr $mpoint/2 +sync +kill -9 %% +wait + +umount $mpoint +[ -d $mpoint ] && rmdir $mpoint + +fsck -fn "$DM_DEV_DIR/$vg/$lv1" + +vgremove -ff $vg diff --git a/test/shell/lvconvert-raid-reshape-stripes-load-reload.sh b/test/shell/lvconvert-raid-reshape-stripes-load-reload.sh new file mode 100644 index 0000000..9ca3ded --- /dev/null +++ b/test/shell/lvconvert-raid-reshape-stripes-load-reload.sh @@ -0,0 +1,81 @@ +#!/usr/bin/env bash + +# Copyright (C) 2017 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, MA2110-1301 USA + +SKIP_WITH_LVMLOCKD=1 +SKIP_WITH_LVMPOLLD=1 + +LVM_SKIP_LARGE_TESTS=1 + +. lib/inittest + +# Test reshaping under io load + +which mkfs.ext4 || skip +aux have_raid 1 13 2 || skip + +mpoint=/tmp/mpoint.$$ + +trap "[ -d $mpoint ] && rmdir $mpoint" 1 2 3 15 + +aux prepare_pvs 16 32 + +get_devs + +vgcreate -s 1M "$vg" "${DEVICES[@]}" + +# Create 13-way striped raid5 (14 legs total) +lvcreate --yes --type raid5_ls --stripesize 64K --stripes 10 -L200M -n$lv1 $vg +check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" +check lv_first_seg_field $vg/$lv1 stripesize "64.00k" +check lv_first_seg_field $vg/$lv1 data_stripes 10 +check lv_first_seg_field $vg/$lv1 stripes 11 +echo y|mkfs -t ext4 /dev/$vg/$lv1 + +mkdir -p $mpoint +mount "$DM_DEV_DIR/$vg/$lv1" $mpoint +mkdir -p $mpoint/1 $mpoint/2 + +echo 3 >/proc/sys/vm/drop_caches +cp -r /usr/bin $mpoint/1 >/dev/null 2>/dev/null & +cp -r /usr/bin $mpoint/2 >/dev/null 2>/dev/null & +sync & + +aux wait_for_sync $vg $lv1 +aux delay_dev "$dev2" 0 200 + +# Reshape it to 15 data stripes +lvconvert --yes --stripes 15 $vg/$lv1 +check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" +check lv_first_seg_field $vg/$lv1 stripesize "64.00k" +check lv_first_seg_field $vg/$lv1 data_stripes 15 +check lv_first_seg_field $vg/$lv1 stripes 16 + +# Reload table during reshape to test for data corruption +for i in {0..5} +do + dmsetup table $vg-$lv1|dmsetup load $vg-$lv1 + dmsetup suspend --noflush $vg-$lv1 + dmsetup resume $vg-$lv1 + sleep 0.3 +done + +aux delay_dev "$dev2" 0 + +kill -9 %% +wait + +umount $mpoint +[ -d $mpoint ] && rmdir $mpoint + +fsck -fn "$DM_DEV_DIR/$vg/$lv1" + +vgremove -ff $vg diff --git a/test/shell/lvconvert-raid-reshape-stripes-load.sh b/test/shell/lvconvert-raid-reshape-stripes-load.sh new file mode 100644 index 0000000..53bba2e --- /dev/null +++ b/test/shell/lvconvert-raid-reshape-stripes-load.sh @@ -0,0 +1,72 @@ +#!/usr/bin/env bash + +# Copyright (C) 2017 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, MA2110-1301 USA + +SKIP_WITH_LVMLOCKD=1 +SKIP_WITH_LVMPOLLD=1 + +LVM_SKIP_LARGE_TESTS=1 + +. lib/inittest + +# Test reshaping under io load + +which mkfs.ext4 || skip +aux have_raid 1 13 1 || skip + +mpoint=/tmp/mpoint.$$ + +trap "[ -d $mpoint ] && rmdir $mpoint" 1 2 3 15 + +aux prepare_pvs 16 32 + +get_devs + +vgcreate -s 1M "$vg" "${DEVICES[@]}" + +# Create 13-way striped raid5 (14 legs total) +lvcreate --yes --type raid5_ls --stripesize 64K --stripes 10 -L200M -n$lv1 $vg +check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" +check lv_first_seg_field $vg/$lv1 stripesize "64.00k" +check lv_first_seg_field $vg/$lv1 data_stripes 10 +check lv_first_seg_field $vg/$lv1 stripes 11 +echo y|mkfs -t ext4 /dev/$vg/$lv1 + +mkdir -p $mpoint +mount "$DM_DEV_DIR/$vg/$lv1" $mpoint +mkdir -p $mpoint/1 $mpoint/2 + + +echo 3 >/proc/sys/vm/drop_caches +cp -r /usr/bin $mpoint/1 >/dev/null 2>/dev/null & +cp -r /usr/bin $mpoint/2 >/dev/null 2>/dev/null & +sync & + +aux wait_for_sync $vg $lv1 +aux delay_dev "$dev2" 0 100 + +# Reshape it to 15 data stripes +lvconvert --yes --stripes 15 $vg/$lv1 +aux delay_dev "$dev2" 0 0 +check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" +check lv_first_seg_field $vg/$lv1 stripesize "64.00k" +check lv_first_seg_field $vg/$lv1 data_stripes 15 +check lv_first_seg_field $vg/$lv1 stripes 16 + +kill -9 %% +wait + +umount $mpoint +[ -d $mpoint ] && rmdir $mpoint + +fsck -fn "$DM_DEV_DIR/$vg/$lv1" + +vgremove -ff $vg diff --git a/test/shell/lvconvert-raid0_to_raid10.sh b/test/shell/lvconvert-raid0_to_raid10.sh new file mode 100644 index 0000000..d1e1fa0 --- /dev/null +++ b/test/shell/lvconvert-raid0_to_raid10.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +# Copyright (C) 2017 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_LVMLOCKD=1 +SKIP_WITH_LVMPOLLD=1 + +. lib/inittest + +# rhbz1514500 + +aux have_raid 1 12 0 || skip + +# 8 PVs needed for RAID10 testing (4-stripes/2-mirror) +aux prepare_pvs 8 64 +get_devs +vgcreate -s 256k "$vg" "${DEVICES[@]}" + +lvcreate -y --ty raid0 -R32.00k -i 4 -n $lv1 -L 64M $vg +lvcreate -y -i4 -l4 -n $lv2 $vg +lvextend -y -l +4 $vg/$lv1 +lvconvert -y -R512K --ty raid10 $vg/$lv1 + +vgremove -ff $vg

1 0

master - test: new raid tests
by Heinz Mauelshagen 12 Dec '17

12 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2883570a8c8ce0480e7cc… Commit: 2883570a8c8ce0480e7ccf328784b181dfbba0a0 Parent: 3edc25dbdfc5d8d5ba109921dae87c5415a0b460 Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Wed Dec 13 02:55:06 2017 +0100 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Wed Dec 13 02:57:57 2017 +0100 test: new raid tests Add three new raid tests with io load and table reloads during reshape for target 1.13.2. Add a raid0 to raid10 conversion test. Also add more signal to trap in lvconvert-raid-reshape-load.sh. --- test/shell/lvconvert-raid-reshape-load.sh | 2 +- .../lvconvert-raid-reshape-stripes-load-fail.sh | 75 ++++++++++++++++++ .../lvconvert-raid-reshape-stripes-load-reload.sh | 81 ++++++++++++++++++++ test/shell/lvconvert-raid-reshape-stripes-load.sh | 72 +++++++++++++++++ test/shell/lvconvert-raid0_to_raid10.sh | 32 ++++++++ 5 files changed, 261 insertions(+), 1 deletions(-) diff --git a/test/shell/lvconvert-raid-reshape-load.sh b/test/shell/lvconvert-raid-reshape-load.sh index 4ccf01f..55e2ad4 100644 --- a/test/shell/lvconvert-raid-reshape-load.sh +++ b/test/shell/lvconvert-raid-reshape-load.sh @@ -24,7 +24,7 @@ aux have_raid 1 13 1 || skip mpoint=/tmp/mpoint.$$ -trap "[ -d $mpoint ] && rmdir $mpoint" 15 +trap "[ -d $mpoint ] && rmdir $mpoint" 1 2 3 15 aux prepare_pvs 16 32 diff --git a/test/shell/lvconvert-raid-reshape-stripes-load-fail.sh b/test/shell/lvconvert-raid-reshape-stripes-load-fail.sh new file mode 100644 index 0000000..96bea52 --- /dev/null +++ b/test/shell/lvconvert-raid-reshape-stripes-load-fail.sh @@ -0,0 +1,75 @@ +#!/usr/bin/env bash + +# Copyright (C) 2017 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, MA2110-1301 USA + +SKIP_WITH_LVMLOCKD=1 +SKIP_WITH_LVMPOLLD=1 + +LVM_SKIP_LARGE_TESTS=1 + +. lib/inittest + +# Test reshaping under io load + +which mkfs.ext4 || skip +aux have_raid 1 13 1 || skip + +mpoint=/tmp/mpoint.$$ + +trap "[ -d $mpoint ] && rmdir $mpoint" 1 2 3 15 + +aux prepare_pvs 16 32 + +get_devs + +vgcreate -s 1M "$vg" "${DEVICES[@]}" + +# Create 13-way striped raid5 (14 legs total) +lvcreate --yes --type raid5_ls --stripesize 64K --stripes 10 -L200M -n$lv1 $vg +check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" +check lv_first_seg_field $vg/$lv1 stripesize "64.00k" +check lv_first_seg_field $vg/$lv1 data_stripes 10 +check lv_first_seg_field $vg/$lv1 stripes 11 +echo y|mkfs -t ext4 /dev/$vg/$lv1 + +mkdir -p $mpoint +mount "$DM_DEV_DIR/$vg/$lv1" $mpoint +mkdir -p $mpoint/1 $mpoint/2 + + +echo 3 >/proc/sys/vm/drop_caches +cp -r /usr/bin $mpoint/1 >/dev/null 2>/dev/null & +cp -r /usr/bin $mpoint/2 >/dev/null 2>/dev/null & +sync & + +aux wait_for_sync $vg $lv1 +aux delay_dev "$dev2" 0 100 + +# Reshape it to 15 data stripes +lvconvert --yes --stripes 15 $vg/$lv1 +aux disable_dev $dev1 +aux delay_dev "$dev2" 0 0 +check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" +check lv_first_seg_field $vg/$lv1 stripesize "64.00k" +check lv_first_seg_field $vg/$lv1 data_stripes 15 +check lv_first_seg_field $vg/$lv1 stripes 16 + +rm -fr $mpoint/2 +sync +kill -9 %% +wait + +umount $mpoint +[ -d $mpoint ] && rmdir $mpoint + +fsck -fn "$DM_DEV_DIR/$vg/$lv1" + +vgremove -ff $vg diff --git a/test/shell/lvconvert-raid-reshape-stripes-load-reload.sh b/test/shell/lvconvert-raid-reshape-stripes-load-reload.sh new file mode 100644 index 0000000..9ca3ded --- /dev/null +++ b/test/shell/lvconvert-raid-reshape-stripes-load-reload.sh @@ -0,0 +1,81 @@ +#!/usr/bin/env bash + +# Copyright (C) 2017 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, MA2110-1301 USA + +SKIP_WITH_LVMLOCKD=1 +SKIP_WITH_LVMPOLLD=1 + +LVM_SKIP_LARGE_TESTS=1 + +. lib/inittest + +# Test reshaping under io load + +which mkfs.ext4 || skip +aux have_raid 1 13 2 || skip + +mpoint=/tmp/mpoint.$$ + +trap "[ -d $mpoint ] && rmdir $mpoint" 1 2 3 15 + +aux prepare_pvs 16 32 + +get_devs + +vgcreate -s 1M "$vg" "${DEVICES[@]}" + +# Create 13-way striped raid5 (14 legs total) +lvcreate --yes --type raid5_ls --stripesize 64K --stripes 10 -L200M -n$lv1 $vg +check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" +check lv_first_seg_field $vg/$lv1 stripesize "64.00k" +check lv_first_seg_field $vg/$lv1 data_stripes 10 +check lv_first_seg_field $vg/$lv1 stripes 11 +echo y|mkfs -t ext4 /dev/$vg/$lv1 + +mkdir -p $mpoint +mount "$DM_DEV_DIR/$vg/$lv1" $mpoint +mkdir -p $mpoint/1 $mpoint/2 + +echo 3 >/proc/sys/vm/drop_caches +cp -r /usr/bin $mpoint/1 >/dev/null 2>/dev/null & +cp -r /usr/bin $mpoint/2 >/dev/null 2>/dev/null & +sync & + +aux wait_for_sync $vg $lv1 +aux delay_dev "$dev2" 0 200 + +# Reshape it to 15 data stripes +lvconvert --yes --stripes 15 $vg/$lv1 +check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" +check lv_first_seg_field $vg/$lv1 stripesize "64.00k" +check lv_first_seg_field $vg/$lv1 data_stripes 15 +check lv_first_seg_field $vg/$lv1 stripes 16 + +# Reload table during reshape to test for data corruption +for i in {0..5} +do + dmsetup table $vg-$lv1|dmsetup load $vg-$lv1 + dmsetup suspend --noflush $vg-$lv1 + dmsetup resume $vg-$lv1 + sleep 0.3 +done + +aux delay_dev "$dev2" 0 + +kill -9 %% +wait + +umount $mpoint +[ -d $mpoint ] && rmdir $mpoint + +fsck -fn "$DM_DEV_DIR/$vg/$lv1" + +vgremove -ff $vg diff --git a/test/shell/lvconvert-raid-reshape-stripes-load.sh b/test/shell/lvconvert-raid-reshape-stripes-load.sh new file mode 100644 index 0000000..53bba2e --- /dev/null +++ b/test/shell/lvconvert-raid-reshape-stripes-load.sh @@ -0,0 +1,72 @@ +#!/usr/bin/env bash + +# Copyright (C) 2017 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, MA2110-1301 USA + +SKIP_WITH_LVMLOCKD=1 +SKIP_WITH_LVMPOLLD=1 + +LVM_SKIP_LARGE_TESTS=1 + +. lib/inittest + +# Test reshaping under io load + +which mkfs.ext4 || skip +aux have_raid 1 13 1 || skip + +mpoint=/tmp/mpoint.$$ + +trap "[ -d $mpoint ] && rmdir $mpoint" 1 2 3 15 + +aux prepare_pvs 16 32 + +get_devs + +vgcreate -s 1M "$vg" "${DEVICES[@]}" + +# Create 13-way striped raid5 (14 legs total) +lvcreate --yes --type raid5_ls --stripesize 64K --stripes 10 -L200M -n$lv1 $vg +check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" +check lv_first_seg_field $vg/$lv1 stripesize "64.00k" +check lv_first_seg_field $vg/$lv1 data_stripes 10 +check lv_first_seg_field $vg/$lv1 stripes 11 +echo y|mkfs -t ext4 /dev/$vg/$lv1 + +mkdir -p $mpoint +mount "$DM_DEV_DIR/$vg/$lv1" $mpoint +mkdir -p $mpoint/1 $mpoint/2 + + +echo 3 >/proc/sys/vm/drop_caches +cp -r /usr/bin $mpoint/1 >/dev/null 2>/dev/null & +cp -r /usr/bin $mpoint/2 >/dev/null 2>/dev/null & +sync & + +aux wait_for_sync $vg $lv1 +aux delay_dev "$dev2" 0 100 + +# Reshape it to 15 data stripes +lvconvert --yes --stripes 15 $vg/$lv1 +aux delay_dev "$dev2" 0 0 +check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" +check lv_first_seg_field $vg/$lv1 stripesize "64.00k" +check lv_first_seg_field $vg/$lv1 data_stripes 15 +check lv_first_seg_field $vg/$lv1 stripes 16 + +kill -9 %% +wait + +umount $mpoint +[ -d $mpoint ] && rmdir $mpoint + +fsck -fn "$DM_DEV_DIR/$vg/$lv1" + +vgremove -ff $vg diff --git a/test/shell/lvconvert-raid0_to_raid10.sh b/test/shell/lvconvert-raid0_to_raid10.sh new file mode 100644 index 0000000..d1e1fa0 --- /dev/null +++ b/test/shell/lvconvert-raid0_to_raid10.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +# Copyright (C) 2017 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_LVMLOCKD=1 +SKIP_WITH_LVMPOLLD=1 + +. lib/inittest + +# rhbz1514500 + +aux have_raid 1 12 0 || skip + +# 8 PVs needed for RAID10 testing (4-stripes/2-mirror) +aux prepare_pvs 8 64 +get_devs +vgcreate -s 256k "$vg" "${DEVICES[@]}" + +lvcreate -y --ty raid0 -R32.00k -i 4 -n $lv1 -L 64M $vg +lvcreate -y -i4 -l4 -n $lv2 $vg +lvextend -y -l +4 $vg/$lv1 +lvconvert -y -R512K --ty raid10 $vg/$lv1 + +vgremove -ff $vg

1 0

master - format_text: Round size written up to multiple of 4096.
by Alasdair Kergon 12 Dec '17

12 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3edc25dbdfc5d8d5ba109… Commit: 3edc25dbdfc5d8d5ba109921dae87c5415a0b460 Parent: 78ffa44fc58fba6f4e8d2046798783d7f4f11b41 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Tue Dec 12 22:52:22 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Tue Dec 12 22:52:22 2017 +0000 format_text: Round size written up to multiple of 4096. Zero-fill metadata up to the next 4096 boundary then write out a multiple of 4096 bytes to avoid triggering a read-modify-write. --- WHATS_NEW | 1 + lib/format_text/export.c | 8 +++++++- lib/format_text/format-text.c | 34 +++++++++++++++++++++++++--------- lib/format_text/layout.h | 1 + 4 files changed, 34 insertions(+), 10 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index f871377..5fc4cd3 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.177 - ==================================== + When writing text metadata content, use complete 4096 byte blocks. Change text format metadata alignment from 512 to 4096 bytes. When writing metadata, consistently skip mdas marked as failed. Refactor and adjust text format metadata alignment calculation. diff --git a/lib/format_text/export.c b/lib/format_text/export.c index e535237..1bcaf83 100644 --- a/lib/format_text/export.c +++ b/lib/format_text/export.c @@ -23,6 +23,7 @@ #include "lvm-version.h" #include "toolcontext.h" #include "config-util.h" +#include "layout.h" #include <stdarg.h> #include <time.h> @@ -1079,7 +1080,12 @@ size_t text_vg_export_raw(struct volume_group *vg, const char *desc, char **buf) goto_out; } - r = f->data.buf.used + 1; + f->data.buf.used += 1; /* Terminating NUL */ + + /* Zero fill up to next alignment boundary */ + memset(f->data.buf.start + f->data.buf.used, 0, MDA_ALIGNMENT - f->data.buf.used % MDA_ALIGNMENT); + + r = f->data.buf.used; *buf = f->data.buf.start; out: diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index ea31a2f..1aa91c7 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -704,11 +704,12 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, struct mda_header *mdah; struct pv_list *pvl; int r = 0; - uint64_t new_wrap; /* Number of bytes of new metadata that wrap around to start of buffer */ + uint64_t new_wrap = 0; /* Number of bytes of new metadata that wrap around to start of buffer */ uint64_t alignment = MDA_ALIGNMENT; int found = 0; int noprecommit = 0; const char *old_vg_name = NULL; + uint64_t new_size_rounded; /* Ignore any mda on a PV outside the VG. vgsplit relies on this */ dm_list_iterate_items(pvl, &vg->pvs) { @@ -735,6 +736,7 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, if (!(mdah = raw_read_mda_header(fid->fmt, &mdac->area, mda_is_primary(mda)))) goto_out; + /* Following space is zero-filled up to the next MDA_ALIGNMENT boundary */ if (!fidtc->raw_metadata_buf && !(fidtc->raw_metadata_buf_size = text_vg_export_raw(vg, "", &fidtc->raw_metadata_buf))) { @@ -775,19 +777,33 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, vg->name, dev_name(mdac->area.dev), mdac->rlocn.size, mdah->size - MDA_HEADER_SIZE, rlocn ? rlocn->size : 0); goto out; } + + new_size_rounded = mdac->rlocn.size; + } else { + /* Round up to a multiple of the new alignment */ + if (mdac->rlocn.offset + new_size_rounded < mdah->size) + new_size_rounded = (mdac->rlocn.size | (alignment - 1)) + 1; + else + new_size_rounded = mdac->rlocn.size; } - log_debug_metadata("Writing %s metadata to %s at " FMTu64 " len " FMTu64 " of " FMTu64 " aligned to " FMTu64, + log_debug_metadata("Writing %s metadata to %s at " FMTu64 " len " FMTu64 " (rounded to " FMTu64 ") of " FMTu64 " aligned to " FMTu64, vg->name, dev_name(mdac->area.dev), mdac->area.start + - mdac->rlocn.offset, mdac->rlocn.size - new_wrap, mdac->rlocn.size, alignment); + mdac->rlocn.offset, mdac->rlocn.size - new_wrap, new_size_rounded, mdac->rlocn.size, alignment); - /* Write text out, circularly */ - if (!dev_write(mdac->area.dev, mdac->area.start + mdac->rlocn.offset, - (size_t) (mdac->rlocn.size - new_wrap), MDA_CONTENT_REASON(mda_is_primary(mda)), - fidtc->raw_metadata_buf)) - goto_out; + if (!new_wrap) { + /* Write text out, in alignment-sized blocks */ + if (!dev_write(mdac->area.dev, mdac->area.start + mdac->rlocn.offset, + (size_t) new_size_rounded, MDA_CONTENT_REASON(mda_is_primary(mda)), + fidtc->raw_metadata_buf)) + goto_out; + } else { + /* Write text out, circularly */ + if (!dev_write(mdac->area.dev, mdac->area.start + mdac->rlocn.offset, + (size_t) (mdac->rlocn.size - new_wrap), MDA_CONTENT_REASON(mda_is_primary(mda)), + fidtc->raw_metadata_buf)) + goto_out; - if (new_wrap) { log_debug_metadata("Writing wrapped metadata to %s at " FMTu64 " len " FMTu64 " of " FMTu64, dev_name(mdac->area.dev), mdac->area.start + MDA_HEADER_SIZE, new_wrap, mdac->rlocn.size); diff --git a/lib/format_text/layout.h b/lib/format_text/layout.h index 1eed664..bc25597 100644 --- a/lib/format_text/layout.h +++ b/lib/format_text/layout.h @@ -17,6 +17,7 @@ #define _LVM_TEXT_LAYOUT_H #include "config.h" +#include "format-text.h" #include "metadata.h" #include "lvmcache.h" #include "uuid.h"

1 0

master - format_text: Change metadata alignment from 512 to 4096.
by Alasdair Kergon 12 Dec '17

12 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=78ffa44fc58fba6f4e8d2… Commit: 78ffa44fc58fba6f4e8d2046798783d7f4f11b41 Parent: 643df602c7d199c15ba27958e51e61b822a14755 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Tue Dec 12 20:57:36 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Tue Dec 12 20:57:36 2017 +0000 format_text: Change metadata alignment from 512 to 4096. If there is sufficient space in the metadata area, align the next metadata to a disk offset that is a multiple of 4096 bytes and don't write it circularly. If it doesn't all fit at the end of the metadata area, go back to the start and write it all there contiguously. If there is insufficient space to use the new stricter rules, revert to the original behaviour, aligning on 512-byte boundaries wrapping around the circular buffer as required. --- WHATS_NEW | 1 + lib/format_text/format-text.c | 70 ++++++++++++++++++++++++++++++++--------- lib/format_text/layout.h | 1 + 3 files changed, 57 insertions(+), 15 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index f6ead67..f871377 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.177 - ==================================== + Change text format metadata alignment from 512 to 4096 bytes. When writing metadata, consistently skip mdas marked as failed. Refactor and adjust text format metadata alignment calculation. Fix python3 path in lvmdbusd to use value detected by configure. diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 0c5dd1b..ea31a2f 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -488,7 +488,7 @@ static uint64_t _next_rlocn_offset(struct raw_locn *rlocn, struct mda_header *md if (!rlocn) /* Find an empty slot */ /* FIXME Assumes only one VG per mdah for now */ - return alignment; + return ALIGN_ABSOLUTE(MDA_HEADER_SIZE, mdac_area_start, alignment); /* First find the end of the old metadata */ old_end = rlocn->offset + rlocn->size; @@ -501,10 +501,21 @@ static uint64_t _next_rlocn_offset(struct raw_locn *rlocn, struct mda_header *md /* Calculate new start position relative to start of buffer rounded up to absolute alignment */ new_start_offset = ALIGN_ABSOLUTE(old_end, mdac_area_start, alignment); - /* If new location is beyond the end of the buffer, wrap around back to start of circular buffer */ - if (new_start_offset >= mdah->size) - new_start_offset -= (mdah->size - MDA_HEADER_SIZE); + /* If new location is beyond the end of the buffer, return to start of circular buffer and realign */ + if (new_start_offset >= mdah->size) { + /* If the start of the buffer is occupied, move past it */ + if (old_wrapped || rlocn->offset == MDA_HEADER_SIZE) + new_start_offset = old_end; + else + new_start_offset = MDA_HEADER_SIZE; + + new_start_offset = ALIGN_ABSOLUTE(new_start_offset, mdac_area_start, alignment); + } + /* + * Note that we don't check here that this location isn't inside the existing metadata. + * If it is, then it means this value of alignment cannot be used. + */ return new_start_offset; } @@ -640,6 +651,15 @@ static int _metadata_fits_into_buffer(struct mda_context *mdac, struct mda_heade uint64_t old_start = 0; /* The start of the existing metadata */ uint64_t new_start = mdac->rlocn.offset; /* The proposed start of the new metadata */ + /* + * If the (aligned) start of the new metadata is already beyond the end + * of the buffer this means it didn't fit with the given alignment. + * (The caller has already tried to wrap it back to the start + * of the buffer but the alignment pushed it back outside.) + */ + if (new_start >= mdah->size) + return_0; + /* Does the total amount of metadata, old and new, fit inside the buffer? */ if (MDA_HEADER_SIZE + (rlocn ? rlocn->size : 0) + mdac->rlocn.size >= mdah->size) return_0; @@ -654,7 +674,7 @@ static int _metadata_fits_into_buffer(struct mda_context *mdac, struct mda_heade old_wrap = old_end - mdah->size; } - new_end = new_wrap ? new_wrap + MDA_HEADER_SIZE : (mdac->rlocn.offset + mdac->rlocn.size); + new_end = new_wrap ? new_wrap + MDA_HEADER_SIZE : new_start + mdac->rlocn.size; /* If both wrap around, there's necessarily overlap */ if (new_wrap && old_wrap) @@ -668,6 +688,10 @@ static int _metadata_fits_into_buffer(struct mda_context *mdac, struct mda_heade if ((new_wrap || old_wrap) && (new_end > old_start)) return_0; + /* If there's no wrap, check there's no overlap */ + if (!new_wrap && !old_wrap && (old_end > new_start) && (old_start < new_end)) + return_0; + return 1; } @@ -681,7 +705,7 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, struct pv_list *pvl; int r = 0; uint64_t new_wrap; /* Number of bytes of new metadata that wrap around to start of buffer */ - uint64_t alignment = MDA_ORIGINAL_ALIGNMENT; + uint64_t alignment = MDA_ALIGNMENT; int found = 0; int noprecommit = 0; const char *old_vg_name = NULL; @@ -725,16 +749,32 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, /* Find where the new metadata would be written with our preferred alignment */ mdac->rlocn.offset = _next_rlocn_offset(rlocn, mdah, mdac->area.start, alignment); - /* Does the new metadata wrap around? */ + /* If metadata extends beyond the buffer, return to the start instead of wrapping it */ if (mdac->rlocn.offset + mdac->rlocn.size > mdah->size) - new_wrap = (mdac->rlocn.offset + mdac->rlocn.size) - mdah->size; - else - new_wrap = 0; + mdac->rlocn.offset = ALIGN_ABSOLUTE(MDA_HEADER_SIZE, mdac->area.start, alignment); - if (!_metadata_fits_into_buffer(mdac, mdah, rlocn, new_wrap)) { - log_error("VG %s metadata on %s (" FMTu64 " bytes) too large for circular buffer (" FMTu64 " bytes with " FMTu64 " used)", - vg->name, dev_name(mdac->area.dev), mdac->rlocn.size, mdah->size - MDA_HEADER_SIZE, rlocn ? rlocn->size : 0); - goto out; + /* + * If the metadata doesn't fit into the buffer correctly with these + * settings, fall back to the 512-byte alignment used by the original + * LVM2 code and allow the metadata to be split into two parts, + * wrapping around from the end of the circular buffer back to the + * beginning. + */ + if (!_metadata_fits_into_buffer(mdac, mdah, rlocn, 0)) { + alignment = MDA_ORIGINAL_ALIGNMENT; + mdac->rlocn.offset = _next_rlocn_offset(rlocn, mdah, mdac->area.start, alignment); + + /* Does the new metadata wrap around? */ + if (mdac->rlocn.offset + mdac->rlocn.size > mdah->size) + new_wrap = (mdac->rlocn.offset + mdac->rlocn.size) - mdah->size; + else + new_wrap = 0; + + if (!_metadata_fits_into_buffer(mdac, mdah, rlocn, new_wrap)) { + log_error("VG %s metadata on %s (" FMTu64 " bytes) too large for circular buffer (" FMTu64 " bytes with " FMTu64 " used)", + vg->name, dev_name(mdac->area.dev), mdac->rlocn.size, mdah->size - MDA_HEADER_SIZE, rlocn ? rlocn->size : 0); + goto out; + } } log_debug_metadata("Writing %s metadata to %s at " FMTu64 " len " FMTu64 " of " FMTu64 " aligned to " FMTu64, @@ -1323,7 +1363,7 @@ int vgname_from_mda(const struct format_type *fmt, (char *)&vgsummary->vgid); if (mda_free_sectors) { - current_usage = ALIGN_ABSOLUTE(rlocn->size, dev_area->start + rlocn->offset, MDA_ORIGINAL_ALIGNMENT); + current_usage = ALIGN_ABSOLUTE(rlocn->size, dev_area->start + rlocn->offset, MDA_ALIGNMENT); buffer_size = mdah->size - MDA_HEADER_SIZE; diff --git a/lib/format_text/layout.h b/lib/format_text/layout.h index 1746b9c..1eed664 100644 --- a/lib/format_text/layout.h +++ b/lib/format_text/layout.h @@ -103,6 +103,7 @@ struct mda_context { #define LVM2_LABEL "LVM2 001" #define MDA_SIZE_MIN (8 * (unsigned) lvm_getpagesize()) #define MDA_ORIGINAL_ALIGNMENT 512 /* Original alignment used for start of VG metadata content */ +#define MDA_ALIGNMENT 4096 /* Default alignment in bytes since 2.02.177 for start of VG metadata content. */ int vgname_from_mda(const struct format_type *fmt, struct mda_header *mdah, int primary_mda, struct device_area *dev_area, struct lvmcache_vgsummary *vgsummary,

1 0

master - format_text: More refactoring of metadata offset calcs
by Alasdair Kergon 12 Dec '17

12 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=643df602c7d199c15ba27… Commit: 643df602c7d199c15ba27958e51e61b822a14755 Parent: 4002f5e206ae89db28eb60bdfb3685bd926fed57 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Tue Dec 12 18:46:25 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Tue Dec 12 18:51:32 2017 +0000 format_text: More refactoring of metadata offset calcs --- lib/format_text/format-text.c | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 174a579..0c5dd1b 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -482,15 +482,24 @@ static struct raw_locn *_find_vg_rlocn(struct device_area *dev_area, */ static uint64_t _next_rlocn_offset(struct raw_locn *rlocn, struct mda_header *mdah, uint64_t mdac_area_start, uint64_t alignment) { - uint64_t new_start_offset; + uint64_t old_end, new_start_offset; + int old_wrapped = 0; /* Does the old metadata wrap around? */ if (!rlocn) /* Find an empty slot */ /* FIXME Assumes only one VG per mdah for now */ return alignment; + /* First find the end of the old metadata */ + old_end = rlocn->offset + rlocn->size; + + if (old_end > mdah->size) { + old_wrapped = 1; + old_end -= (mdah->size - MDA_HEADER_SIZE); + } + /* Calculate new start position relative to start of buffer rounded up to absolute alignment */ - new_start_offset = ALIGN_ABSOLUTE(rlocn->offset + rlocn->size, mdac_area_start, alignment); + new_start_offset = ALIGN_ABSOLUTE(old_end, mdac_area_start, alignment); /* If new location is beyond the end of the buffer, wrap around back to start of circular buffer */ if (new_start_offset >= mdah->size) @@ -626,16 +635,23 @@ static int _metadata_fits_into_buffer(struct mda_context *mdac, struct mda_heade struct raw_locn *rlocn, uint64_t new_wrap) { uint64_t old_wrap = 0; /* Amount of wrap around in existing metadata */ - uint64_t new_end; /* The end location of the new metadata */ + uint64_t old_end = 0; /* The (byte after the) end of the existing metadata */ + uint64_t new_end; /* The (byte after the) end of the new metadata */ + uint64_t old_start = 0; /* The start of the existing metadata */ + uint64_t new_start = mdac->rlocn.offset; /* The proposed start of the new metadata */ /* Does the total amount of metadata, old and new, fit inside the buffer? */ if (MDA_HEADER_SIZE + (rlocn ? rlocn->size : 0) + mdac->rlocn.size >= mdah->size) return_0; - /* Does the existing metadata wrap around the end of the buffer? */ + /* If there's existing metadata, set old_start, old_end and old_wrap. */ if (rlocn) { - if (rlocn->offset + rlocn->size > mdah->size) - old_wrap = (rlocn->offset + rlocn->size) - mdah->size; + old_start = rlocn->offset; + old_end = old_start + rlocn->size; + + /* Does the existing metadata wrap around the end of the buffer? */ + if (old_end > mdah->size) + old_wrap = old_end - mdah->size; } new_end = new_wrap ? new_wrap + MDA_HEADER_SIZE : (mdac->rlocn.offset + mdac->rlocn.size); @@ -649,7 +665,7 @@ static int _metadata_fits_into_buffer(struct mda_context *mdac, struct mda_heade return 1; /* If either wraps around, there's overlap if the new end falls beyond the old start */ - if ((new_wrap || old_wrap) && (new_end > rlocn->offset)) + if ((new_wrap || old_wrap) && (new_end > old_start)) return_0; return 1;

1 0

master - format_text: Refactor and document metadata offset calculation.
by Alasdair Kergon 12 Dec '17

12 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4002f5e206ae89db28eb6… Commit: 4002f5e206ae89db28eb60bdfb3685bd926fed57 Parent: e932c5da50a22e585a3cd08edb3d849e7715e244 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Tue Dec 12 18:36:54 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Tue Dec 12 18:36:54 2017 +0000 format_text: Refactor and document metadata offset calculation. --- lib/format_text/format-text.c | 47 +++++++++++++++++++++++++++------------- 1 files changed, 32 insertions(+), 15 deletions(-) diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 154d748..174a579 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -476,7 +476,9 @@ static struct raw_locn *_find_vg_rlocn(struct device_area *dev_area, } /* - * Determine offset for uncommitted metadata + * Find first aligned offset after end of existing metadata. + * Based on the alignment provided, this is the exact offset to use for the new metadata. + * The caller is responsible for validating the result. */ static uint64_t _next_rlocn_offset(struct raw_locn *rlocn, struct mda_header *mdah, uint64_t mdac_area_start, uint64_t alignment) { @@ -484,7 +486,7 @@ static uint64_t _next_rlocn_offset(struct raw_locn *rlocn, struct mda_header *md if (!rlocn) /* Find an empty slot */ - /* FIXME Assume only one VG per mdah for now */ + /* FIXME Assumes only one VG per mdah for now */ return alignment; /* Calculate new start position relative to start of buffer rounded up to absolute alignment */ @@ -626,23 +628,28 @@ static int _metadata_fits_into_buffer(struct mda_context *mdac, struct mda_heade uint64_t old_wrap = 0; /* Amount of wrap around in existing metadata */ uint64_t new_end; /* The end location of the new metadata */ - /* Do we have existing metadata that ends beyond the end of the buffer? */ - if (rlocn && (rlocn->offset + rlocn->size > mdah->size)) - old_wrap = (rlocn->offset + rlocn->size) - mdah->size; + /* Does the total amount of metadata, old and new, fit inside the buffer? */ + if (MDA_HEADER_SIZE + (rlocn ? rlocn->size : 0) + mdac->rlocn.size >= mdah->size) + return_0; - new_end = new_wrap ? new_wrap + MDA_HEADER_SIZE : - mdac->rlocn.offset + mdac->rlocn.size; + /* Does the existing metadata wrap around the end of the buffer? */ + if (rlocn) { + if (rlocn->offset + rlocn->size > mdah->size) + old_wrap = (rlocn->offset + rlocn->size) - mdah->size; + } + + new_end = new_wrap ? new_wrap + MDA_HEADER_SIZE : (mdac->rlocn.offset + mdac->rlocn.size); /* If both wrap around, there's necessarily overlap */ if (new_wrap && old_wrap) return_0; - /* If either wraps around, does the new end fall beyond the old start? */ - if (rlocn && (new_wrap || old_wrap) && (new_end > rlocn->offset)) - return_0; + /* If there's no existing metadata, we're OK */ + if (!rlocn) + return 1; - /* Does the total amount of metadata, old and new, fit inside the buffer? */ - if (MDA_HEADER_SIZE + (rlocn ? rlocn->size : 0) + mdac->rlocn.size >= mdah->size) + /* If either wraps around, there's overlap if the new end falls beyond the old start */ + if ((new_wrap || old_wrap) && (new_end > rlocn->offset)) return_0; return 1; @@ -658,6 +665,7 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, struct pv_list *pvl; int r = 0; uint64_t new_wrap; /* Number of bytes of new metadata that wrap around to start of buffer */ + uint64_t alignment = MDA_ORIGINAL_ALIGNMENT; int found = 0; int noprecommit = 0; const char *old_vg_name = NULL; @@ -675,6 +683,12 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, if (!found) return 1; + /* + * This is paired with the following closes: + * - at the end of this fn if returning 0 + * - in _vg_commit_raw_rlocn regardless of return code + * which handles commit (but not pre-commit) and revert. + */ if (!dev_open(mdac->area.dev)) return_0; @@ -692,8 +706,10 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, mdac->rlocn.size = fidtc->raw_metadata_buf_size; - mdac->rlocn.offset = _next_rlocn_offset(rlocn, mdah, mdac->area.start, MDA_ORIGINAL_ALIGNMENT); + /* Find where the new metadata would be written with our preferred alignment */ + mdac->rlocn.offset = _next_rlocn_offset(rlocn, mdah, mdac->area.start, alignment); + /* Does the new metadata wrap around? */ if (mdac->rlocn.offset + mdac->rlocn.size > mdah->size) new_wrap = (mdac->rlocn.offset + mdac->rlocn.size) - mdah->size; else @@ -705,9 +721,9 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, goto out; } - log_debug_metadata("Writing %s metadata to %s at " FMTu64 " len " FMTu64 " of " FMTu64, + log_debug_metadata("Writing %s metadata to %s at " FMTu64 " len " FMTu64 " of " FMTu64 " aligned to " FMTu64, vg->name, dev_name(mdac->area.dev), mdac->area.start + - mdac->rlocn.offset, mdac->rlocn.size - new_wrap, mdac->rlocn.size); + mdac->rlocn.offset, mdac->rlocn.size - new_wrap, mdac->rlocn.size, alignment); /* Write text out, circularly */ if (!dev_write(mdac->area.dev, mdac->area.start + mdac->rlocn.offset, @@ -837,6 +853,7 @@ static int _vg_commit_raw_rlocn(struct format_instance *fid, out: if (!precommit) { + /* This is an paired with the open at the start of _vg_write_raw */ if (!dev_close(mdac->area.dev)) stack;

1 0

master - device: Fix an unpaired device close.
by Alasdair Kergon 12 Dec '17

12 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e932c5da50a22e585a3cd… Commit: e932c5da50a22e585a3cd08edb3d849e7715e244 Parent: b96862ee11e0291cc1101ff4e17e54f9fe8da666 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Tue Dec 12 17:56:58 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Tue Dec 12 17:56:58 2017 +0000 device: Fix an unpaired device close. dev_open_flags contains an unpaired dev_close_immediate so increment open_count before calling it. --- lib/device/dev-io.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c index dc9ad13..c321e61 100644 --- a/lib/device/dev-io.c +++ b/lib/device/dev-io.c @@ -491,11 +491,12 @@ int dev_open_flags(struct device *dev, int flags, int direct, int quiet) return 1; } - if (dev->open_count && !need_excl) { + if (dev->open_count && !need_excl) log_debug_devs("%s: Already opened read-only. Upgrading " "to read-write.", dev_name(dev)); - dev->open_count++; - } + + /* dev_close_immediate will decrement this */ + dev->open_count++; dev_close_immediate(dev); // FIXME: dev with DEV_ALLOCED is released

1 0

master - metadata: Consistently skip metadata areas that failed.
by Alasdair Kergon 12 Dec '17

12 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b96862ee11e0291cc1101… Commit: b96862ee11e0291cc1101ff4e17e54f9fe8da666 Parent: 15ccea71116f4c0a587aaa0ed25dc1d8d98c0c7f Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Tue Dec 12 17:49:35 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Tue Dec 12 17:52:45 2017 +0000 metadata: Consistently skip metadata areas that failed. Even after writing some metadata encountered problems, some commands continue (rightly or wrongly) and attempt to make further changes. Once an mda is marked MDA_FAILED, don't try to use it again. This also applies when reverting, where one loop already skips failed mdas but the other doesn't. This fixes some device open_count warnings on relevant failure paths. --- WHATS_NEW | 1 + lib/metadata/metadata.c | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 9ff8b51..f6ead67 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.177 - ==================================== + When writing metadata, consistently skip mdas marked as failed. Refactor and adjust text format metadata alignment calculation. Fix python3 path in lvmdbusd to use value detected by configure. Reduce checks for active LVs in vgchange before background polling. diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 56b5b13..6c55d89 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -3039,6 +3039,8 @@ int vg_write(struct volume_group *vg) /* Write to each copy of the metadata area */ dm_list_iterate_items(mda, &vg->fid->metadata_areas_in_use) { + if (mda->status & MDA_FAILED) + continue; if (!mda->ops->vg_write) { log_error("Format does not support writing volume" "group metadata areas"); @@ -3063,6 +3065,9 @@ int vg_write(struct volume_group *vg) dm_list_uniterate(mdah, &vg->fid->metadata_areas_in_use, &mda->list) { mda = dm_list_item(mdah, struct metadata_area); + if (mda->status & MDA_FAILED) + continue; + if (mda->ops->vg_revert && !mda->ops->vg_revert(vg->fid, vg, mda)) { stack;

1 0

master - test: Fix condition when detecting lvmdbusd
by Marian Csontos 12 Dec '17

12 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=15ccea71116f4c0a587aa… Commit: 15ccea71116f4c0a587aaa0ed25dc1d8d98c0c7f Parent: c5ef76bf27337406d48990acbfdaa869fd30f47b Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Tue Dec 12 14:18:27 2017 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Tue Dec 12 14:19:22 2017 +0100 test: Fix condition when detecting lvmdbusd --- test/lib/aux.sh | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index a436f84..6bc7bd4 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -324,10 +324,13 @@ prepare_lvmdbusd() { echo ok # skip if we don't have our own lvmdbusd... + echo -n "## find lvmdbusd to use..." if test -z "${installed_testsuite+varset}"; then # NOTE: this is always present - additional checks are needed: daemon="$abs_top_builddir/daemons/lvmdbusd/lvmdbusd" - if ! test -x "$daemon" && chmod ugo+x "$daemon"; then + if test -x "$daemon" || chmod ugo+x "$daemon"; then + echo "$daemon" + else echo "Failed to make '$daemon' executable">&2 return 1 fi @@ -335,6 +338,7 @@ prepare_lvmdbusd() { export PYTHONPATH="$abs_top_builddir/daemons" else daemon=$(which lvmdbusd || :) + echo "$daemon" fi test -x "$daemon" || skip "The lvmdbusd daemon is missing" which python3 >/dev/null || skip "Missing python3"

1 0

master - device: Internal error if writing 0 bytes to dev.
by Alasdair Kergon 12 Dec '17

12 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c5ef76bf27337406d4899… Commit: c5ef76bf27337406d48990acbfdaa869fd30f47b Parent: 7272fd221096dbfd07e7ad11f0c938b453de2904 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Tue Dec 12 12:57:25 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Tue Dec 12 12:57:25 2017 +0000 device: Internal error if writing 0 bytes to dev. --- lib/device/dev-io.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c index a9a9aac..dc9ad13 100644 --- a/lib/device/dev-io.c +++ b/lib/device/dev-io.c @@ -804,6 +804,11 @@ int dev_write(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t r if (!_dev_is_valid(dev)) return 0; + if (!len) { + log_error(INTERNAL_ERROR "Attempted to write 0 bytes to %s at " FMTu64, dev_name(dev), offset); + return 0; + } + where.dev = dev; where.start = offset; where.size = len;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits December 2017