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 19 Dec '17

19 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 13 Dec '17

13 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

master - lvmdbusd: All tools use detected python3
by Marian Csontos 12 Dec '17

12 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7272fd221096dbfd07e7a… Commit: 7272fd221096dbfd07e7ad11f0c938b453de2904 Parent: 2f4c2a43d49d90875ea31b1507cd0dfcdb049e88 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Tue Dec 12 13:10:51 2017 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Tue Dec 12 13:17:07 2017 +0100 lvmdbusd: All tools use detected python3 - lvmdb.py and lvm_shell_proxy.py can be used as standalone tools, so should use detected value. - clean executable bit on *.in files. --- configure | 4 +- configure.in | 2 + daemons/lvmdbusd/.gitignore | 2 + daemons/lvmdbusd/lvm_shell_proxy.py | 269 ---------------- daemons/lvmdbusd/lvm_shell_proxy.py.in | 269 ++++++++++++++++ daemons/lvmdbusd/lvmdb.py | 540 -------------------------------- daemons/lvmdbusd/lvmdb.py.in | 540 ++++++++++++++++++++++++++++++++ 7 files changed, 816 insertions(+), 810 deletions(-) diff --git a/configure b/configure index 7e2969a..d04b9d3 100755 --- a/configure +++ b/configure @@ -15778,7 +15778,7 @@ _ACEOF ################################################################################ -ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile include/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile lib/cache_segtype/Makefile libdaemon/Makefile libdaem on/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service script s/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile" +ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/lvmdb.py daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile include/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/ Makefile lib/cache_segtype/Makefile libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_h at.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16489,6 +16489,8 @@ do "daemons/dmfilemapd/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmfilemapd/Makefile" ;; "daemons/lvmdbusd/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/Makefile" ;; "daemons/lvmdbusd/lvmdbusd") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/lvmdbusd" ;; + "daemons/lvmdbusd/lvmdb.py") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/lvmdb.py" ;; + "daemons/lvmdbusd/lvm_shell_proxy.py") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/lvm_shell_proxy.py" ;; "daemons/lvmdbusd/path.py") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/path.py" ;; "daemons/lvmetad/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/lvmetad/Makefile" ;; "daemons/lvmpolld/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/lvmpolld/Makefile" ;; diff --git a/configure.in b/configure.in index 88ee5ad..d879408 100644 --- a/configure.in +++ b/configure.in @@ -2187,6 +2187,8 @@ daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd +daemons/lvmdbusd/lvmdb.py +daemons/lvmdbusd/lvm_shell_proxy.py daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile diff --git a/daemons/lvmdbusd/.gitignore b/daemons/lvmdbusd/.gitignore index c0f6b4e..a5a5dd3 100644 --- a/daemons/lvmdbusd/.gitignore +++ b/daemons/lvmdbusd/.gitignore @@ -1,2 +1,4 @@ path.py lvmdbusd +lvmdb.py +lvm_shell_proxy.py diff --git a/daemons/lvmdbusd/lvm_shell_proxy.py b/daemons/lvmdbusd/lvm_shell_proxy.py deleted file mode 100755 index a26dd70..0000000 --- a/daemons/lvmdbusd/lvm_shell_proxy.py +++ /dev/null @@ -1,269 +0,0 @@ -#!/usr/bin/env python3 - -# Copyright (C) 2015-2016 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, see <http://www.gnu.org/licenses/>. -# -# Copyright 2015-2016, Vratislav Podzimek <vpodzime(a)redhat.com> - -import subprocess -import shlex -from fcntl import fcntl, F_GETFL, F_SETFL -import os -import traceback -import sys -import tempfile -import time -import select -import copy - -try: - import simplejson as json -except ImportError: - import json - - -from lvmdbusd.cfg import LVM_CMD -from lvmdbusd.utils import log_debug, log_error, add_no_notify - -SHELL_PROMPT = "lvm> " - - -def _quote_arg(arg): - if len(shlex.split(arg)) > 1: - return '"%s"' % arg - else: - return arg - - -class LVMShellProxy(object): - - @staticmethod - def _read(stream): - tmp = stream.read() - if tmp: - return tmp.decode("utf-8") - return '' - - # Read until we get prompt back and a result - # @param: no_output Caller expects no output to report FD - # Returns stdout, report, stderr (report is JSON!) - def _read_until_prompt(self, no_output=False): - stdout = "" - report = "" - stderr = "" - keep_reading = True - extra_passes = 3 - report_json = {} - prev_report_len = 0 - - # Try reading from all FDs to prevent one from filling up and causing - # a hang. Keep reading until we get the prompt back and the report - # FD does not contain valid JSON - while keep_reading: - try: - rd_fd = [ - self.lvm_shell.stdout.fileno(), - self.report_stream.fileno(), - self.lvm_shell.stderr.fileno()] - ready = select.select(rd_fd, [], [], 2) - - for r in ready[0]: - if r == self.lvm_shell.stdout.fileno(): - stdout += LVMShellProxy._read(self.lvm_shell.stdout) - elif r == self.report_stream.fileno(): - report += LVMShellProxy._read(self.report_stream) - elif r == self.lvm_shell.stderr.fileno(): - stderr += LVMShellProxy._read(self.lvm_shell.stderr) - - # Check to see if the lvm process died on us - if self.lvm_shell.poll(): - raise Exception(self.lvm_shell.returncode, "%s" % stderr) - - if stdout.endswith(SHELL_PROMPT): - if no_output: - keep_reading = False - else: - cur_report_len = len(report) - if cur_report_len != 0: - # Only bother to parse if we have more data - if prev_report_len != cur_report_len: - prev_report_len = cur_report_len - # Parse the JSON if it's good we are done, - # if not we will try to read some more. - try: - report_json = json.loads(report) - keep_reading = False - except ValueError: - pass - - if keep_reading: - extra_passes -= 1 - if extra_passes <= 0: - if len(report): - raise ValueError("Invalid json: %s" % - report) - else: - raise ValueError( - "lvm returned no JSON output!") - - except IOError as ioe: - log_debug(str(ioe)) - pass - - return stdout, report_json, stderr - - def _write_cmd(self, cmd): - cmd_bytes = bytes(cmd, "utf-8") - num_written = self.lvm_shell.stdin.write(cmd_bytes) - assert (num_written == len(cmd_bytes)) - self.lvm_shell.stdin.flush() - - @staticmethod - def _make_non_block(stream): - flags = fcntl(stream, F_GETFL) - fcntl(stream, F_SETFL, flags | os.O_NONBLOCK) - - def __init__(self): - - # Create a temp directory - tmp_dir = tempfile.mkdtemp(prefix="lvmdbus_") - tmp_file = "%s/lvmdbus_report" % (tmp_dir) - - try: - # Lets create fifo for the report output - os.mkfifo(tmp_file, 0o600) - except FileExistsError: - pass - - # We have to open non-blocking as the other side isn't open until - # we actually fork the process. - self.report_fd = os.open(tmp_file, os.O_NONBLOCK) - self.report_stream = os.fdopen(self.report_fd, 'rb', 0) - - # Setup the environment for using our own socket for reporting - local_env = copy.deepcopy(os.environ) - local_env["LVM_REPORT_FD"] = "32" - local_env["LVM_COMMAND_PROFILE"] = "lvmdbusd" - - # Disable the abort logic if lvm logs too much, which easily happens - # when utilizing the lvm shell. - local_env["LVM_LOG_FILE_MAX_LINES"] = "0" - - # run the lvm shell - self.lvm_shell = subprocess.Popen( - [LVM_CMD + " 32>%s" % tmp_file], - stdin=subprocess.PIPE, stdout=subprocess.PIPE, env=local_env, - stderr=subprocess.PIPE, close_fds=True, shell=True) - - try: - LVMShellProxy._make_non_block(self.lvm_shell.stdout) - LVMShellProxy._make_non_block(self.lvm_shell.stderr) - - # wait for the first prompt - errors = self._read_until_prompt(no_output=True)[2] - if errors and len(errors): - raise RuntimeError(errors) - except: - raise - finally: - # These will get deleted when the FD count goes to zero so we - # can be sure to clean up correctly no matter how we finish - os.unlink(tmp_file) - os.rmdir(tmp_dir) - - def get_error_msg(self): - # We got an error, lets go fetch the error message - self._write_cmd('lastlog\n') - - # read everything from the STDOUT to the next prompt - stdout, report_json, stderr = self._read_until_prompt() - if 'log' in report_json: - error_msg = "" - # Walk the entire log array and build an error string - for log_entry in report_json['log']: - if log_entry['log_type'] == "error": - if error_msg: - error_msg += ', ' + log_entry['log_message'] - else: - error_msg = log_entry['log_message'] - - return error_msg - - return 'No error reason provided! (missing "log" section)' - - def call_lvm(self, argv, debug=False): - rc = 1 - error_msg = "" - - if self.lvm_shell.poll(): - raise Exception( - self.lvm_shell.returncode, - "Underlying lvm shell process is not present!") - - argv = add_no_notify(argv) - - # create the command string - cmd = " ".join(_quote_arg(arg) for arg in argv) - cmd += "\n" - - # run the command by writing it to the shell's STDIN - self._write_cmd(cmd) - - # read everything from the STDOUT to the next prompt - stdout, report_json, stderr = self._read_until_prompt() - - # Parse the report to see what happened - if 'log' in report_json: - if report_json['log'][-1:][0]['log_ret_code'] == '1': - rc = 0 - else: - error_msg = self.get_error_msg() - - if debug or rc != 0: - log_error(('CMD: %s' % cmd)) - log_error(("EC = %d" % rc)) - log_error(("ERROR_MSG=\n %s\n" % error_msg)) - - return rc, report_json, error_msg - - def exit_shell(self): - try: - self._write_cmd('exit\n') - except Exception as e: - log_error(str(e)) - - def __del__(self): - try: - self.lvm_shell.terminate() - except: - pass - - -if __name__ == "__main__": - shell = LVMShellProxy() - in_line = "start" - try: - while in_line: - in_line = input("lvm> ") - if in_line: - start = time.time() - ret, out, err = shell.call_lvm(in_line.split()) - end = time.time() - - print(("RC: %d" % ret)) - print(("OUT:\n%s" % out)) - print(("ERR:\n%s" % err)) - - print("Command = %f seconds" % (end - start)) - except KeyboardInterrupt: - pass - except EOFError: - pass - except Exception: - traceback.print_exc(file=sys.stdout) diff --git a/daemons/lvmdbusd/lvm_shell_proxy.py.in b/daemons/lvmdbusd/lvm_shell_proxy.py.in new file mode 100644 index 0000000..203de6f --- /dev/null +++ b/daemons/lvmdbusd/lvm_shell_proxy.py.in @@ -0,0 +1,269 @@ +#!@PYTHON3@ + +# Copyright (C) 2015-2016 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, see <http://www.gnu.org/licenses/>. +# +# Copyright 2015-2016, Vratislav Podzimek <vpodzime(a)redhat.com> + +import subprocess +import shlex +from fcntl import fcntl, F_GETFL, F_SETFL +import os +import traceback +import sys +import tempfile +import time +import select +import copy + +try: + import simplejson as json +except ImportError: + import json + + +from lvmdbusd.cfg import LVM_CMD +from lvmdbusd.utils import log_debug, log_error, add_no_notify + +SHELL_PROMPT = "lvm> " + + +def _quote_arg(arg): + if len(shlex.split(arg)) > 1: + return '"%s"' % arg + else: + return arg + + +class LVMShellProxy(object): + + @staticmethod + def _read(stream): + tmp = stream.read() + if tmp: + return tmp.decode("utf-8") + return '' + + # Read until we get prompt back and a result + # @param: no_output Caller expects no output to report FD + # Returns stdout, report, stderr (report is JSON!) + def _read_until_prompt(self, no_output=False): + stdout = "" + report = "" + stderr = "" + keep_reading = True + extra_passes = 3 + report_json = {} + prev_report_len = 0 + + # Try reading from all FDs to prevent one from filling up and causing + # a hang. Keep reading until we get the prompt back and the report + # FD does not contain valid JSON + while keep_reading: + try: + rd_fd = [ + self.lvm_shell.stdout.fileno(), + self.report_stream.fileno(), + self.lvm_shell.stderr.fileno()] + ready = select.select(rd_fd, [], [], 2) + + for r in ready[0]: + if r == self.lvm_shell.stdout.fileno(): + stdout += LVMShellProxy._read(self.lvm_shell.stdout) + elif r == self.report_stream.fileno(): + report += LVMShellProxy._read(self.report_stream) + elif r == self.lvm_shell.stderr.fileno(): + stderr += LVMShellProxy._read(self.lvm_shell.stderr) + + # Check to see if the lvm process died on us + if self.lvm_shell.poll(): + raise Exception(self.lvm_shell.returncode, "%s" % stderr) + + if stdout.endswith(SHELL_PROMPT): + if no_output: + keep_reading = False + else: + cur_report_len = len(report) + if cur_report_len != 0: + # Only bother to parse if we have more data + if prev_report_len != cur_report_len: + prev_report_len = cur_report_len + # Parse the JSON if it's good we are done, + # if not we will try to read some more. + try: + report_json = json.loads(report) + keep_reading = False + except ValueError: + pass + + if keep_reading: + extra_passes -= 1 + if extra_passes <= 0: + if len(report): + raise ValueError("Invalid json: %s" % + report) + else: + raise ValueError( + "lvm returned no JSON output!") + + except IOError as ioe: + log_debug(str(ioe)) + pass + + return stdout, report_json, stderr + + def _write_cmd(self, cmd): + cmd_bytes = bytes(cmd, "utf-8") + num_written = self.lvm_shell.stdin.write(cmd_bytes) + assert (num_written == len(cmd_bytes)) + self.lvm_shell.stdin.flush() + + @staticmethod + def _make_non_block(stream): + flags = fcntl(stream, F_GETFL) + fcntl(stream, F_SETFL, flags | os.O_NONBLOCK) + + def __init__(self): + + # Create a temp directory + tmp_dir = tempfile.mkdtemp(prefix="lvmdbus_") + tmp_file = "%s/lvmdbus_report" % (tmp_dir) + + try: + # Lets create fifo for the report output + os.mkfifo(tmp_file, 0o600) + except FileExistsError: + pass + + # We have to open non-blocking as the other side isn't open until + # we actually fork the process. + self.report_fd = os.open(tmp_file, os.O_NONBLOCK) + self.report_stream = os.fdopen(self.report_fd, 'rb', 0) + + # Setup the environment for using our own socket for reporting + local_env = copy.deepcopy(os.environ) + local_env["LVM_REPORT_FD"] = "32" + local_env["LVM_COMMAND_PROFILE"] = "lvmdbusd" + + # Disable the abort logic if lvm logs too much, which easily happens + # when utilizing the lvm shell. + local_env["LVM_LOG_FILE_MAX_LINES"] = "0" + + # run the lvm shell + self.lvm_shell = subprocess.Popen( + [LVM_CMD + " 32>%s" % tmp_file], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, env=local_env, + stderr=subprocess.PIPE, close_fds=True, shell=True) + + try: + LVMShellProxy._make_non_block(self.lvm_shell.stdout) + LVMShellProxy._make_non_block(self.lvm_shell.stderr) + + # wait for the first prompt + errors = self._read_until_prompt(no_output=True)[2] + if errors and len(errors): + raise RuntimeError(errors) + except: + raise + finally: + # These will get deleted when the FD count goes to zero so we + # can be sure to clean up correctly no matter how we finish + os.unlink(tmp_file) + os.rmdir(tmp_dir) + + def get_error_msg(self): + # We got an error, lets go fetch the error message + self._write_cmd('lastlog\n') + + # read everything from the STDOUT to the next prompt + stdout, report_json, stderr = self._read_until_prompt() + if 'log' in report_json: + error_msg = "" + # Walk the entire log array and build an error string + for log_entry in report_json['log']: + if log_entry['log_type'] == "error": + if error_msg: + error_msg += ', ' + log_entry['log_message'] + else: + error_msg = log_entry['log_message'] + + return error_msg + + return 'No error reason provided! (missing "log" section)' + + def call_lvm(self, argv, debug=False): + rc = 1 + error_msg = "" + + if self.lvm_shell.poll(): + raise Exception( + self.lvm_shell.returncode, + "Underlying lvm shell process is not present!") + + argv = add_no_notify(argv) + + # create the command string + cmd = " ".join(_quote_arg(arg) for arg in argv) + cmd += "\n" + + # run the command by writing it to the shell's STDIN + self._write_cmd(cmd) + + # read everything from the STDOUT to the next prompt + stdout, report_json, stderr = self._read_until_prompt() + + # Parse the report to see what happened + if 'log' in report_json: + if report_json['log'][-1:][0]['log_ret_code'] == '1': + rc = 0 + else: + error_msg = self.get_error_msg() + + if debug or rc != 0: + log_error(('CMD: %s' % cmd)) + log_error(("EC = %d" % rc)) + log_error(("ERROR_MSG=\n %s\n" % error_msg)) + + return rc, report_json, error_msg + + def exit_shell(self): + try: + self._write_cmd('exit\n') + except Exception as e: + log_error(str(e)) + + def __del__(self): + try: + self.lvm_shell.terminate() + except: + pass + + +if __name__ == "__main__": + shell = LVMShellProxy() + in_line = "start" + try: + while in_line: + in_line = input("lvm> ") + if in_line: + start = time.time() + ret, out, err = shell.call_lvm(in_line.split()) + end = time.time() + + print(("RC: %d" % ret)) + print(("OUT:\n%s" % out)) + print(("ERR:\n%s" % err)) + + print("Command = %f seconds" % (end - start)) + except KeyboardInterrupt: + pass + except EOFError: + pass + except Exception: + traceback.print_exc(file=sys.stdout) diff --git a/daemons/lvmdbusd/lvmdb.py b/daemons/lvmdbusd/lvmdb.py deleted file mode 100755 index 974e7d7..0000000 --- a/daemons/lvmdbusd/lvmdb.py +++ /dev/null @@ -1,540 +0,0 @@ -#!/usr/bin/env python3 - -# Copyright (C) 2015-2016 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, see <http://www.gnu.org/licenses/>. - -from collections import OrderedDict - -import pprint as prettyprint -import os -import sys - -from lvmdbusd import cmdhandler -from lvmdbusd.utils import log_debug, log_error - - -class DataStore(object): - def __init__(self, usejson=True): - self.pvs = {} - self.vgs = {} - self.lvs = {} - self.pv_lvs = {} - self.lv_pvs = {} - self.lvs_hidden = {} - - self.pv_path_to_uuid = {} - self.vg_name_to_uuid = {} - self.lv_full_name_to_uuid = {} - - self.lvs_in_vgs = {} - self.pvs_in_vgs = {} - - # self.refresh() - self.num_refreshes = 0 - - if usejson: - self.json = cmdhandler.supports_json() - else: - self.json = usejson - - @staticmethod - def _insert_record(table, key, record, allowed_multiple): - if key in table: - existing = table[key] - - for rec_k, rec_v in record.items(): - if rec_k in allowed_multiple: - # This column name allows us to store multiple value for - # each type - if not isinstance(existing[rec_k], list): - existing_value = existing[rec_k] - existing[rec_k] = [existing_value, rec_v] - else: - existing[rec_k].append(rec_v) - else: - # If something is not expected to have changing values - # lets ensure that - if existing[rec_k] != rec_v: - raise RuntimeError( - "existing[%s]=%s != %s" % - (rec_k, str(existing[rec_k]), - str(rec_v))) - else: - table[key] = record - - @staticmethod - def _pvs_parse_common(c_pvs, c_pvs_in_vgs, c_lookup): - for p in c_pvs.values(): - # Capture which PVs are associated with which VG - if p['vg_uuid'] not in c_pvs_in_vgs: - c_pvs_in_vgs[p['vg_uuid']] = [] - - if p['vg_name']: - c_pvs_in_vgs[p['vg_uuid']].append( - (p['pv_name'], p['pv_uuid'])) - - # Lookup for translating between /dev/<name> and pv uuid - c_lookup[p['pv_name']] = p['pv_uuid'] - - @staticmethod - def _parse_pvs(_pvs): - pvs = sorted(_pvs, key=lambda pk: pk['pv_name']) - - c_pvs = OrderedDict() - c_lookup = {} - c_pvs_in_vgs = {} - - for p in pvs: - DataStore._insert_record( - c_pvs, p['pv_uuid'], p, - ['pvseg_start', 'pvseg_size', 'segtype']) - - DataStore._pvs_parse_common(c_pvs, c_pvs_in_vgs, c_lookup) - return c_pvs, c_lookup, c_pvs_in_vgs - - @staticmethod - def _parse_pvs_json(_all): - - c_pvs = OrderedDict() - c_lookup = {} - c_pvs_in_vgs = {} - - # Each item item in the report is a collection of information pertaining - # to the vg - for r in _all['report']: - tmp_pv = [] - - # Get the pv data for this VG. - if 'pv' in r: - tmp_pv.extend(r['pv']) - - # Sort them - sorted_tmp_pv = sorted(tmp_pv, key=lambda pk: pk['pv_name']) - - # Add them to result set - for p in sorted_tmp_pv: - c_pvs[p['pv_uuid']] = p - - if 'pvseg' in r: - for s in r['pvseg']: - r = c_pvs[s['pv_uuid']] - r.setdefault('pvseg_start', []).append(s['pvseg_start']) - r.setdefault('pvseg_size', []).append(s['pvseg_size']) - r.setdefault('segtype', []).append(s['segtype']) - - # TODO: Remove this bug work around when we have orphan segs. - for i in c_pvs.values(): - if 'pvseg_start' not in i: - i['pvseg_start'] = '0' - i['pvseg_size'] = i['pv_pe_count'] - i['segtype'] = 'free' - - DataStore._pvs_parse_common(c_pvs, c_pvs_in_vgs, c_lookup) - - return c_pvs, c_lookup, c_pvs_in_vgs - - @staticmethod - def _parse_vgs(_vgs): - vgs = sorted(_vgs, key=lambda vk: vk['vg_name']) - - c_vgs = OrderedDict() - c_lookup = {} - - for i in vgs: - c_lookup[i['vg_name']] = i['vg_uuid'] - DataStore._insert_record(c_vgs, i['vg_uuid'], i, []) - - return c_vgs, c_lookup - - @staticmethod - def _parse_vgs_json(_all): - - tmp_vg = [] - for r in _all['report']: - # Get the pv data for this VG. - if 'vg' in r: - tmp_vg.extend(r['vg']) - - # Sort for consistent output, however this is optional - vgs = sorted(tmp_vg, key=lambda vk: vk['vg_name']) - - c_vgs = OrderedDict() - c_lookup = {} - - for i in vgs: - c_lookup[i['vg_name']] = i['vg_uuid'] - c_vgs[i['vg_uuid']] = i - - return c_vgs, c_lookup - - @staticmethod - def _parse_lvs_common(c_lvs, c_lv_full_lookup): - - c_lvs_in_vgs = OrderedDict() - c_lvs_hidden = OrderedDict() - - for i in c_lvs.values(): - if i['vg_uuid'] not in c_lvs_in_vgs: - c_lvs_in_vgs[i['vg_uuid']] = [] - - c_lvs_in_vgs[ - i['vg_uuid']].append( - (i['lv_name'], - (i['lv_attr'], i['lv_layout'], i['lv_role']), - i['lv_uuid'])) - - if i['lv_parent']: - # Lookup what the parent refers too - parent_name = i['lv_parent'] - full_parent_name = "%s/%s" % (i['vg_name'], parent_name) - if full_parent_name not in c_lv_full_lookup: - parent_name = '[%s]' % (parent_name) - full_parent_name = "%s/%s" % (i['vg_name'], parent_name) - - parent_uuid = c_lv_full_lookup[full_parent_name] - - if parent_uuid not in c_lvs_hidden: - c_lvs_hidden[parent_uuid] = [] - - c_lvs_hidden[parent_uuid].append( - (i['lv_uuid'], i['lv_name'])) - - return c_lvs, c_lvs_in_vgs, c_lvs_hidden, c_lv_full_lookup - - @staticmethod - def _parse_lvs(_lvs): - lvs = sorted(_lvs, key=lambda vk: vk['lv_name']) - - c_lvs = OrderedDict() - c_lv_full_lookup = OrderedDict() - - for i in lvs: - full_name = "%s/%s" % (i['vg_name'], i['lv_name']) - c_lv_full_lookup[full_name] = i['lv_uuid'] - DataStore._insert_record( - c_lvs, i['lv_uuid'], i, - ['seg_pe_ranges', 'segtype']) - - return DataStore._parse_lvs_common(c_lvs, c_lv_full_lookup) - - @staticmethod - def _parse_lvs_json(_all): - - c_lvs = OrderedDict() - c_lv_full_lookup = {} - - # Each item item in the report is a collection of information pertaining - # to the vg - for r in _all['report']: - # Get the lv data for this VG. - if 'lv' in r: - # Add them to result set - for i in r['lv']: - full_name = "%s/%s" % (i['vg_name'], i['lv_name']) - c_lv_full_lookup[full_name] = i['lv_uuid'] - c_lvs[i['lv_uuid']] = i - - # Add in the segment data - if 'seg' in r: - for s in r['seg']: - r = c_lvs[s['lv_uuid']] - r.setdefault('seg_pe_ranges', []).append(s['seg_pe_ranges']) - r.setdefault('segtype', []).append(s['segtype']) - - return DataStore._parse_lvs_common(c_lvs, c_lv_full_lookup) - - @staticmethod - def _make_list(l): - if not isinstance(l, list): - l = [l] - return l - - @staticmethod - def _parse_seg_entry(se, segtype): - if se: - # print("_parse_seg_entry %s %s" % (str(se), str(segtype))) - device, segs = se.split(":") - start, end = segs.split('-') - return (device, (start, end), segtype) - else: - return ("", (), segtype) - - @staticmethod - def _build_segments(l, seg_types): - rc = [] - l = DataStore._make_list(l) - s = DataStore._make_list(seg_types) - - assert len(l) == len(s) - ls = list(zip(l, s)) - - for i in ls: - if ' ' in i[0]: - tmp = i[0].split(' ') - for t in tmp: - rc.append(DataStore._parse_seg_entry(t, i[1])) - else: - rc.append(DataStore._parse_seg_entry(*i)) - return rc - - @staticmethod - def _pv_device_lv_entry(table, pv_device, lv_uuid, meta, lv_attr, - segment_info): - - if pv_device not in table: - table[pv_device] = {} - - if lv_uuid not in table[pv_device]: - table[pv_device][lv_uuid] = {} - table[pv_device][lv_uuid]['segs'] = [segment_info] - table[pv_device][lv_uuid]['name'] = meta - table[pv_device][lv_uuid]['meta'] = lv_attr - else: - table[pv_device][lv_uuid]['segs'].append(segment_info) - - @staticmethod - def _pv_device_lv_format(pv_device_lvs): - rc = {} - - for pv_device, pd in pv_device_lvs.items(): - lvs = [] - for lv_uuid, ld in sorted(pd.items()): - lvs.append((lv_uuid, ld['name'], ld['meta'], ld['segs'])) - - rc[pv_device] = lvs - return rc - - @staticmethod - def _lvs_device_pv_entry(table, lv_uuid, pv_device, pv_uuid, segment_info): - if lv_uuid not in table: - table[lv_uuid] = {} - - if pv_device not in table[lv_uuid]: - table[lv_uuid][pv_device] = {} - table[lv_uuid][pv_device]['segs'] = [segment_info] - table[lv_uuid][pv_device]['pv_uuid'] = pv_uuid - else: - table[lv_uuid][pv_device]['segs'].append(segment_info) - - @staticmethod - def _lvs_device_pv_format(lvs_device_pvs): - rc = {} - - for lv_uuid, ld in lvs_device_pvs.items(): - pvs = [] - for pv_device, pd in sorted(ld.items()): - pvs.append((pd['pv_uuid'], pv_device, pd['segs'])) - - rc[lv_uuid] = pvs - return rc - - def _parse_pv_in_lvs(self): - pv_device_lvs = {} # What LVs are stored on a PV - lvs_device_pv = {} # Where LV data is stored - - for i in self.lvs.values(): - segs = self._build_segments(i['seg_pe_ranges'], i['segtype']) - for s in segs: - # We are referring to physical device - if '/dev/' in s[0]: - device, r, seg_type = s - - DataStore._pv_device_lv_entry( - pv_device_lvs, device, i['lv_uuid'], i['lv_name'], - (i['lv_attr'], i['lv_layout'], i['lv_role']), - (r[0], r[1], seg_type)) - - # (pv_name, pv_segs, pv_uuid) - DataStore._lvs_device_pv_entry( - lvs_device_pv, i['lv_uuid'], device, - self.pv_path_to_uuid[device], (r[0], r[1], seg_type)) - else: - # TODO Handle the case where the segments refer to a LV - # and not a PV - pass - # print("Handle this %s %s %s" % (s[0], s[1], s[2])) - - # Convert form to needed result for consumption - pv_device_lvs_result = DataStore._pv_device_lv_format(pv_device_lvs) - lvs_device_pv_result = DataStore._lvs_device_pv_format(lvs_device_pv) - - return pv_device_lvs_result, lvs_device_pv_result - - def refresh(self, log=True): - """ - Go out and query lvm for the latest data in as few trips as possible - :param log Add debug log entry/exit messages - :return: None - """ - self.num_refreshes += 1 - if log: - log_debug("lvmdb - refresh entry") - - # Grab everything first then parse it - if self.json: - # Do a single lvm retrieve for everything in json - a = cmdhandler.lvm_full_report_json() - - _pvs, _pvs_lookup, _pvs_in_vgs = self._parse_pvs_json(a) - _vgs, _vgs_lookup = self._parse_vgs_json(a) - _lvs, _lvs_in_vgs, _lvs_hidden, _lvs_lookup = self._parse_lvs_json(a) - - else: - _raw_pvs = cmdhandler.pv_retrieve_with_segs() - _raw_vgs = cmdhandler.vg_retrieve(None) - _raw_lvs = cmdhandler.lv_retrieve_with_segments() - - _pvs, _pvs_lookup, _pvs_in_vgs = self._parse_pvs(_raw_pvs) - _vgs, _vgs_lookup = self._parse_vgs(_raw_vgs) - _lvs, _lvs_in_vgs, _lvs_hidden, _lvs_lookup = self._parse_lvs(_raw_lvs) - - # Set all - self.pvs = _pvs - self.pv_path_to_uuid = _pvs_lookup - self.vg_name_to_uuid = _vgs_lookup - self.lv_full_name_to_uuid = _lvs_lookup - - self.vgs = _vgs - self.lvs = _lvs - self.lvs_in_vgs = _lvs_in_vgs - self.pvs_in_vgs = _pvs_in_vgs - self.lvs_hidden = _lvs_hidden - - # Create lookup table for which LV and segments are on each PV - self.pv_lvs, self.lv_pvs = self._parse_pv_in_lvs() - - if log: - log_debug("lvmdb - refresh exit") - - def fetch_pvs(self, pv_name): - if not pv_name: - return self.pvs.values() - else: - rc = [] - for s in pv_name: - # Ths user could be using a symlink instead of the actual - # block device, make sure we are using actual block device file - # if the pv name isn't in the lookup - if s not in self.pv_path_to_uuid: - s = os.path.realpath(s) - rc.append(self.pvs[self.pv_path_to_uuid[s]]) - return rc - - def pv_missing(self, pv_uuid): - if pv_uuid in self.pvs: - if self.pvs[pv_uuid]['pv_missing'] == '': - return False - return True - - def fetch_vgs(self, vg_name): - if not vg_name: - return self.vgs.values() - else: - rc = [] - for s in vg_name: - rc.append(self.vgs[self.vg_name_to_uuid[s]]) - return rc - - def fetch_lvs(self, lv_names): - try: - if not lv_names: - return self.lvs.values() - else: - rc = [] - for s in lv_names: - rc.append(self.lvs[self.lv_full_name_to_uuid[s]]) - return rc - except KeyError as ke: - log_error("Key %s not found!" % (str(lv_names))) - log_error("lv name to uuid lookup") - for keys in sorted(self.lv_full_name_to_uuid.keys()): - log_error("%s" % (keys)) - log_error("lvs entries by uuid") - for keys in sorted(self.lvs.keys()): - log_error("%s" % (keys)) - raise ke - - def pv_pe_segments(self, pv_uuid): - pv = self.pvs[pv_uuid] - return list(zip(pv['pvseg_start'], pv['pvseg_size'])) - - def pv_contained_lv(self, pv_device): - rc = [] - if pv_device in self.pv_lvs: - rc = self.pv_lvs[pv_device] - return rc - - def lv_contained_pv(self, lv_uuid): - rc = [] - if lv_uuid in self.lv_pvs: - rc = self.lv_pvs[lv_uuid] - return rc - - def lvs_in_vg(self, vg_uuid): - # Return an array of - # (lv_name, (lv_attr, lv_layout, lv_role), lv_uuid) - rc = [] - if vg_uuid in self.lvs_in_vgs: - rc = self.lvs_in_vgs[vg_uuid] - return rc - - def pvs_in_vg(self, vg_uuid): - # Returns an array of (pv_name, pv_uuid) - rc = [] - if vg_uuid in self.pvs_in_vgs: - rc = self.pvs_in_vgs[vg_uuid] - return rc - - def hidden_lvs(self, lv_uuid): - # For a specified LV, return a list of hidden lv_uuid, lv_name - # for it - rc = [] - if lv_uuid in self.lvs_hidden: - rc = self.lvs_hidden[lv_uuid] - return rc - - -if __name__ == "__main__": - pp = prettyprint.PrettyPrinter(indent=4) - - use_json = False - - if len(sys.argv) != 1: - print(len(sys.argv)) - use_json = True - - ds = DataStore(use_json) - ds.refresh() - - print("PVS") - for v in ds.pvs.values(): - pp.pprint(v) - print('PV missing is %s' % ds.pv_missing(v['pv_uuid'])) - - print("VGS") - for v in ds.vgs.values(): - pp.pprint(v) - - print("LVS") - for v in ds.lvs.values(): - pp.pprint(v) - - print("LVS in VG") - for k, v in ds.lvs_in_vgs.items(): - print("VG uuid = %s" % (k)) - pp.pprint(v) - - print("pv_in_lvs") - for k, v in ds.pv_lvs.items(): - print("PV %s contains LVS:" % (k)) - pp.pprint(v) - - for k, v in ds.lv_pvs.items(): - print("LV device = %s" % (k)) - pp.pprint(v) diff --git a/daemons/lvmdbusd/lvmdb.py.in b/daemons/lvmdbusd/lvmdb.py.in new file mode 100644 index 0000000..13ee391 --- /dev/null +++ b/daemons/lvmdbusd/lvmdb.py.in @@ -0,0 +1,540 @@ +#!@PYTHON3@ + +# Copyright (C) 2015-2016 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, see <http://www.gnu.org/licenses/>. + +from collections import OrderedDict + +import pprint as prettyprint +import os +import sys + +from lvmdbusd import cmdhandler +from lvmdbusd.utils import log_debug, log_error + + +class DataStore(object): + def __init__(self, usejson=True): + self.pvs = {} + self.vgs = {} + self.lvs = {} + self.pv_lvs = {} + self.lv_pvs = {} + self.lvs_hidden = {} + + self.pv_path_to_uuid = {} + self.vg_name_to_uuid = {} + self.lv_full_name_to_uuid = {} + + self.lvs_in_vgs = {} + self.pvs_in_vgs = {} + + # self.refresh() + self.num_refreshes = 0 + + if usejson: + self.json = cmdhandler.supports_json() + else: + self.json = usejson + + @staticmethod + def _insert_record(table, key, record, allowed_multiple): + if key in table: + existing = table[key] + + for rec_k, rec_v in record.items(): + if rec_k in allowed_multiple: + # This column name allows us to store multiple value for + # each type + if not isinstance(existing[rec_k], list): + existing_value = existing[rec_k] + existing[rec_k] = [existing_value, rec_v] + else: + existing[rec_k].append(rec_v) + else: + # If something is not expected to have changing values + # lets ensure that + if existing[rec_k] != rec_v: + raise RuntimeError( + "existing[%s]=%s != %s" % + (rec_k, str(existing[rec_k]), + str(rec_v))) + else: + table[key] = record + + @staticmethod + def _pvs_parse_common(c_pvs, c_pvs_in_vgs, c_lookup): + for p in c_pvs.values(): + # Capture which PVs are associated with which VG + if p['vg_uuid'] not in c_pvs_in_vgs: + c_pvs_in_vgs[p['vg_uuid']] = [] + + if p['vg_name']: + c_pvs_in_vgs[p['vg_uuid']].append( + (p['pv_name'], p['pv_uuid'])) + + # Lookup for translating between /dev/<name> and pv uuid + c_lookup[p['pv_name']] = p['pv_uuid'] + + @staticmethod + def _parse_pvs(_pvs): + pvs = sorted(_pvs, key=lambda pk: pk['pv_name']) + + c_pvs = OrderedDict() + c_lookup = {} + c_pvs_in_vgs = {} + + for p in pvs: + DataStore._insert_record( + c_pvs, p['pv_uuid'], p, + ['pvseg_start', 'pvseg_size', 'segtype']) + + DataStore._pvs_parse_common(c_pvs, c_pvs_in_vgs, c_lookup) + return c_pvs, c_lookup, c_pvs_in_vgs + + @staticmethod + def _parse_pvs_json(_all): + + c_pvs = OrderedDict() + c_lookup = {} + c_pvs_in_vgs = {} + + # Each item item in the report is a collection of information pertaining + # to the vg + for r in _all['report']: + tmp_pv = [] + + # Get the pv data for this VG. + if 'pv' in r: + tmp_pv.extend(r['pv']) + + # Sort them + sorted_tmp_pv = sorted(tmp_pv, key=lambda pk: pk['pv_name']) + + # Add them to result set + for p in sorted_tmp_pv: + c_pvs[p['pv_uuid']] = p + + if 'pvseg' in r: + for s in r['pvseg']: + r = c_pvs[s['pv_uuid']] + r.setdefault('pvseg_start', []).append(s['pvseg_start']) + r.setdefault('pvseg_size', []).append(s['pvseg_size']) + r.setdefault('segtype', []).append(s['segtype']) + + # TODO: Remove this bug work around when we have orphan segs. + for i in c_pvs.values(): + if 'pvseg_start' not in i: + i['pvseg_start'] = '0' + i['pvseg_size'] = i['pv_pe_count'] + i['segtype'] = 'free' + + DataStore._pvs_parse_common(c_pvs, c_pvs_in_vgs, c_lookup) + + return c_pvs, c_lookup, c_pvs_in_vgs + + @staticmethod + def _parse_vgs(_vgs): + vgs = sorted(_vgs, key=lambda vk: vk['vg_name']) + + c_vgs = OrderedDict() + c_lookup = {} + + for i in vgs: + c_lookup[i['vg_name']] = i['vg_uuid'] + DataStore._insert_record(c_vgs, i['vg_uuid'], i, []) + + return c_vgs, c_lookup + + @staticmethod + def _parse_vgs_json(_all): + + tmp_vg = [] + for r in _all['report']: + # Get the pv data for this VG. + if 'vg' in r: + tmp_vg.extend(r['vg']) + + # Sort for consistent output, however this is optional + vgs = sorted(tmp_vg, key=lambda vk: vk['vg_name']) + + c_vgs = OrderedDict() + c_lookup = {} + + for i in vgs: + c_lookup[i['vg_name']] = i['vg_uuid'] + c_vgs[i['vg_uuid']] = i + + return c_vgs, c_lookup + + @staticmethod + def _parse_lvs_common(c_lvs, c_lv_full_lookup): + + c_lvs_in_vgs = OrderedDict() + c_lvs_hidden = OrderedDict() + + for i in c_lvs.values(): + if i['vg_uuid'] not in c_lvs_in_vgs: + c_lvs_in_vgs[i['vg_uuid']] = [] + + c_lvs_in_vgs[ + i['vg_uuid']].append( + (i['lv_name'], + (i['lv_attr'], i['lv_layout'], i['lv_role']), + i['lv_uuid'])) + + if i['lv_parent']: + # Lookup what the parent refers too + parent_name = i['lv_parent'] + full_parent_name = "%s/%s" % (i['vg_name'], parent_name) + if full_parent_name not in c_lv_full_lookup: + parent_name = '[%s]' % (parent_name) + full_parent_name = "%s/%s" % (i['vg_name'], parent_name) + + parent_uuid = c_lv_full_lookup[full_parent_name] + + if parent_uuid not in c_lvs_hidden: + c_lvs_hidden[parent_uuid] = [] + + c_lvs_hidden[parent_uuid].append( + (i['lv_uuid'], i['lv_name'])) + + return c_lvs, c_lvs_in_vgs, c_lvs_hidden, c_lv_full_lookup + + @staticmethod + def _parse_lvs(_lvs): + lvs = sorted(_lvs, key=lambda vk: vk['lv_name']) + + c_lvs = OrderedDict() + c_lv_full_lookup = OrderedDict() + + for i in lvs: + full_name = "%s/%s" % (i['vg_name'], i['lv_name']) + c_lv_full_lookup[full_name] = i['lv_uuid'] + DataStore._insert_record( + c_lvs, i['lv_uuid'], i, + ['seg_pe_ranges', 'segtype']) + + return DataStore._parse_lvs_common(c_lvs, c_lv_full_lookup) + + @staticmethod + def _parse_lvs_json(_all): + + c_lvs = OrderedDict() + c_lv_full_lookup = {} + + # Each item item in the report is a collection of information pertaining + # to the vg + for r in _all['report']: + # Get the lv data for this VG. + if 'lv' in r: + # Add them to result set + for i in r['lv']: + full_name = "%s/%s" % (i['vg_name'], i['lv_name']) + c_lv_full_lookup[full_name] = i['lv_uuid'] + c_lvs[i['lv_uuid']] = i + + # Add in the segment data + if 'seg' in r: + for s in r['seg']: + r = c_lvs[s['lv_uuid']] + r.setdefault('seg_pe_ranges', []).append(s['seg_pe_ranges']) + r.setdefault('segtype', []).append(s['segtype']) + + return DataStore._parse_lvs_common(c_lvs, c_lv_full_lookup) + + @staticmethod + def _make_list(l): + if not isinstance(l, list): + l = [l] + return l + + @staticmethod + def _parse_seg_entry(se, segtype): + if se: + # print("_parse_seg_entry %s %s" % (str(se), str(segtype))) + device, segs = se.split(":") + start, end = segs.split('-') + return (device, (start, end), segtype) + else: + return ("", (), segtype) + + @staticmethod + def _build_segments(l, seg_types): + rc = [] + l = DataStore._make_list(l) + s = DataStore._make_list(seg_types) + + assert len(l) == len(s) + ls = list(zip(l, s)) + + for i in ls: + if ' ' in i[0]: + tmp = i[0].split(' ') + for t in tmp: + rc.append(DataStore._parse_seg_entry(t, i[1])) + else: + rc.append(DataStore._parse_seg_entry(*i)) + return rc + + @staticmethod + def _pv_device_lv_entry(table, pv_device, lv_uuid, meta, lv_attr, + segment_info): + + if pv_device not in table: + table[pv_device] = {} + + if lv_uuid not in table[pv_device]: + table[pv_device][lv_uuid] = {} + table[pv_device][lv_uuid]['segs'] = [segment_info] + table[pv_device][lv_uuid]['name'] = meta + table[pv_device][lv_uuid]['meta'] = lv_attr + else: + table[pv_device][lv_uuid]['segs'].append(segment_info) + + @staticmethod + def _pv_device_lv_format(pv_device_lvs): + rc = {} + + for pv_device, pd in pv_device_lvs.items(): + lvs = [] + for lv_uuid, ld in sorted(pd.items()): + lvs.append((lv_uuid, ld['name'], ld['meta'], ld['segs'])) + + rc[pv_device] = lvs + return rc + + @staticmethod + def _lvs_device_pv_entry(table, lv_uuid, pv_device, pv_uuid, segment_info): + if lv_uuid not in table: + table[lv_uuid] = {} + + if pv_device not in table[lv_uuid]: + table[lv_uuid][pv_device] = {} + table[lv_uuid][pv_device]['segs'] = [segment_info] + table[lv_uuid][pv_device]['pv_uuid'] = pv_uuid + else: + table[lv_uuid][pv_device]['segs'].append(segment_info) + + @staticmethod + def _lvs_device_pv_format(lvs_device_pvs): + rc = {} + + for lv_uuid, ld in lvs_device_pvs.items(): + pvs = [] + for pv_device, pd in sorted(ld.items()): + pvs.append((pd['pv_uuid'], pv_device, pd['segs'])) + + rc[lv_uuid] = pvs + return rc + + def _parse_pv_in_lvs(self): + pv_device_lvs = {} # What LVs are stored on a PV + lvs_device_pv = {} # Where LV data is stored + + for i in self.lvs.values(): + segs = self._build_segments(i['seg_pe_ranges'], i['segtype']) + for s in segs: + # We are referring to physical device + if '/dev/' in s[0]: + device, r, seg_type = s + + DataStore._pv_device_lv_entry( + pv_device_lvs, device, i['lv_uuid'], i['lv_name'], + (i['lv_attr'], i['lv_layout'], i['lv_role']), + (r[0], r[1], seg_type)) + + # (pv_name, pv_segs, pv_uuid) + DataStore._lvs_device_pv_entry( + lvs_device_pv, i['lv_uuid'], device, + self.pv_path_to_uuid[device], (r[0], r[1], seg_type)) + else: + # TODO Handle the case where the segments refer to a LV + # and not a PV + pass + # print("Handle this %s %s %s" % (s[0], s[1], s[2])) + + # Convert form to needed result for consumption + pv_device_lvs_result = DataStore._pv_device_lv_format(pv_device_lvs) + lvs_device_pv_result = DataStore._lvs_device_pv_format(lvs_device_pv) + + return pv_device_lvs_result, lvs_device_pv_result + + def refresh(self, log=True): + """ + Go out and query lvm for the latest data in as few trips as possible + :param log Add debug log entry/exit messages + :return: None + """ + self.num_refreshes += 1 + if log: + log_debug("lvmdb - refresh entry") + + # Grab everything first then parse it + if self.json: + # Do a single lvm retrieve for everything in json + a = cmdhandler.lvm_full_report_json() + + _pvs, _pvs_lookup, _pvs_in_vgs = self._parse_pvs_json(a) + _vgs, _vgs_lookup = self._parse_vgs_json(a) + _lvs, _lvs_in_vgs, _lvs_hidden, _lvs_lookup = self._parse_lvs_json(a) + + else: + _raw_pvs = cmdhandler.pv_retrieve_with_segs() + _raw_vgs = cmdhandler.vg_retrieve(None) + _raw_lvs = cmdhandler.lv_retrieve_with_segments() + + _pvs, _pvs_lookup, _pvs_in_vgs = self._parse_pvs(_raw_pvs) + _vgs, _vgs_lookup = self._parse_vgs(_raw_vgs) + _lvs, _lvs_in_vgs, _lvs_hidden, _lvs_lookup = self._parse_lvs(_raw_lvs) + + # Set all + self.pvs = _pvs + self.pv_path_to_uuid = _pvs_lookup + self.vg_name_to_uuid = _vgs_lookup + self.lv_full_name_to_uuid = _lvs_lookup + + self.vgs = _vgs + self.lvs = _lvs + self.lvs_in_vgs = _lvs_in_vgs + self.pvs_in_vgs = _pvs_in_vgs + self.lvs_hidden = _lvs_hidden + + # Create lookup table for which LV and segments are on each PV + self.pv_lvs, self.lv_pvs = self._parse_pv_in_lvs() + + if log: + log_debug("lvmdb - refresh exit") + + def fetch_pvs(self, pv_name): + if not pv_name: + return self.pvs.values() + else: + rc = [] + for s in pv_name: + # Ths user could be using a symlink instead of the actual + # block device, make sure we are using actual block device file + # if the pv name isn't in the lookup + if s not in self.pv_path_to_uuid: + s = os.path.realpath(s) + rc.append(self.pvs[self.pv_path_to_uuid[s]]) + return rc + + def pv_missing(self, pv_uuid): + if pv_uuid in self.pvs: + if self.pvs[pv_uuid]['pv_missing'] == '': + return False + return True + + def fetch_vgs(self, vg_name): + if not vg_name: + return self.vgs.values() + else: + rc = [] + for s in vg_name: + rc.append(self.vgs[self.vg_name_to_uuid[s]]) + return rc + + def fetch_lvs(self, lv_names): + try: + if not lv_names: + return self.lvs.values() + else: + rc = [] + for s in lv_names: + rc.append(self.lvs[self.lv_full_name_to_uuid[s]]) + return rc + except KeyError as ke: + log_error("Key %s not found!" % (str(lv_names))) + log_error("lv name to uuid lookup") + for keys in sorted(self.lv_full_name_to_uuid.keys()): + log_error("%s" % (keys)) + log_error("lvs entries by uuid") + for keys in sorted(self.lvs.keys()): + log_error("%s" % (keys)) + raise ke + + def pv_pe_segments(self, pv_uuid): + pv = self.pvs[pv_uuid] + return list(zip(pv['pvseg_start'], pv['pvseg_size'])) + + def pv_contained_lv(self, pv_device): + rc = [] + if pv_device in self.pv_lvs: + rc = self.pv_lvs[pv_device] + return rc + + def lv_contained_pv(self, lv_uuid): + rc = [] + if lv_uuid in self.lv_pvs: + rc = self.lv_pvs[lv_uuid] + return rc + + def lvs_in_vg(self, vg_uuid): + # Return an array of + # (lv_name, (lv_attr, lv_layout, lv_role), lv_uuid) + rc = [] + if vg_uuid in self.lvs_in_vgs: + rc = self.lvs_in_vgs[vg_uuid] + return rc + + def pvs_in_vg(self, vg_uuid): + # Returns an array of (pv_name, pv_uuid) + rc = [] + if vg_uuid in self.pvs_in_vgs: + rc = self.pvs_in_vgs[vg_uuid] + return rc + + def hidden_lvs(self, lv_uuid): + # For a specified LV, return a list of hidden lv_uuid, lv_name + # for it + rc = [] + if lv_uuid in self.lvs_hidden: + rc = self.lvs_hidden[lv_uuid] + return rc + + +if __name__ == "__main__": + pp = prettyprint.PrettyPrinter(indent=4) + + use_json = False + + if len(sys.argv) != 1: + print(len(sys.argv)) + use_json = True + + ds = DataStore(use_json) + ds.refresh() + + print("PVS") + for v in ds.pvs.values(): + pp.pprint(v) + print('PV missing is %s' % ds.pv_missing(v['pv_uuid'])) + + print("VGS") + for v in ds.vgs.values(): + pp.pprint(v) + + print("LVS") + for v in ds.lvs.values(): + pp.pprint(v) + + print("LVS in VG") + for k, v in ds.lvs_in_vgs.items(): + print("VG uuid = %s" % (k)) + pp.pprint(v) + + print("pv_in_lvs") + for k, v in ds.pv_lvs.items(): + print("PV %s contains LVS:" % (k)) + pp.pprint(v) + + for k, v in ds.lv_pvs.items(): + print("LV device = %s" % (k)) + pp.pprint(v) diff --git a/daemons/lvmdbusd/lvmdbusd.in b/daemons/lvmdbusd/lvmdbusd.in old mode 100755 new mode 100644

1 0

master - test: lvmdbusd is used for process name
by Marian Csontos 12 Dec '17

12 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2f4c2a43d49d90875ea31… Commit: 2f4c2a43d49d90875ea31b1507cd0dfcdb049e88 Parent: b76c6951aa5c41b19fc34342ea2e946d7e0a3d24 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Tue Dec 12 12:14:15 2017 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Tue Dec 12 13:17:07 2017 +0100 test: lvmdbusd is used for process name lvmdbusd was started, but the process was not recognized by pgrep. - configure does not make the script executable - set the flag explicitly when running make check, - process name changed to lvmdbusd. The previous python3 value originated from the use of /usr/bin/env. --- test/lib/aux.sh | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index de63167..a436f84 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -318,7 +318,7 @@ prepare_lvmdbusd() { # FIXME: This is not correct! Daemon is auto started. echo -n "## checking lvmdbusd is NOT running..." - if pgrep -f -l lvmdbusd | grep python3 ; then + if pgrep -f -l lvmdbusd | grep python3 || pgrep -x -l lvmdbusd ; then skip "Cannot run lvmdbusd while existing lvmdbusd process exists" fi echo ok @@ -327,6 +327,10 @@ prepare_lvmdbusd() { 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 + echo "Failed to make '$daemon' executable">&2 + return 1 + fi # Setup the python path so we can run export PYTHONPATH="$abs_top_builddir/daemons" else @@ -351,12 +355,9 @@ prepare_lvmdbusd() { sleep 1 echo -n "## checking lvmdbusd IS running..." - if ! pgrep -f -l lvmdbusd | grep python3; then - echo "Failed to start lvmdbusd daemon" - return 1 - fi + comm= # TODO: Is there a better check than wait 1 second and check pid? - if ! ps -p $pid -o comm= >/dev/null || [[ $(ps -p $pid -o comm=) != python3 ]]; then + if ! comm=$(ps -p $pid -o comm=) >/dev/null || [[ $comm != lvmdbusd ]]; then echo "Failed to start lvmdbusd daemon" return 1 fi

1 0

master - format_text: Adjust metadata alignment calculation.
by Alasdair Kergon 11 Dec '17

11 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b76c6951aa5c41b19fc34… Commit: b76c6951aa5c41b19fc34342ea2e946d7e0a3d24 Parent: 053d35de473aafe641f595b1182626ea39fc0ab0 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Mon Dec 11 20:25:03 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Mon Dec 11 20:25:03 2017 +0000 format_text: Adjust metadata alignment calculation. Use new ALIGN_ABSOLUTE macro when calculating the start location of new metadata and adjust the end of buffer detection so that there is no longer an imposed gap between old and new metadata. --- WHATS_NEW | 1 + lib/format_text/format-text.c | 18 ++++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 6f13fe3..9ff8b51 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.177 - ==================================== + 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. Ensure _node_send_message always uses clean status of thin pool. diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index c226131..154d748 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -487,12 +487,11 @@ static uint64_t _next_rlocn_offset(struct raw_locn *rlocn, struct mda_header *md /* FIXME Assume only one VG per mdah for now */ return alignment; - /* Calculate new start position within buffer rounded up to absolute alignment */ - new_start_offset = rlocn->offset + rlocn->size + - (alignment - (mdac_area_start + rlocn->offset + rlocn->size) % alignment); + /* 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); /* If new location is beyond the end of the buffer, wrap around back to start of circular buffer */ - if (new_start_offset > mdah->size - MDA_HEADER_SIZE) + if (new_start_offset >= mdah->size) new_start_offset -= (mdah->size - MDA_HEADER_SIZE); return new_start_offset; @@ -816,10 +815,9 @@ static int _vg_commit_raw_rlocn(struct format_instance *fid, rlocn->offset = mdac->rlocn.offset; rlocn->size = mdac->rlocn.size; rlocn->checksum = mdac->rlocn.checksum; - log_debug_metadata("%sCommitting %s %smetadata (%u) to %s header at " - FMTu64, precommit ? "Pre-" : "", vg->name, - mda_is_ignored(mda) ? "(ignored) " : "", vg->seqno, - dev_name(mdac->area.dev), mdac->area.start); + log_debug_metadata("%sCommitting %s %smetadata (%u) to %s header at " FMTu64 " (offset " FMTu64 ", size " FMTu64 ")", + precommit ? "Pre-" : "", vg->name, mda_is_ignored(mda) ? "(ignored) " : "", vg->seqno, + dev_name(mdac->area.dev), mdac->area.start, mdac->rlocn.offset, mdac->rlocn.size); } else log_debug_metadata("Wiping pre-committed %s %smetadata from %s " "header at " FMTu64, vg->name, @@ -1282,13 +1280,13 @@ int vgname_from_mda(const struct format_type *fmt, if (!validate_name(vgsummary->vgname)) return_0; - log_debug_metadata("%s: %s metadata at " FMTu64 " size " FMTu64 + log_debug_metadata("%s: %s metadata at " FMTu64 " size " FMTu64 " with wrap " FMTu32 " (in area at " FMTu64 " size " FMTu64 ") for %s (" FMTVGID ")", dev_name(dev_area->dev), used_cached_metadata ? "Using cached" : "Found", dev_area->start + rlocn->offset, - rlocn->size, dev_area->start, dev_area->size, vgsummary->vgname, + rlocn->size, wrap, dev_area->start, dev_area->size, vgsummary->vgname, (char *)&vgsummary->vgid); if (mda_free_sectors) {

1 0

master - format_text: Use absolute alignment to calculate metadata usage
by Alasdair Kergon 11 Dec '17

11 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=053d35de473aafe641f59… Commit: 053d35de473aafe641f595b1182626ea39fc0ab0 Parent: 2db67a8ea09a6f1073583e135bfb7b66228d3526 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Mon Dec 11 17:14:38 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Mon Dec 11 17:14:38 2017 +0000 format_text: Use absolute alignment to calculate metadata usage Currently both start and offset should always be divisible by alignment, so this should have no effect, but a later patch will increase alignment so these variables can no longer be optimised out. --- lib/format_text/format-text.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 881fd4d..c226131 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -1292,7 +1292,7 @@ int vgname_from_mda(const struct format_type *fmt, (char *)&vgsummary->vgid); if (mda_free_sectors) { - current_usage = ALIGN_ABSOLUTE(rlocn->size, 0, MDA_ORIGINAL_ALIGNMENT); + current_usage = ALIGN_ABSOLUTE(rlocn->size, dev_area->start + rlocn->offset, MDA_ORIGINAL_ALIGNMENT); buffer_size = mdah->size - MDA_HEADER_SIZE;

1 0

master - format_text: Move metadata size checking into separate fn.
by Alasdair Kergon 11 Dec '17

11 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2db67a8ea09a6f1073583… Commit: 2db67a8ea09a6f1073583e135bfb7b66228d3526 Parent: 46393bfca0692ebddbecdfb1f3b8699c3caa4f16 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Mon Dec 11 17:08:29 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Mon Dec 11 17:08:29 2017 +0000 format_text: Move metadata size checking into separate fn. Move checks into _metadata_fits_into_buffer() and add macro for alignment. --- lib/format_text/format-text.c | 55 +++++++++++++++++++++++++++++++--------- 1 files changed, 42 insertions(+), 13 deletions(-) diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 0dbab11..881fd4d 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -37,6 +37,12 @@ #include <dirent.h> #include <ctype.h> +/* + * Round up offset within buffer to next location that is an exact multiple of alignment. + * (We shouldn't assume the start of the metadata area was aligned the same way when it was created.) + */ +#define ALIGN_ABSOLUTE(offset, buffer_start, alignment) ((offset) + (alignment) - UINT64_C(1) - ((buffer_start) + (offset) + (alignment) - UINT64_C(1)) % (alignment)) + static struct format_instance *_text_create_text_instance(const struct format_type *fmt, const struct format_instance_ctx *fic); @@ -615,6 +621,34 @@ static struct volume_group *_vg_read_precommit_raw(struct format_instance *fid, return vg; } +static int _metadata_fits_into_buffer(struct mda_context *mdac, struct mda_header *mdah, + 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 */ + + /* 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; + + 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; + + /* 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; + + return 1; +} + static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, struct metadata_area *mda) { @@ -624,7 +658,7 @@ 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 = 0, old_wrap = 0, new_end; + uint64_t new_wrap; /* Number of bytes of new metadata that wrap around to start of buffer */ int found = 0; int noprecommit = 0; const char *old_vg_name = NULL; @@ -657,21 +691,16 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, rlocn = _find_vg_rlocn(&mdac->area, mdah, mda_is_primary(mda), old_vg_name ? : vg->name, &noprecommit); - mdac->rlocn.offset = _next_rlocn_offset(rlocn, mdah, mdac->area.start, MDA_ORIGINAL_ALIGNMENT); mdac->rlocn.size = fidtc->raw_metadata_buf_size; + mdac->rlocn.offset = _next_rlocn_offset(rlocn, mdah, mdac->area.start, MDA_ORIGINAL_ALIGNMENT); + if (mdac->rlocn.offset + mdac->rlocn.size > mdah->size) new_wrap = (mdac->rlocn.offset + mdac->rlocn.size) - mdah->size; + else + new_wrap = 0; - if (rlocn && (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 ((new_wrap && old_wrap) || - (rlocn && (new_wrap || old_wrap) && (new_end > rlocn->offset)) || - (MDA_HEADER_SIZE + (rlocn ? rlocn->size : 0) + mdac->rlocn.size >= mdah->size)) { + 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; @@ -1263,8 +1292,8 @@ int vgname_from_mda(const struct format_type *fmt, (char *)&vgsummary->vgid); if (mda_free_sectors) { - current_usage = (rlocn->size + SECTOR_SIZE - UINT64_C(1)) - - (rlocn->size + SECTOR_SIZE - UINT64_C(1)) % SECTOR_SIZE; + current_usage = ALIGN_ABSOLUTE(rlocn->size, 0, MDA_ORIGINAL_ALIGNMENT); + buffer_size = mdah->size - MDA_HEADER_SIZE; if (current_usage * 2 >= buffer_size)

1 0

master - format_text: Log additional circular buffer information.
by Alasdair Kergon 11 Dec '17

11 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=46393bfca0692ebddbecd… Commit: 46393bfca0692ebddbecdfb1f3b8699c3caa4f16 Parent: 49d486319fa6cb48e693c364ee6d72e4b6c364d2 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Mon Dec 11 15:59:40 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Mon Dec 11 16:07:34 2017 +0000 format_text: Log additional circular buffer information. --- lib/format_text/format-text.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index adaf0a8..0dbab11 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -541,8 +541,8 @@ static struct volume_group *_vg_read_raw_area(struct format_instance *fid, wrap = (uint32_t) ((rlocn->offset + rlocn->size) - mdah->size); if (wrap > rlocn->offset) { - log_error("VG %s metadata too large for circular buffer", - vgname); + log_error("VG %s metadata on %s (" FMTu64 " bytes) too large for circular buffer (" FMTu64 " bytes)", + vgname, dev_name(area->dev), rlocn->size, mdah->size - MDA_HEADER_SIZE); goto out; } @@ -672,14 +672,14 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, if ((new_wrap && old_wrap) || (rlocn && (new_wrap || old_wrap) && (new_end > rlocn->offset)) || (MDA_HEADER_SIZE + (rlocn ? rlocn->size : 0) + mdac->rlocn.size >= mdah->size)) { - log_error("VG %s metadata too large for circular buffer", - vg->name); + 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, + log_debug_metadata("Writing %s metadata to %s at " FMTu64 " len " FMTu64 " of " FMTu64, vg->name, dev_name(mdac->area.dev), mdac->area.start + - mdac->rlocn.offset, mdac->rlocn.size - new_wrap); + mdac->rlocn.offset, mdac->rlocn.size - new_wrap, mdac->rlocn.size); /* Write text out, circularly */ if (!dev_write(mdac->area.dev, mdac->area.start + mdac->rlocn.offset, @@ -688,9 +688,9 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, goto_out; if (new_wrap) { - log_debug_metadata("Writing wrapped metadata to %s at " FMTu64 " len " FMTu64, + 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); + MDA_HEADER_SIZE, new_wrap, mdac->rlocn.size); if (!dev_write(mdac->area.dev, mdac->area.start + MDA_HEADER_SIZE, (size_t) new_wrap, MDA_CONTENT_REASON(mda_is_primary(mda)), @@ -1228,8 +1228,8 @@ int vgname_from_mda(const struct format_type *fmt, wrap = (uint32_t) ((rlocn->offset + rlocn->size) - mdah->size); if (wrap > rlocn->offset) { - log_error("%s: metadata too large for circular buffer", - dev_name(dev_area->dev)); + log_error("%s: metadata (" FMTu64 " bytes) too large for circular buffer (" FMTu64 " bytes)", + dev_name(dev_area->dev), rlocn->size, mdah->size - MDA_HEADER_SIZE); return 0; }

1 0

master - format_text: Replace PRI with FMT.
by Alasdair Kergon 11 Dec '17

11 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=49d486319fa6cb48e693c… Commit: 49d486319fa6cb48e693c364ee6d72e4b6c364d2 Parent: 75d4d8e9a42a4709ed40348395b1e75dff4197e8 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Mon Dec 11 15:32:53 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Mon Dec 11 15:39:25 2017 +0000 format_text: Replace PRI with FMT. --- lib/format_text/archiver.c | 2 +- lib/format_text/export.c | 16 +++++----- lib/format_text/format-text.c | 58 ++++++++++++++++++++-------------------- lib/format_text/text_label.c | 6 ++-- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/lib/format_text/archiver.c b/lib/format_text/archiver.c index 3e519ca..1eb6654 100644 --- a/lib/format_text/archiver.c +++ b/lib/format_text/archiver.c @@ -413,7 +413,7 @@ int backup_restore_vg(struct cmd_context *cmd, struct volume_group *vg, new_pvl->pv = pv; dm_list_add(&new_pvs, &new_pvl->list); - log_verbose("Set up physical volume for \"%s\" with %" PRIu64 + log_verbose("Set up physical volume for \"%s\" with " FMTu64 " available sectors.", pv_dev_name(pv), pv_size(pv)); } diff --git a/lib/format_text/export.c b/lib/format_text/export.c index 9fede20..e535237 100644 --- a/lib/format_text/export.c +++ b/lib/format_text/export.c @@ -121,7 +121,7 @@ static int _extend_buffer(struct formatter *f) { char *newbuf; - log_debug_metadata("Doubling metadata output buffer to %" PRIu32, + log_debug_metadata("Doubling metadata output buffer to " FMTu32, f->data.buf.size * 2); if (!(newbuf = dm_realloc(f->data.buf.start, f->data.buf.size * 2))) { @@ -561,15 +561,15 @@ static int _print_pvs(struct formatter *f, struct volume_group *vg) if (!_out_list(f, &pv->tags, "tags")) return_0; - outsize(f, pv->size, "dev_size = %" PRIu64, pv->size); + outsize(f, pv->size, "dev_size = " FMTu64, pv->size); - outf(f, "pe_start = %" PRIu64, pv->pe_start); + outf(f, "pe_start = " FMTu64, pv->pe_start); outsize(f, vg->extent_size * (uint64_t) pv->pe_count, "pe_count = %u", pv->pe_count); if (pv->ba_start && pv->ba_size) { - outf(f, "ba_start = %" PRIu64, pv->ba_start); - outsize(f, pv->ba_size, "ba_size = %" PRIu64, pv->ba_size); + outf(f, "ba_start = " FMTu64, pv->ba_start); + outsize(f, pv->ba_size, "ba_size = " FMTu64, pv->ba_size); } _dec_indent(f); @@ -631,7 +631,7 @@ int out_areas(struct formatter *f, const struct lv_segment *seg, switch (seg_type(seg, s)) { case AREA_PV: if (!(pv = seg_pv(seg, s))) { - log_error(INTERNAL_ERROR "Missing PV for area %" PRIu32 " of %s segment of LV %s.", + log_error(INTERNAL_ERROR "Missing PV for area " FMTu32 " of %s segment of LV %s.", s, type, display_lvname(seg->lv)); return 0; } @@ -670,7 +670,7 @@ int out_areas(struct formatter *f, const struct lv_segment *seg, break; case AREA_UNASSIGNED: - log_error(INTERNAL_ERROR "Invalid type for area %" PRIu32 " of %s segment of LV %s.", + log_error(INTERNAL_ERROR "Invalid type for area " FMTu32 " of %s segment of LV %s.", s, type, display_lvname(seg->lv)); return 0; } @@ -694,7 +694,7 @@ static int _print_timestamp(struct formatter *f, "%Y-%m-%d %T %z", local_tm)) buf[0] = 0; - outfc(f, buf, "%s = %" PRIu64, name, (uint64_t) ts); + outfc(f, buf, "%s = " FMTu64, name, (uint64_t) ts); } return 1; diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index c96fad9..adaf0a8 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -183,8 +183,8 @@ static int _pv_analyze_mda_raw (const struct format_type * fmt, mdac = (struct mda_context *) mda->metadata_locn; - log_print("Found text metadata area: offset=%" PRIu64 ", size=%" - PRIu64, mdac->area.start, mdac->area.size); + log_print("Found text metadata area: offset=" FMTu64 ", size=" + FMTu64, mdac->area.start, mdac->area.size); area = &mdac->area; if (!dev_open_readonly(area->dev)) @@ -240,8 +240,8 @@ static int _pv_analyze_mda_raw (const struct format_type * fmt, /* FIXME: Validate region, pull out timestamp?, etc */ /* FIXME: Do something with this region */ log_verbose ("Found LVM2 metadata record at " - "offset=%"PRIu64", size=%"PRIsize_t", " - "offset2=%"PRIu64" size2=%"PRIsize_t, + "offset=" FMTu64 ", size=" FMTsize_t ", " + "offset2=" FMTu64 " size2=" FMTsize_t, offset, size, offset2, size2); offset = prev_sector; size = SECTOR_SIZE; @@ -333,7 +333,7 @@ static int _raw_read_mda_header(struct mda_header *mdah, struct device_area *dev MDA_HEADER_SIZE - sizeof(mdah->checksum_xl)))) { log_error("Incorrect metadata area header checksum on %s" - " at offset %"PRIu64, dev_name(dev_area->dev), + " at offset " FMTu64, dev_name(dev_area->dev), dev_area->start); return 0; } @@ -342,21 +342,21 @@ static int _raw_read_mda_header(struct mda_header *mdah, struct device_area *dev if (strncmp((char *)mdah->magic, FMTT_MAGIC, sizeof(mdah->magic))) { log_error("Wrong magic number in metadata area header on %s" - " at offset %"PRIu64, dev_name(dev_area->dev), + " at offset " FMTu64, dev_name(dev_area->dev), dev_area->start); return 0; } if (mdah->version != FMTT_VERSION) { log_error("Incompatible metadata area header version: %d on %s" - " at offset %"PRIu64, mdah->version, + " at offset " FMTu64, mdah->version, dev_name(dev_area->dev), dev_area->start); return 0; } if (mdah->start != dev_area->start) { - log_error("Incorrect start sector in metadata area header: %" - PRIu64" on %s at offset %"PRIu64, mdah->start, + log_error("Incorrect start sector in metadata area header: " + FMTu64 " on %s at offset " FMTu64, mdah->start, dev_name(dev_area->dev), dev_area->start); return 0; } @@ -456,7 +456,7 @@ static struct raw_locn *_find_vg_rlocn(struct device_area *dev_area, (isspace(vgnamebuf[len]) || vgnamebuf[len] == '{')) return rlocn; - log_debug_metadata("Volume group name found in %smetadata on %s at %" PRIu64 " does " + log_debug_metadata("Volume group name found in %smetadata on %s at " FMTu64 " does " "not match expected name %s.", *precommitted ? "precommitted " : "", dev_name(dev_area->dev), dev_area->start + rlocn->offset, vgname); @@ -557,13 +557,13 @@ static struct volume_group *_vg_read_raw_area(struct format_instance *fid, goto_out; if (vg) - log_debug_metadata("Read %s %smetadata (%u) from %s at %" PRIu64 " size %" - PRIu64, vg->name, precommitted ? "pre-commit " : "", + log_debug_metadata("Read %s %smetadata (%u) from %s at " FMTu64 " size " + FMTu64, vg->name, precommitted ? "pre-commit " : "", vg->seqno, dev_name(area->dev), area->start + rlocn->offset, rlocn->size); else - log_debug_metadata("Skipped reading %smetadata from %s at %" PRIu64 " size %" - PRIu64 " with matching checksum.", precommitted ? "pre-commit " : "", + log_debug_metadata("Skipped reading %smetadata from %s at " FMTu64 " size " + FMTu64 " with matching checksum.", precommitted ? "pre-commit " : "", dev_name(area->dev), area->start + rlocn->offset, rlocn->size); @@ -677,7 +677,7 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, goto out; } - log_debug_metadata("Writing %s metadata to %s at %" PRIu64 " len %" PRIu64, + log_debug_metadata("Writing %s metadata to %s at " FMTu64 " len " FMTu64, vg->name, dev_name(mdac->area.dev), mdac->area.start + mdac->rlocn.offset, mdac->rlocn.size - new_wrap); @@ -688,7 +688,7 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, goto_out; if (new_wrap) { - log_debug_metadata("Writing wrapped metadata to %s at %" PRIu64 " len %" PRIu64, + log_debug_metadata("Writing wrapped metadata to %s at " FMTu64 " len " FMTu64, dev_name(mdac->area.dev), mdac->area.start + MDA_HEADER_SIZE, new_wrap); @@ -787,13 +787,13 @@ static int _vg_commit_raw_rlocn(struct format_instance *fid, rlocn->offset = mdac->rlocn.offset; rlocn->size = mdac->rlocn.size; rlocn->checksum = mdac->rlocn.checksum; - log_debug_metadata("%sCommitting %s %smetadata (%u) to %s header at %" - PRIu64, precommit ? "Pre-" : "", vg->name, + log_debug_metadata("%sCommitting %s %smetadata (%u) to %s header at " + FMTu64, precommit ? "Pre-" : "", vg->name, mda_is_ignored(mda) ? "(ignored) " : "", vg->seqno, dev_name(mdac->area.dev), mdac->area.start); } else log_debug_metadata("Wiping pre-committed %s %smetadata from %s " - "header at %" PRIu64, vg->name, + "header at " FMTu64, vg->name, mda_is_ignored(mda) ? "(ignored) " : "", dev_name(mdac->area.dev), mdac->area.start); @@ -1253,8 +1253,8 @@ int vgname_from_mda(const struct format_type *fmt, if (!validate_name(vgsummary->vgname)) return_0; - log_debug_metadata("%s: %s metadata at %" PRIu64 " size %" PRIu64 - " (in area at %" PRIu64 " size %" PRIu64 + log_debug_metadata("%s: %s metadata at " FMTu64 " size " FMTu64 + " (in area at " FMTu64 " size " FMTu64 ") for %s (" FMTVGID ")", dev_name(dev_area->dev), used_cached_metadata ? "Using cached" : "Found", @@ -1402,8 +1402,8 @@ static int _text_pv_write(const struct format_type *fmt, struct physical_volume continue; mdac = (struct mda_context *) mda->metadata_locn; - log_debug_metadata("Creating metadata area on %s at sector %" - PRIu64 " size %" PRIu64 " sectors", + log_debug_metadata("Creating metadata area on %s at sector " + FMTu64 " size " FMTu64 " sectors", dev_name(mdac->area.dev), mdac->area.start >> SECTOR_SHIFT, mdac->area.size >> SECTOR_SHIFT); @@ -1782,10 +1782,10 @@ static int _mda_export_text_raw(struct metadata_area *mda, return 1; /* pretend the MDA does not exist */ return config_make_nodes(cft, parent, NULL, - "ignore = %" PRId64, (int64_t) mda_is_ignored(mda), - "start = %" PRId64, (int64_t) mdc->area.start, - "size = %" PRId64, (int64_t) mdc->area.size, - "free_sectors = %" PRId64, (int64_t) mdc->free_sectors, + "ignore = " FMTd64, (int64_t) mda_is_ignored(mda), + "start = " FMTd64, (int64_t) mdc->area.start, + "size = " FMTd64, (int64_t) mdc->area.size, + "free_sectors = " FMTd64, (int64_t) mdc->free_sectors, NULL) ? 1 : 0; } @@ -2306,13 +2306,13 @@ static int _text_pv_add_metadata_area(const struct format_type *fmt, if (limit_applied) log_very_verbose("Using limited metadata area size on %s " - "with value %" PRIu64 " (limited by %s of " + "with value " FMTu64 " (limited by %s of " FMTu64 ").", pv_dev_name(pv), mda_size, limit_name, limit); if (mda_size) { if (mda_size < MDA_SIZE_MIN) { - log_error("Metadata area size too small: %" PRIu64" bytes. " + log_error("Metadata area size too small: " FMTu64 " bytes. " "It must be at least %u bytes.", mda_size, MDA_SIZE_MIN); goto bad; } diff --git a/lib/format_text/text_label.c b/lib/format_text/text_label.c index c567709..7058f70 100644 --- a/lib/format_text/text_label.c +++ b/lib/format_text/text_label.c @@ -148,7 +148,7 @@ static int _text_write(struct label *label, void *buf) !xlate64(pvhdr->disk_areas_xl[mda2].size)) mda2 = 0; - log_debug_metadata("%s: Preparing PV label header %s size %" PRIu64 " with" + log_debug_metadata("%s: Preparing PV label header %s size " FMTu64 " with" "%s%.*" PRIu64 "%s%.*" PRIu64 "%s" "%s%.*" PRIu64 "%s%.*" PRIu64 "%s" "%s%.*" PRIu64 "%s%.*" PRIu64 "%s" @@ -352,7 +352,7 @@ static int _update_mda(struct metadata_area *mda, void *baton) mda_set_ignored(mda, rlocn_is_ignored(mdah->raw_locns)); if (mda_is_ignored(mda)) { - log_debug_metadata("Ignoring mda on device %s at offset %"PRIu64, + log_debug_metadata("Ignoring mda on device %s at offset " FMTu64, dev_name(mdac->area.dev), mdac->area.start); if (!dev_close(mdac->area.dev)) @@ -428,7 +428,7 @@ static int _text_read(struct labeller *l, struct device *dev, void *buf, if (!(ext_version = xlate32(pvhdr_ext->version))) goto out; - log_debug_metadata("%s: PV header extension version %" PRIu32 " found", + log_debug_metadata("%s: PV header extension version " FMTu32 " found", dev_name(dev), ext_version); /* Extension version */

1 0

master - configure: Fix deprecation warning for lvmapp
by Marian Csontos 11 Dec '17

11 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=75d4d8e9a42a4709ed403… Commit: 75d4d8e9a42a4709ed40348395b1e75dff4197e8 Parent: 2aedc98242cefd29a5eccabb600be6f37e756fda Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Mon Dec 11 15:20:48 2017 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Mon Dec 11 15:20:48 2017 +0100 configure: Fix deprecation warning for lvmapp * and properly regenerate configure script --- configure | 6 +++--- configure.in | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 903ad6e..7e2969a 100755 --- a/configure +++ b/configure @@ -12777,8 +12777,8 @@ test "$APPLIB" = yes \ && LVM2APP_LIB=-llvm2app \ || LVM2APP_LIB= if test "$APPLIB"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Python bindings are deprecated. Use D-Bus API" >&5 -$as_echo "$as_me: WARNING: Python bindings are deprecated. Use D-Bus API" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: liblvm2app is deprecated. Use D-Bus API" >&5 +$as_echo "$as_me: WARNING: liblvm2app is deprecated. Use D-Bus API" >&2;} fi ################################################################################ @@ -13791,7 +13791,7 @@ fi PYTHON3_INCDIRS=`"$PYTHON3_CONFIG" --includes` PYTHON3_LIBDIRS=`"$PYTHON3_CONFIG" --libs` PYTHON3DIR=$pythondir - PYTHON_BINDINGS=yes + test "$PYTHON3_BINDINGS" = yes && PYTHON_BINDINGS=yes fi if test "$BUILD_LVMDBUSD" = yes; then diff --git a/configure.in b/configure.in index 85ddce0..88ee5ad 100644 --- a/configure.in +++ b/configure.in @@ -1455,7 +1455,7 @@ test "$APPLIB" = yes \ && LVM2APP_LIB=-llvm2app \ || LVM2APP_LIB= AS_IF([test "$APPLIB"], - [AC_MSG_WARN([Python bindings are deprecated. Use D-Bus API])]) + [AC_MSG_WARN([liblvm2app is deprecated. Use D-Bus API])]) ################################################################################ dnl -- Enable cmdlib

1 0

master - lvmdbusd: Fix path to python3
by Marian Csontos 11 Dec '17

11 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2aedc98242cefd29a5ecc… Commit: 2aedc98242cefd29a5eccabb600be6f37e756fda Parent: 6a6c8d7b81703205a283528da5b7b8630e32d0d0 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Mon Dec 11 12:36:54 2017 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Mon Dec 11 12:36:54 2017 +0100 lvmdbusd: Fix path to python3 lvmdbusd executable script must use python3 interpreter detected by configure script, as site-packages directory used for library is only used by that interpreter. --- WHATS_NEW | 1 + configure | 3 ++- configure.in | 1 + daemons/lvmdbusd/.gitignore | 1 + daemons/lvmdbusd/lvmdbusd | 16 ---------------- daemons/lvmdbusd/lvmdbusd.in | 16 ++++++++++++++++ 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index db256b0..6f13fe3 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.177 - ==================================== + Fix python3 path in lvmdbusd to use value detected by configure. Reduce checks for active LVs in vgchange before background polling. Ensure _node_send_message always uses clean status of thin pool. Fix lvmlockd to use pool lock when accessing _tmeta volume. diff --git a/configure b/configure index fc0a27a..903ad6e 100755 --- a/configure +++ b/configure @@ -15778,7 +15778,7 @@ _ACEOF ################################################################################ -ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile include/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile lib/cache_segtype/Makefile libdaemon/Makefile libdaemon/client/Makefile libdaem on/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service scripts/lvm2_lvmlocking_systemd_ red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile" +ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile daemons/lvmlockd/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile include/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile lib/cache_segtype/Makefile libdaemon/Makefile libdaem on/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/com.redhat.lvmdbus1.service scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmdbusd_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_lvmlockd_systemd_red_hat.service script s/lvm2_lvmlocking_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/lvmdump.sh scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16488,6 +16488,7 @@ do "daemons/dmeventd/plugins/thin/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmeventd/plugins/thin/Makefile" ;; "daemons/dmfilemapd/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/dmfilemapd/Makefile" ;; "daemons/lvmdbusd/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/Makefile" ;; + "daemons/lvmdbusd/lvmdbusd") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/lvmdbusd" ;; "daemons/lvmdbusd/path.py") CONFIG_FILES="$CONFIG_FILES daemons/lvmdbusd/path.py" ;; "daemons/lvmetad/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/lvmetad/Makefile" ;; "daemons/lvmpolld/Makefile") CONFIG_FILES="$CONFIG_FILES daemons/lvmpolld/Makefile" ;; diff --git a/configure.in b/configure.in index a0a47cd..85ddce0 100644 --- a/configure.in +++ b/configure.in @@ -2186,6 +2186,7 @@ daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/dmfilemapd/Makefile daemons/lvmdbusd/Makefile +daemons/lvmdbusd/lvmdbusd daemons/lvmdbusd/path.py daemons/lvmetad/Makefile daemons/lvmpolld/Makefile diff --git a/daemons/lvmdbusd/.gitignore b/daemons/lvmdbusd/.gitignore index 09375e7..c0f6b4e 100644 --- a/daemons/lvmdbusd/.gitignore +++ b/daemons/lvmdbusd/.gitignore @@ -1 +1,2 @@ path.py +lvmdbusd diff --git a/daemons/lvmdbusd/lvmdbusd b/daemons/lvmdbusd/lvmdbusd deleted file mode 100755 index 73d0f13..0000000 --- a/daemons/lvmdbusd/lvmdbusd +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env python3 - -# Copyright (C) 2015-2016 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, see <http://www.gnu.org/licenses/>. - -import sys -from lvmdbusd import main - -if __name__ == '__main__': - sys.exit(main()) diff --git a/daemons/lvmdbusd/lvmdbusd.in b/daemons/lvmdbusd/lvmdbusd.in new file mode 100755 index 0000000..bd84cd8 --- /dev/null +++ b/daemons/lvmdbusd/lvmdbusd.in @@ -0,0 +1,16 @@ +#!@PYTHON3@ + +# Copyright (C) 2015-2016 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, see <http://www.gnu.org/licenses/>. + +import sys +from lvmdbusd import main + +if __name__ == '__main__': + sys.exit(main())

1 0

master - configure: applib is not required by dbusd
by Marian Csontos 11 Dec '17

11 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=6a6c8d7b81703205a2835… Commit: 6a6c8d7b81703205a283528da5b7b8630e32d0d0 Parent: a64c73a979062c097395735372bbb33456d445f2 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Mon Dec 11 12:12:42 2017 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Mon Dec 11 12:12:42 2017 +0100 configure: applib is not required by dbusd --- configure.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 7d4f5b3..a0a47cd 100644 --- a/configure.in +++ b/configure.in @@ -1530,7 +1530,7 @@ if test "$PYTHON3_BINDINGS" = yes -o "$BUILD_LVMDBUSD" = yes; then PYTHON3_INCDIRS=`"$PYTHON3_CONFIG" --includes` PYTHON3_LIBDIRS=`"$PYTHON3_CONFIG" --libs` PYTHON3DIR=$pythondir - PYTHON_BINDINGS=yes + test "$PYTHON3_BINDINGS" = yes && PYTHON_BINDINGS=yes fi if test "$BUILD_LVMDBUSD" = yes; then

1 0

master - cleanup: debug message
by Zdenek Kabelac 08 Dec '17

08 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a64c73a979062c0973957… Commit: a64c73a979062c097395735372bbb33456d445f2 Parent: 700e2a2d251cf8dcaf56035e0bd83ce8f808b5c0 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Dec 8 13:17:15 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Dec 8 13:21:15 2017 +0100 cleanup: debug message --- tools/vgchange.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/vgchange.c b/tools/vgchange.c index ea737ba..616a9d3 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -124,8 +124,8 @@ static int _activate_lvs_in_vg(struct cmd_context *cmd, struct volume_group *vg, * If the LV is active exclusive remotely, * then ignore it here */ - log_verbose("%s/%s is exclusively active on" - " a remote node", vg->name, lv->name); + log_verbose("%s is exclusively active on a remote node.", + display_lvname(lv)); expected_count--; /* not accounted */ } continue; @@ -783,7 +783,7 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name, if (!arg_is_set(cmd, refresh_ARG) && !vgchange_background_polling(cmd, vg)) - return_ECMD_FAILED; + return_ECMD_FAILED; return ret; }

1 0

master - cleanup: switch to standard query
by Zdenek Kabelac 08 Dec '17

08 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=700e2a2d251cf8dcaf560… Commit: 700e2a2d251cf8dcaf56035e0bd83ce8f808b5c0 Parent: 71485ebfc759299610e279a91b97215b556295df Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Dec 8 13:15:21 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Dec 8 13:21:15 2017 +0100 cleanup: switch to standard query In /tools part we should mostly use standard functions lv_is_active* unless there is good reason to not use it. --- tools/vgchange.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/tools/vgchange.c b/tools/vgchange.c index 48e64c5..ea737ba 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -58,19 +58,12 @@ static int _poll_lvs_in_vg(struct cmd_context *cmd, { struct lv_list *lvl; struct logical_volume *lv; - struct lvinfo info; - int lv_active; int count = 0; dm_list_iterate_items(lvl, &vg->lvs) { lv = lvl->lv; - if (!lv_info(cmd, lv, 0, &info, 0, 0)) - lv_active = 0; - else - lv_active = info.exists; - - if (lv_active && + if (lv_is_active_locally(lv) && (lv_is_pvmove(lv) || lv_is_converting(lv) || lv_is_merging(lv))) { lv_spawn_background_polling(cmd, lv); count++;

1 0

master - thin: regression fix for metadata checking
by Zdenek Kabelac 08 Dec '17

08 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=71485ebfc759299610e27… Commit: 71485ebfc759299610e279a91b97215b556295df Parent: 455b26b8dbdd05ec773a84da2ef64b669c80e194 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Dec 8 13:09:45 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Dec 8 13:21:15 2017 +0100 thin: regression fix for metadata checking Fix regression from commit f173274fe4888cc73eb573cf2c6913f54641c1aa and restore support for 'disabled' checking via lvm.conf. --- lib/activate/dev_manager.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index ced50fa..2faf1cc 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -1913,7 +1913,12 @@ static int _pool_callback(struct dm_tree_node *node, long buf[64 / sizeof(long)]; /* buffer for short disk header (64B) */ int args = 0; char *mpath; - const char *argv[19] = { 0 }; /* Max supported 15 args */ + const char *argv[19] = { /* Max supported 15 args */ + find_config_tree_str_allow_empty(pool_lv->vg->cmd, data->exec, NULL) + }; + + if (!*argv[0]) /* *_check tool is unconfigured/disabled with "" setting */ + return 1; if (!(mpath = lv_dmpath_dup(data->dm->mem, mlv))) { log_error("Failed to build device path for checking pool metadata %s.", @@ -1947,9 +1952,6 @@ static int _pool_callback(struct dm_tree_node *node, } } - if (!(argv[0] = find_config_tree_str_allow_empty(pool_lv->vg->cmd, data->exec, NULL))) - return 1; /* Checking disabled */ - if (!(cn = find_config_tree_array(mlv->vg->cmd, data->opts, NULL))) { log_error(INTERNAL_ERROR "Unable to find configuration for pool check options."); return 0;

1 0

master - activation: keep priority till memlock_unlock
by Zdenek Kabelac 08 Dec '17

08 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=455b26b8dbdd05ec773a8… Commit: 455b26b8dbdd05ec773a84da2ef64b669c80e194 Parent: 4e8af1d3aa136eae8dbb66186bfc331b0b2887e6 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Dec 8 13:11:35 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Dec 8 13:21:15 2017 +0100 activation: keep priority till memlock_unlock Although it doesn't look like it can be a measurable problem and costs some time to flip priorities outside of activation window. So just like with memory locking preserve priority until call memlock_unlock() appears. (addition to commit c086dfadc389551b9a2d7b4c26931e5e74ada8d6). --- lib/mm/memlock.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c index f72b86c..897bf10 100644 --- a/lib/mm/memlock.c +++ b/lib/mm/memlock.c @@ -627,8 +627,6 @@ void critical_section_dec(struct cmd_context *cmd, const char *reason) log_debug_activation("Leaving critical section (%s).", reason); } else log_debug_activation("Leaving section (%s).", reason); - - _restore_priority_if_possible(cmd); } int critical_section(void) @@ -683,6 +681,7 @@ void memlock_reset(void) void memlock_unlock(struct cmd_context *cmd) { _unlock_mem_if_possible(cmd); + _restore_priority_if_possible(cmd); } int memlock_count_daemon(void)

1 0

master - vgchange: drop extra counting
by Zdenek Kabelac 08 Dec '17

08 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4e8af1d3aa136eae8dbb6… Commit: 4e8af1d3aa136eae8dbb66186bfc331b0b2887e6 Parent: 14b1e5270dbca71870a79b37d6614e2cb96b180f Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Dec 8 13:17:34 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Dec 8 13:21:14 2017 +0100 vgchange: drop extra counting As the loop for background polling _poll_lvs_in_vg checks for active LVs, avoid doing unnecessary extra check before. --- WHATS_NEW | 1 + tools/vgchange.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 4659d55..db256b0 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.177 - ==================================== + Reduce checks for active LVs in vgchange before background polling. Ensure _node_send_message always uses clean status of thin pool. Fix lvmlockd to use pool lock when accessing _tmeta volume. Report expected sanlock_convert errors only when retries fail. diff --git a/tools/vgchange.c b/tools/vgchange.c index ae97a4a..48e64c5 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -178,7 +178,7 @@ int vgchange_background_polling(struct cmd_context *cmd, struct volume_group *vg { int polled; - if (lvs_in_vg_activated(vg) && background_polling()) { + if (background_polling()) { polled = _poll_lvs_in_vg(cmd, vg); if (polled) log_print_unless_silent("Background polling started for %d logical volume(s) "

1 0

master - format_text: Use explicit alignment in wrapping calc.
by Alasdair Kergon 08 Dec '17

08 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=14b1e5270dbca71870a79… Commit: 14b1e5270dbca71870a79b37d6614e2cb96b180f Parent: 4c88c4626d9870d4fa146f7596a37853cf965a39 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Fri Dec 8 01:11:34 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Fri Dec 8 01:18:46 2017 +0000 format_text: Use explicit alignment in wrapping calc. Expand out the metadata wrapping calculations to prepare to support a larger alignment. The current alignment is 512 bytes so (mdac_area_start + rlocn->offset) % alignment is zero. --- lib/format_text/format-text.c | 29 +++++++++++++++++------------ lib/format_text/layout.h | 1 + 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 09ce693..c96fad9 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -472,19 +472,24 @@ static struct raw_locn *_find_vg_rlocn(struct device_area *dev_area, /* * Determine offset for uncommitted metadata */ -static uint64_t _next_rlocn_offset(struct raw_locn *rlocn, - struct mda_header *mdah) +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; + if (!rlocn) /* Find an empty slot */ /* FIXME Assume only one VG per mdah for now */ - return MDA_HEADER_SIZE; + return alignment; + + /* Calculate new start position within buffer rounded up to absolute alignment */ + new_start_offset = rlocn->offset + rlocn->size + + (alignment - (mdac_area_start + rlocn->offset + rlocn->size) % alignment); - /* Start of free space - round up to next sector; circular */ - return ((rlocn->offset + rlocn->size + - (SECTOR_SIZE - rlocn->size % SECTOR_SIZE) - - MDA_HEADER_SIZE) % (mdah->size - MDA_HEADER_SIZE)) - + MDA_HEADER_SIZE; + /* If new location is beyond the end of the buffer, wrap around back to start of circular buffer */ + if (new_start_offset > mdah->size - MDA_HEADER_SIZE) + new_start_offset -= (mdah->size - MDA_HEADER_SIZE); + + return new_start_offset; } static int _raw_holds_vgname(struct format_instance *fid, @@ -643,9 +648,6 @@ 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; - rlocn = _find_vg_rlocn(&mdac->area, mdah, mda_is_primary(mda), old_vg_name ? : vg->name, &noprecommit); - mdac->rlocn.offset = _next_rlocn_offset(rlocn, mdah); - if (!fidtc->raw_metadata_buf && !(fidtc->raw_metadata_buf_size = text_vg_export_raw(vg, "", &fidtc->raw_metadata_buf))) { @@ -653,6 +655,9 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, goto out; } + rlocn = _find_vg_rlocn(&mdac->area, mdah, mda_is_primary(mda), old_vg_name ? : vg->name, &noprecommit); + + mdac->rlocn.offset = _next_rlocn_offset(rlocn, mdah, mdac->area.start, MDA_ORIGINAL_ALIGNMENT); mdac->rlocn.size = fidtc->raw_metadata_buf_size; if (mdac->rlocn.offset + mdac->rlocn.size > mdah->size) @@ -683,7 +688,7 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, goto_out; if (new_wrap) { - log_debug_metadata("Writing metadata to %s at %" PRIu64 " len %" PRIu64, + log_debug_metadata("Writing wrapped metadata to %s at %" PRIu64 " len %" PRIu64, dev_name(mdac->area.dev), mdac->area.start + MDA_HEADER_SIZE, new_wrap); diff --git a/lib/format_text/layout.h b/lib/format_text/layout.h index c88812f..1746b9c 100644 --- a/lib/format_text/layout.h +++ b/lib/format_text/layout.h @@ -102,6 +102,7 @@ struct mda_context { #define MDA_HEADER_SIZE 512 #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 */ 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 - debug: update debug msg
by Zdenek Kabelac 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4c88c4626d9870d4fa146… Commit: 4c88c4626d9870d4fa146f7596a37853cf965a39 Parent: 717714b24ffbf648a1b22e9306484944a514c565 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Dec 7 17:54:41 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Dec 7 21:00:39 2017 +0100 debug: update debug msg Use _node_name. --- libdm/libdm-deptree.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 6ba20a4..98dda44 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -2786,9 +2786,9 @@ static int _dm_tree_revert_activated(struct dm_tree_node *parent) struct dm_tree_node *child; dm_list_iterate_items_gen(child, &parent->activated, activated_list) { - log_debug_activation("Reverting %s.", child->name); + log_debug_activation("Reverting %s.", _node_name(child)); if (child->callback) { - log_debug_activation("Dropping callback for %s.", child->name); + log_debug_activation("Dropping callback for %s.", _node_name(child)); child->callback = NULL; } if (!_deactivate_node(child->name, child->info.major, child->info.minor,

1 0

master - cleanup: use log_warn
by Zdenek Kabelac 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=717714b24ffbf648a1b22… Commit: 717714b24ffbf648a1b22e9306484944a514c565 Parent: f173274fe4888cc73eb573cf2c6913f54641c1aa Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Dec 7 10:42:30 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Dec 7 21:00:39 2017 +0100 cleanup: use log_warn --- libdm/libdm-common.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c index f5c6062..2ab5bd1 100644 --- a/libdm/libdm-common.c +++ b/libdm/libdm-common.c @@ -1917,13 +1917,13 @@ int dm_device_has_holders(uint32_t major, uint32_t minor) if (dm_snprintf(sysfs_path, PATH_MAX, "%sdev/block/%" PRIu32 ":%" PRIu32 "/holders", _sysfs_dir, major, minor) < 0) { - log_error("sysfs_path dm_snprintf failed"); + log_warn("WARNING: sysfs_path dm_snprintf failed."); return 0; } if (stat(sysfs_path, &st)) { if (errno != ENOENT) - log_sys_error("stat", sysfs_path); + log_sys_debug("stat", sysfs_path); return 0; } @@ -1939,13 +1939,13 @@ static int _mounted_fs_on_device(const char *kernel_dev_name) int r = 0; if (dm_snprintf(sysfs_path, PATH_MAX, "%sfs", _sysfs_dir) < 0) { - log_error("sysfs_path dm_snprintf failed"); + log_warn("WARNING: sysfs_path dm_snprintf failed."); return 0; } if (!(d = opendir(sysfs_path))) { if (errno != ENOENT) - log_sys_error("opendir", sysfs_path); + log_sys_debug("opendir", sysfs_path); return 0; } @@ -1955,7 +1955,7 @@ static int _mounted_fs_on_device(const char *kernel_dev_name) if (dm_snprintf(sysfs_path, PATH_MAX, "%sfs/%s/%s", _sysfs_dir, dirent->d_name, kernel_dev_name) < 0) { - log_error("sysfs_path dm_snprintf failed"); + log_warn("WARNING: sysfs_path dm_snprintf failed."); break; } @@ -1965,13 +1965,13 @@ static int _mounted_fs_on_device(const char *kernel_dev_name) break; } else if (errno != ENOENT) { - log_sys_error("stat", sysfs_path); + log_sys_debug("stat", sysfs_path); break; } } if (closedir(d)) - log_error("_fs_present_on_device: %s: closedir failed", kernel_dev_name); + log_sys_debug("closedir", kernel_dev_name); return r; }

1 0

master - cleanup: reorder calling of pool checking tools
by Zdenek Kabelac 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f173274fe4888cc73eb57… Commit: f173274fe4888cc73eb573cf2c6913f54641c1aa Parent: 820b1b98fce4a370e9b54ffbc8cbe4b3d0e962f3 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Dec 7 17:49:15 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Dec 7 21:00:39 2017 +0100 cleanup: reorder calling of pool checking tools Test for zero header before even starting to create argument list for execution of thin/cache_check tool. --- lib/activate/dev_manager.c | 70 ++++++++++++++++++++++--------------------- 1 files changed, 36 insertions(+), 34 deletions(-) diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index c050f34..ced50fa 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -1912,11 +1912,42 @@ static int _pool_callback(struct dm_tree_node *node, const struct logical_volume *mlv = first_seg(pool_lv)->metadata_lv; long buf[64 / sizeof(long)]; /* buffer for short disk header (64B) */ int args = 0; - const char *argv[19] = { /* Max supported 15 args */ - find_config_tree_str_allow_empty(pool_lv->vg->cmd, data->exec, NULL) /* argv[0] */ - }; + char *mpath; + const char *argv[19] = { 0 }; /* Max supported 15 args */ + + if (!(mpath = lv_dmpath_dup(data->dm->mem, mlv))) { + log_error("Failed to build device path for checking pool metadata %s.", + display_lvname(mlv)); + return 0; + } + + if (data->skip_zero) { + if ((fd = open(mpath, O_RDONLY)) < 0) { + log_sys_error("open", mpath); + return 0; + } + /* let's assume there is no problem to read 64 bytes */ + if (read(fd, buf, sizeof(buf)) < (int)sizeof(buf)) { + log_sys_error("read", mpath); + if (close(fd)) + log_sys_error("close", mpath); + return 0; + } + for (ret = 0; ret < (int) DM_ARRAY_SIZE(buf); ++ret) + if (buf[ret]) + break; + + if (close(fd)) + log_sys_error("close", mpath); + + if (ret == (int) DM_ARRAY_SIZE(buf)) { + log_debug_activation("Metadata checking skipped, detected empty disk header on %s.", + mpath); + return 1; + } + } - if (!*argv[0]) + if (!(argv[0] = find_config_tree_str_allow_empty(pool_lv->vg->cmd, data->exec, NULL))) return 1; /* Checking disabled */ if (!(cn = find_config_tree_array(mlv->vg->cmd, data->opts, NULL))) { @@ -1939,36 +1970,7 @@ static int _pool_callback(struct dm_tree_node *node, return 0; } - if (!(argv[++args] = lv_dmpath_dup(data->dm->mem, mlv))) { - log_error("Failed to build pool metadata path."); - return 0; - } - - if (data->skip_zero) { - if ((fd = open(argv[args], O_RDONLY)) < 0) { - log_sys_error("open", argv[args]); - return 0; - } - /* let's assume there is no problem to read 64 bytes */ - if (read(fd, buf, sizeof(buf)) < (int)sizeof(buf)) { - log_sys_error("read", argv[args]); - if (close(fd)) - log_sys_error("close", argv[args]); - return 0; - } - for (ret = 0; ret < (int) DM_ARRAY_SIZE(buf); ++ret) - if (buf[ret]) - break; - - if (close(fd)) - log_sys_error("close", argv[args]); - - if (ret == (int) DM_ARRAY_SIZE(buf)) { - log_debug_activation("%s skipped, detect empty disk header on %s.", - argv[0], argv[args]); - return 1; - } - } + argv[++args] = mpath; if (!(ret = exec_cmd(pool_lv->vg->cmd, (const char * const *)argv, &status, 0))) {

1 0

master - libdm: drop extra structure copy
by Zdenek Kabelac 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=820b1b98fce4a370e9b54… Commit: 820b1b98fce4a370e9b54ffbc8cbe4b3d0e962f3 Parent: 82ae02bc6a6788aabb10ac8a95287feea37ab88c Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Dec 7 17:47:06 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Dec 7 21:00:39 2017 +0100 libdm: drop extra structure copy When doing resume, directly pass location where new updated info needs to be stored. _resume_node() ensures the info is ONLY updated when the function is successful and never changes it on error path. --- libdm/libdm-deptree.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 745fec3..6ba20a4 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1848,7 +1848,6 @@ int dm_tree_activate_children(struct dm_tree_node *dnode, int resolvable_name_conflict, awaiting_peer_rename = 0; void *handle = NULL; struct dm_tree_node *child = dnode; - struct dm_info newinfo; const char *name; const char *uuid; int priority; @@ -1913,14 +1912,11 @@ int dm_tree_activate_children(struct dm_tree_node *dnode, if (!_resume_node(child->name, child->info.major, child->info.minor, child->props.read_ahead, child->props.read_ahead_flags, - &newinfo, &child->dtree->cookie, child->udev_flags, child->info.suspended)) { + &child->info, &child->dtree->cookie, child->udev_flags, child->info.suspended)) { log_error("Unable to resume %s.", _node_name(child)); r = 0; continue; } - - /* Update cached info */ - child->info = newinfo; } if (awaiting_peer_rename) priority--; /* redo priority level */ @@ -2814,7 +2810,6 @@ int dm_tree_preload_children(struct dm_tree_node *dnode, int r = 1, node_created = 0; void *handle = NULL; struct dm_tree_node *child; - struct dm_info newinfo; int update_devs_flag = 0; /* Preload children first */ @@ -2870,7 +2865,7 @@ int dm_tree_preload_children(struct dm_tree_node *dnode, if (!_resume_node(child->name, child->info.major, child->info.minor, child->props.read_ahead, child->props.read_ahead_flags, - &newinfo, &child->dtree->cookie, child->udev_flags, + &child->info, &child->dtree->cookie, child->udev_flags, child->info.suspended)) { log_error("Unable to resume %s.", _node_name(child)); /* If the device was not previously active, we might as well remove this node. */ @@ -2883,7 +2878,7 @@ int dm_tree_preload_children(struct dm_tree_node *dnode, continue; } - if (!child->info.live_table) { + if (node_created) { /* Collect newly introduced devices for revert */ dm_list_add_h(&dnode->activated, &child->activated_list); @@ -2900,8 +2895,6 @@ int dm_tree_preload_children(struct dm_tree_node *dnode, } } - /* Update cached info */ - child->info = newinfo; /* * Prepare for immediate synchronization with udev and flush all stacked * dev node operations if requested by immediate_dev_node property. But

1 0

master - libdm: use delay_resume_if_extended
by Zdenek Kabelac 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=82ae02bc6a6788aabb10a… Commit: 82ae02bc6a6788aabb10ac8a95287feea37ab88c Parent: 297d5915c3c927cba3a63bc9d6d1747271d06641 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Dec 7 20:28:03 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Dec 7 21:00:39 2017 +0100 libdm: use delay_resume_if_extended Update the logic towards more explicit logic. Preload tree normally does not want to resume, only in certain cases of extension or new loaded nodes can be resumed. So introduce new internal variable delay_resume_if_extended controlable by target. Patch itself is not changing current existing behaviour, and rather documents existing problem in more readable way. lvm2 needs to introduce explicit mechanism how to support more fain-grained (and safe) logic to i.e. resize thin-pool which can be sitting on cached raid volume. --- libdm/libdm-deptree.c | 55 ++++++++++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 23 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index f463eab..745fec3 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -233,6 +233,19 @@ struct load_properties { unsigned delay_resume_if_new; /* + * Preload tree normally only loads and not resume, but there is + * automatic resume when target is extended, as it's believed + * there can be no i/o flying to this 'new' extedend space + * from any device above. Reason is that preloaded target above + * may actually need to see its bigger subdevice before it + * gets suspended. As long as devices are simple linears + * there is no problem to resume bigger device in preload (before commit). + * However complex targets like thin-pool (raid,cache...) + * they shall not be resumed before their commit. + */ + unsigned delay_resume_if_extended; + + /* * Call node_send_messages(), set to 2 if there are messages * When != 0, it validates matching transaction id, thus thin-pools * where transation_id is passed as 0 are never validated, this @@ -2745,6 +2758,18 @@ static int _load_node(struct dm_tree_node *dnode) PRIu64 " for %s.%s", existing_table_size, seg_start, _node_name(dnode), dnode->props.size_changed ? "" : " (Ignoring.)"); + + /* + * FIXME: code here has known design problem. + * LVM2 does NOT resize thin-pool on top of other LV in 2 steps - + * where raid would be resized with 1st. transaction + * followed by 2nd. thin-pool resize - RHBZ #1285063 + */ + if (existing_table_size && dnode->props.delay_resume_if_extended) { + log_debug_activation("Resume of table of extended device %s delayed.", + _node_name(dnode)); + dnode->props.size_changed = 0; + } } } @@ -2791,7 +2816,6 @@ int dm_tree_preload_children(struct dm_tree_node *dnode, struct dm_tree_node *child; struct dm_info newinfo; int update_devs_flag = 0; - struct load_segment *seg; /* Preload children first */ while ((child = dm_tree_next_child(&handle, dnode, 0))) { @@ -2816,6 +2840,10 @@ int dm_tree_preload_children(struct dm_tree_node *dnode, if (!child->info.exists && !(node_created = _create_node(child))) return_0; + /* Propagate delayed resume from exteded child node */ + if (child->props.delay_resume_if_extended) + dnode->props.delay_resume_if_extended = 1; + if (!child->info.inactive_table && child->props.segment_count && !_load_node(child)) { @@ -2833,32 +2861,10 @@ int dm_tree_preload_children(struct dm_tree_node *dnode, return_0; } - /* Propagate device size change change */ - if (child->props.size_changed > 0 && !dnode->props.size_changed) - dnode->props.size_changed = 1; - else if (child->props.size_changed < 0) - dnode->props.size_changed = -1; - /* No resume for a device without parents or with unchanged or smaller size */ if (!dm_tree_node_num_children(child, 1) || (child->props.size_changed <= 0)) continue; - if (!node_created && (dm_list_size(&child->props.segs) == 1)) { - /* If thin-pool child nodes were preloaded WITH changed size - * skip device resume, as this is likely resize of data or - * metadata device and so thin pool needs suspend before - * resume operation. - * Note: child->props.segment_count is already 0 here - */ - seg = dm_list_item(dm_list_last(&child->props.segs), - struct load_segment); - if (seg->type == SEG_THIN_POOL) { - log_debug_activation("Skipping resume of thin-pool %s.", - child->name); - continue; - } - } - if (!child->info.inactive_table && !child->info.suspended) continue; @@ -3527,6 +3533,9 @@ int dm_tree_node_add_thin_pool_target(struct dm_tree_node *node, seg->metadata->props.delay_resume_if_new = 0; seg->pool->props.delay_resume_if_new = 0; + /* Preload must not resume extended running thin-pool before it's committed */ + node->props.delay_resume_if_extended = 1; + /* Validate only transaction_id > 0 when activating thin-pool */ node->props.send_messages = transaction_id ? 1 : 0; seg->transaction_id = transaction_id;

1 0

master - libdm: avoid checking status on activation
by Zdenek Kabelac 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=297d5915c3c927cba3a63… Commit: 297d5915c3c927cba3a63bc9d6d1747271d06641 Parent: 4a4ea47f709287444f3b0d8e0581ce17e730ef4c Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Dec 7 17:52:01 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Dec 7 21:00:36 2017 +0100 libdm: avoid checking status on activation Variable props.send_messages has 3 states and was not used properly here. Activation in this moment does not need to verify thin-pool status as that has been already checked on preload. So only if there are some real messages (value 2) call function for sending them. --- WHATS_NEW_DM | 1 + libdm/libdm-deptree.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index dfa5a97..d9503c2 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.146 - ==================================== + Activation tree of thin pool skips duplicated check of pool status. Remove code supporting replicator target. Do not ignore failure of _info_by_dev(). Propagate delayed resume for pvmove subvolumes. diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index ef5da59..f463eab 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1920,7 +1920,7 @@ int dm_tree_activate_children(struct dm_tree_node *dnode, * resume should continue further, just whole command * has to report failure. */ - if (r && dnode->props.send_messages && + if (r && (dnode->props.send_messages > 1) && !(r = _node_send_messages(dnode, uuid_prefix, uuid_prefix_len, 1))) stack;

1 0

master - libdm: add help func _get_last_load_segment
by Zdenek Kabelac 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4a4ea47f709287444f3b0… Commit: 4a4ea47f709287444f3b0d8e0581ce17e730ef4c Parent: c3e224ad0ebd473268b171204c8985c9c642f590 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Dec 6 13:23:37 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Dec 7 20:59:37 2017 +0100 libdm: add help func _get_last_load_segment Share code for same functionality. --- libdm/libdm-deptree.c | 40 ++++++++++++++++++++++++---------------- 1 files changed, 24 insertions(+), 16 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 1ef1700..ef5da59 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1485,6 +1485,16 @@ out: return r; } +static struct load_segment *_get_last_load_segment(struct dm_tree_node *node) +{ + if (dm_list_empty(&node->props.segs)) { + log_error("Node %s is missing a segment.", _node_name(node)); + return NULL; + } + + return dm_list_item(dm_list_last(&node->props.segs), struct load_segment); +} + /* For preload pass only validate pool's transaction_id */ static int _node_send_messages(struct dm_tree_node *dnode, const char *uuid_prefix, @@ -1497,10 +1507,12 @@ static int _node_send_messages(struct dm_tree_node *dnode, const char *uuid; int have_messages; - if (!dnode->info.exists || (dm_list_size(&dnode->props.segs) != 1)) + if (!dnode->info.exists) return 1; - seg = dm_list_item(dm_list_last(&dnode->props.segs), struct load_segment); + if (!(seg = _get_last_load_segment(dnode))) + return_0; + if (seg->type != SEG_THIN_POOL) return 1; @@ -3146,12 +3158,8 @@ int dm_tree_node_add_mirror_target_log(struct dm_tree_node *node, struct dm_tree_node *log_node = NULL; struct load_segment *seg; - if (!node->props.segment_count) { - log_error(INTERNAL_ERROR "Attempt to add target area to missing segment."); - return 0; - } - - seg = dm_list_item(dm_list_last(&node->props.segs), struct load_segment); + if (!(seg = _get_last_load_segment(node))) + return_0; if (log_uuid) { if (!(seg->uuid = dm_pool_strdup(node->dtree->mem, log_uuid))) { @@ -3429,13 +3437,16 @@ static struct load_segment *_get_single_load_segment(struct dm_tree_node *node, { struct load_segment *seg; + if (!(seg = _get_last_load_segment(node))) + return_NULL; + + /* Never used past _load_node(), so can test segment_count */ if (node->props.segment_count != 1) { log_error("Node %s must have only one segment.", _dm_segtypes[type].target); return NULL; } - seg = dm_list_item(dm_list_last(&node->props.segs), struct load_segment); if (seg->type != type) { log_error("Node %s has segment type %s.", _dm_segtypes[type].target, @@ -3741,12 +3752,8 @@ int dm_tree_node_add_target_area(struct dm_tree_node *node, return_0; } - if (!node->props.segment_count) { - log_error(INTERNAL_ERROR "Attempt to add target area to missing segment."); - return 0; - } - - seg = dm_list_item(dm_list_last(&node->props.segs), struct load_segment); + if (!(seg = _get_last_load_segment(node))) + return_0; if (!_add_area(node, seg, dev_node, offset)) return_0; @@ -3758,7 +3765,8 @@ int dm_tree_node_add_null_area(struct dm_tree_node *node, uint64_t offset) { struct load_segment *seg; - seg = dm_list_item(dm_list_last(&node->props.segs), struct load_segment); + if (!(seg = _get_last_load_segment(node))) + return_0; switch (seg->type) { case SEG_RAID0:

1 0

master - thin: missing type is error
by Zdenek Kabelac 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c3e224ad0ebd473268b17… Commit: c3e224ad0ebd473268b171204c8985c9c642f590 Parent: 2208ebfe16e5b5cd54c762a5a06edd0681d62fa9 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Dec 6 13:21:01 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Dec 7 20:59:37 2017 +0100 thin: missing type is error --- libdm/libdm-deptree.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index b844a57..1ef1700 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1394,9 +1394,9 @@ static int _thin_pool_get_status(struct dm_tree_node *dnode, dm_get_next_target(dmt, NULL, &start, &length, &type, &params); - if (type && (strcmp(type, "thin-pool") != 0)) { + if (!type || (strcmp(type, "thin-pool") != 0)) { log_error("Expected thin-pool target for %s and got %s.", - _node_name(dnode), type); + _node_name(dnode), type ? : "no target"); goto out; }

1 0

master - thin: always clear memory before parsing status
by Zdenek Kabelac 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2208ebfe16e5b5cd54c76… Commit: 2208ebfe16e5b5cd54c762a5a06edd0681d62fa9 Parent: 2166d7be72c7371f0f94934625252646c5164a2c Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Dec 6 13:24:41 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Dec 7 20:59:28 2017 +0100 thin: always clear memory before parsing status Ensure there cannot be 'reused' any data from some previous call. --- WHATS_NEW | 1 + libdm/libdm-deptree.c | 2 +- libdm/libdm-targets.c | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index a5ec3e7..4659d55 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.177 - ==================================== + Ensure _node_send_message always uses clean status of thin pool. Fix lvmlockd to use pool lock when accessing _tmeta volume. Report expected sanlock_convert errors only when retries fail. Avoid blocking in sanlock_convert on SH to EX lock conversion. diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 34a1547..b844a57 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1493,7 +1493,7 @@ static int _node_send_messages(struct dm_tree_node *dnode, { struct load_segment *seg; struct thin_message *tmsg; - struct dm_status_thin_pool stp = { 0 }; + struct dm_status_thin_pool stp; const char *uuid; int have_messages; diff --git a/libdm/libdm-targets.c b/libdm/libdm-targets.c index 6577f07..990d275 100644 --- a/libdm/libdm-targets.c +++ b/libdm/libdm-targets.c @@ -350,6 +350,8 @@ int parse_thin_pool_status(const char *params, struct dm_status_thin_pool *s) { int pos; + memset(s, 0, sizeof(*s)); + if (!params) { log_error("Failed to parse invalid thin params."); return 0; @@ -406,7 +408,7 @@ int dm_get_status_thin_pool(struct dm_pool *mem, const char *params, { struct dm_status_thin_pool *s; - if (!(s = dm_pool_zalloc(mem, sizeof(struct dm_status_thin_pool)))) { + if (!(s = dm_pool_alloc(mem, sizeof(struct dm_status_thin_pool)))) { log_error("Failed to allocate thin_pool status structure."); return 0; }

1 0

master - lvmetad: drop stray underscore
by Alasdair Kergon 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2166d7be72c7371f0f949… Commit: 2166d7be72c7371f0f94934625252646c5164a2c Parent: d591d041033ce66f092becb285fc43f6fef63ee8 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Thu Dec 7 16:24:14 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Thu Dec 7 16:24:14 2017 +0000 lvmetad: drop stray underscore --- lib/cache/lvmetad.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c index 6755ed6..e1f829c 100644 --- a/lib/cache/lvmetad.c +++ b/lib/cache/lvmetad.c @@ -1519,7 +1519,7 @@ int lvmetad_vg_list_to_lvmcache(struct cmd_context *cmd) return 1; } -struct _extract_dl_baton { +struct extract_dl_baton { int i; struct dm_config_tree *cft; struct dm_config_node *pre_sib; @@ -1527,7 +1527,7 @@ struct _extract_dl_baton { static int _extract_mda(struct metadata_area *mda, void *baton) { - struct _extract_dl_baton *b = baton; + struct extract_dl_baton *b = baton; struct dm_config_node *cn; char id[32]; @@ -1548,7 +1548,7 @@ static int _extract_mda(struct metadata_area *mda, void *baton) static int _extract_disk_location(const char *name, struct disk_locn *dl, void *baton) { - struct _extract_dl_baton *b = baton; + struct extract_dl_baton *b = baton; struct dm_config_node *cn; char id[32]; @@ -1583,7 +1583,7 @@ static int _extract_ba(struct disk_locn *ba, void *baton) static int _extract_mdas(struct lvmcache_info *info, struct dm_config_tree *cft, struct dm_config_node *pre_sib) { - struct _extract_dl_baton baton = { .cft = cft }; + struct extract_dl_baton baton = { .cft = cft }; if (!lvmcache_foreach_mda(info, &_extract_mda, &baton)) return 0;

1 0

master - device: Tag I/O for each mda on a device separately in log messages.
by Alasdair Kergon 07 Dec '17

07 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d591d041033ce66f092be… Commit: d591d041033ce66f092becb285fc43f6fef63ee8 Parent: 54154dc6f11ae869228cf9f36dc5ae919e861caa Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Thu Dec 7 03:34:59 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Thu Dec 7 03:48:11 2017 +0000 device: Tag I/O for each mda on a device separately in log messages. Mark the first metadata area on each text format PV as MDA_PRIMARY. Pass this information down to the device layer so that when there are two metadata areas on a block device, we can easily distinguish two independent streams of I/O. --- lib/config/config.c | 6 ++-- lib/config/config.h | 4 +- lib/device/dev-io.c | 2 + lib/device/device.h | 2 + lib/format_text/format-text.c | 73 ++++++++++++++++++++------------------- lib/format_text/import-export.h | 4 +- lib/format_text/import.c | 10 +++--- lib/format_text/layout.h | 4 +- lib/format_text/text_label.c | 20 ++++++++--- lib/metadata/metadata.h | 7 ++++ 10 files changed, 77 insertions(+), 55 deletions(-) diff --git a/lib/config/config.c b/lib/config/config.c index 947cb7b..8fca372 100644 --- a/lib/config/config.c +++ b/lib/config/config.c @@ -494,7 +494,7 @@ int override_config_tree_from_profile(struct cmd_context *cmd, * and function avoids parsing of mda into config tree which * remains unmodified and should not be used. */ -int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, +int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, dev_io_reason_t reason, off_t offset, size_t size, off_t offset2, size_t size2, checksum_fn_t checksum_fn, uint32_t checksum, int checksum_only, int no_dup_node_check) @@ -533,7 +533,7 @@ int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, return 0; } if (!dev_read_circular(dev, (uint64_t) offset, size, - (uint64_t) offset2, size2, DEV_IO_MDA_CONTENT, buf)) { + (uint64_t) offset2, size2, reason, buf)) { goto out; } fb = buf; @@ -601,7 +601,7 @@ int config_file_read(struct dm_config_tree *cft) } } - r = config_file_read_fd(cft, cf->dev, 0, (size_t) info.st_size, 0, 0, + r = config_file_read_fd(cft, cf->dev, DEV_IO_MDA_CONTENT, 0, (size_t) info.st_size, 0, 0, (checksum_fn_t) NULL, 0, 0, 0); if (!cf->keep_open) { diff --git a/lib/config/config.h b/lib/config/config.h index 901994a..d01306b 100644 --- a/lib/config/config.h +++ b/lib/config/config.h @@ -17,12 +17,12 @@ #define _LVM_CONFIG_H #include "libdevmapper.h" +#include "device.h" /* 16 bits: 3 bits for major, 4 bits for minor, 9 bits for patchlevel */ /* FIXME Max LVM version supported: 7.15.511. Extend bits when needed. */ #define vsn(major, minor, patchlevel) (major << 13 | minor << 9 | patchlevel) -struct device; struct cmd_context; typedef enum { @@ -239,7 +239,7 @@ config_source_t config_get_source_type(struct dm_config_tree *cft); typedef uint32_t (*checksum_fn_t) (uint32_t initial, const uint8_t *buf, uint32_t size); struct dm_config_tree *config_open(config_source_t source, const char *filename, int keep_open); -int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, +int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, dev_io_reason_t reason, off_t offset, size_t size, off_t offset2, size_t size2, checksum_fn_t checksum_fn, uint32_t checksum, int skip_parse, int no_dup_node_check); diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c index f77494f..a9a9aac 100644 --- a/lib/device/dev-io.c +++ b/lib/device/dev-io.c @@ -61,6 +61,8 @@ static const char *_reasons[] = { "PV labels", "VG metadata header", "VG metadata content", + "extra VG metadata header", + "extra VG metadata content", "LVM1 metadata", "pool metadata", "LV content", diff --git a/lib/device/device.h b/lib/device/device.h index 254edfe..503373f 100644 --- a/lib/device/device.h +++ b/lib/device/device.h @@ -87,6 +87,8 @@ typedef enum dev_io_reason { DEV_IO_LABEL, /* LVM PV disk label */ DEV_IO_MDA_HEADER, /* Text format metadata area header */ DEV_IO_MDA_CONTENT, /* Text format metadata area content */ + DEV_IO_MDA_EXTRA_HEADER, /* Header of any extra metadata areas on device */ + DEV_IO_MDA_EXTRA_CONTENT, /* Content of any extra metadata areas on device */ DEV_IO_FMT1, /* Original LVM1 metadata format */ DEV_IO_POOL, /* Pool metadata format */ DEV_IO_LV, /* Content written to an LV */ diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 31d92a5..09ce693 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -190,7 +190,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))) + if (!(mdah = raw_read_mda_header(fmt, area, mda_is_primary(mda)))) goto_out; rlocn = mdah->raw_locns; @@ -230,7 +230,7 @@ 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, DEV_IO_MDA_CONTENT, buf)) + if (!dev_read_circular(area->dev, offset, size, offset2, size2, MDA_CONTENT_REASON(mda_is_primary(mda)), buf)) goto_out; /* @@ -315,12 +315,12 @@ static void _xlate_mdah(struct mda_header *mdah) } } -static int _raw_read_mda_header(struct mda_header *mdah, struct device_area *dev_area) +static int _raw_read_mda_header(struct mda_header *mdah, struct device_area *dev_area, int primary_mda) { if (!dev_open_readonly(dev_area->dev)) return_0; - if (!dev_read(dev_area->dev, dev_area->start, MDA_HEADER_SIZE, DEV_IO_MDA_HEADER, mdah)) { + if (!dev_read(dev_area->dev, dev_area->start, MDA_HEADER_SIZE, MDA_HEADER_REASON(primary_mda), mdah)) { if (!dev_close(dev_area->dev)) stack; return_0; @@ -365,7 +365,7 @@ static int _raw_read_mda_header(struct mda_header *mdah, struct device_area *dev } struct mda_header *raw_read_mda_header(const struct format_type *fmt, - struct device_area *dev_area) + struct device_area *dev_area, int primary_mda) { struct mda_header *mdah; @@ -374,7 +374,7 @@ struct mda_header *raw_read_mda_header(const struct format_type *fmt, return NULL; } - if (!_raw_read_mda_header(mdah, dev_area)) { + if (!_raw_read_mda_header(mdah, dev_area, primary_mda)) { dm_pool_free(fmt->cmd->mem, mdah); return NULL; } @@ -383,7 +383,7 @@ struct mda_header *raw_read_mda_header(const struct format_type *fmt, } static int _raw_write_mda_header(const struct format_type *fmt, - struct device *dev, + struct device *dev, int primary_mda, uint64_t start_byte, struct mda_header *mdah) { strncpy((char *)mdah->magic, FMTT_MAGIC, sizeof(mdah->magic)); @@ -395,14 +395,14 @@ static int _raw_write_mda_header(const struct format_type *fmt, MDA_HEADER_SIZE - sizeof(mdah->checksum_xl))); - if (!dev_write(dev, start_byte, MDA_HEADER_SIZE, DEV_IO_MDA_HEADER, mdah)) + if (!dev_write(dev, start_byte, MDA_HEADER_SIZE, MDA_HEADER_REASON(primary_mda), mdah)) return_0; return 1; } static struct raw_locn *_find_vg_rlocn(struct device_area *dev_area, - struct mda_header *mdah, + struct mda_header *mdah, int primary_mda, const char *vgname, int *precommitted) { @@ -449,7 +449,7 @@ 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), DEV_IO_MDA_CONTENT, vgnamebuf)) + sizeof(vgnamebuf), MDA_CONTENT_REASON(primary_mda), vgnamebuf)) goto_bad; if (!strncmp(vgnamebuf, vgname, len = strlen(vgname)) && @@ -497,10 +497,10 @@ 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))) + if (!(mdah = raw_read_mda_header(fid->fmt, dev_area, 0))) return_0; - if (_find_vg_rlocn(dev_area, mdah, vgname, &noprecommit)) + if (_find_vg_rlocn(dev_area, mdah, 0, vgname, &noprecommit)) r = 1; if (!dev_close(dev_area->dev)) @@ -515,7 +515,7 @@ static struct volume_group *_vg_read_raw_area(struct format_instance *fid, struct cached_vg_fmtdata **vg_fmtdata, unsigned *use_previous_vg, int precommitted, - int single_device) + int single_device, int primary_mda) { struct volume_group *vg = NULL; struct raw_locn *rlocn; @@ -524,10 +524,10 @@ 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))) + if (!(mdah = raw_read_mda_header(fid->fmt, area, primary_mda))) goto_out; - if (!(rlocn = _find_vg_rlocn(area, mdah, vgname, &precommitted))) { + if (!(rlocn = _find_vg_rlocn(area, mdah, primary_mda, vgname, &precommitted))) { log_debug_metadata("VG %s not found on %s", vgname, dev_name(area->dev)); goto out; } @@ -543,6 +543,7 @@ static struct volume_group *_vg_read_raw_area(struct format_instance *fid, /* FIXME 64-bit */ if (!(vg = text_vg_import_fd(fid, NULL, vg_fmtdata, use_previous_vg, single_device, area->dev, + primary_mda, (off_t) (area->start + rlocn->offset), (uint32_t) (rlocn->size - wrap), (off_t) (area->start + MDA_HEADER_SIZE), @@ -581,7 +582,7 @@ static struct volume_group *_vg_read_raw(struct format_instance *fid, if (!dev_open_readonly(mdac->area.dev)) return_NULL; - vg = _vg_read_raw_area(fid, vgname, &mdac->area, vg_fmtdata, use_previous_vg, 0, single_device); + vg = _vg_read_raw_area(fid, vgname, &mdac->area, vg_fmtdata, use_previous_vg, 0, single_device, mda_is_primary(mda)); if (!dev_close(mdac->area.dev)) stack; @@ -601,7 +602,7 @@ static struct volume_group *_vg_read_precommit_raw(struct format_instance *fid, if (!dev_open_readonly(mdac->area.dev)) return_NULL; - vg = _vg_read_raw_area(fid, vgname, &mdac->area, vg_fmtdata, use_previous_vg, 1, 0); + vg = _vg_read_raw_area(fid, vgname, &mdac->area, vg_fmtdata, use_previous_vg, 1, 0, mda_is_primary(mda)); if (!dev_close(mdac->area.dev)) stack; @@ -639,10 +640,10 @@ 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))) + if (!(mdah = raw_read_mda_header(fid->fmt, &mdac->area, mda_is_primary(mda)))) goto_out; - rlocn = _find_vg_rlocn(&mdac->area, mdah, old_vg_name ? : vg->name, &noprecommit); + rlocn = _find_vg_rlocn(&mdac->area, mdah, mda_is_primary(mda), old_vg_name ? : vg->name, &noprecommit); mdac->rlocn.offset = _next_rlocn_offset(rlocn, mdah); if (!fidtc->raw_metadata_buf && @@ -677,7 +678,7 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, /* Write text out, circularly */ if (!dev_write(mdac->area.dev, mdac->area.start + mdac->rlocn.offset, - (size_t) (mdac->rlocn.size - new_wrap), DEV_IO_MDA_CONTENT, + (size_t) (mdac->rlocn.size - new_wrap), MDA_CONTENT_REASON(mda_is_primary(mda)), fidtc->raw_metadata_buf)) goto_out; @@ -687,7 +688,7 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, MDA_HEADER_SIZE, new_wrap); if (!dev_write(mdac->area.dev, mdac->area.start + MDA_HEADER_SIZE, - (size_t) new_wrap, DEV_IO_MDA_CONTENT, + (size_t) new_wrap, MDA_CONTENT_REASON(mda_is_primary(mda)), fidtc->raw_metadata_buf + mdac->rlocn.size - new_wrap)) goto_out; } @@ -743,10 +744,10 @@ static int _vg_commit_raw_rlocn(struct format_instance *fid, if (!found) return 1; - if (!(mdah = raw_read_mda_header(fid->fmt, &mdac->area))) + if (!(mdah = raw_read_mda_header(fid->fmt, &mdac->area, mda_is_primary(mda)))) goto_out; - if (!(rlocn = _find_vg_rlocn(&mdac->area, mdah, old_vg_name ? : vg->name, &noprecommit))) { + if (!(rlocn = _find_vg_rlocn(&mdac->area, mdah, mda_is_primary(mda), old_vg_name ? : vg->name, &noprecommit))) { mdah->raw_locns[0].offset = 0; mdah->raw_locns[0].size = 0; mdah->raw_locns[0].checksum = 0; @@ -793,7 +794,7 @@ static int _vg_commit_raw_rlocn(struct format_instance *fid, rlocn_set_ignored(mdah->raw_locns, mda_is_ignored(mda)); - if (!_raw_write_mda_header(fid->fmt, mdac->area.dev, mdac->area.start, + if (!_raw_write_mda_header(fid->fmt, mdac->area.dev, mda_is_primary(mda), mdac->area.start, mdah)) { dm_pool_free(fid->fmt->cmd->mem, mdah); log_error("Failed to write metadata area header"); @@ -863,10 +864,10 @@ 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))) + if (!(mdah = raw_read_mda_header(fid->fmt, &mdac->area, mda_is_primary(mda)))) goto_out; - if (!(rlocn = _find_vg_rlocn(&mdac->area, mdah, vg->name, &noprecommit))) { + if (!(rlocn = _find_vg_rlocn(&mdac->area, mdah, mda_is_primary(mda), vg->name, &noprecommit))) { rlocn = &mdah->raw_locns[0]; mdah->raw_locns[1].offset = 0; } @@ -876,7 +877,7 @@ static int _vg_remove_raw(struct format_instance *fid, struct volume_group *vg, rlocn->checksum = 0; rlocn_set_ignored(mdah->raw_locns, mda_is_ignored(mda)); - if (!_raw_write_mda_header(fid->fmt, mdac->area.dev, mdac->area.start, + if (!_raw_write_mda_header(fid->fmt, mdac->area.dev, mda_is_primary(mda), mdac->area.start, mdah)) { dm_pool_free(fid->fmt->cmd->mem, mdah); log_error("Failed to write metadata area header"); @@ -1172,7 +1173,7 @@ static int _scan_file(const struct format_type *fmt, const char *vgname) } int vgname_from_mda(const struct format_type *fmt, - struct mda_header *mdah, struct device_area *dev_area, + struct mda_header *mdah, int primary_mda, struct device_area *dev_area, struct lvmcache_vgsummary *vgsummary, uint64_t *mda_free_sectors) { struct raw_locn *rlocn; @@ -1204,7 +1205,7 @@ 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, DEV_IO_MDA_CONTENT, buf)) + NAME_LEN, MDA_CONTENT_REASON(primary_mda), buf)) return_0; while (buf[len] && !isspace(buf[len]) && buf[len] != '{' && @@ -1235,7 +1236,7 @@ int vgname_from_mda(const struct format_type *fmt, used_cached_metadata = 1; /* FIXME 64-bit */ - if (!text_vgsummary_import(fmt, dev_area->dev, + if (!text_vgsummary_import(fmt, dev_area->dev, MDA_CONTENT_REASON(primary_mda), (off_t) (dev_area->start + rlocn->offset), (uint32_t) (rlocn->size - wrap), (off_t) (dev_area->start + MDA_HEADER_SIZE), @@ -1292,14 +1293,14 @@ static int _scan_raw(const struct format_type *fmt, const char *vgname __attribu continue; } - if (!(mdah = raw_read_mda_header(fmt, &rl->dev_area))) { + if (!(mdah = raw_read_mda_header(fmt, &rl->dev_area, 0))) { stack; goto close_dev; } /* TODO: caching as in vgname_from_mda() (trigger this code?) */ - if (vgname_from_mda(fmt, mdah, &rl->dev_area, &vgsummary, NULL)) { - vg = _vg_read_raw_area(&fid, vgsummary.vgname, &rl->dev_area, NULL, NULL, 0, 0); + if (vgname_from_mda(fmt, mdah, 0, &rl->dev_area, &vgsummary, NULL)) { + vg = _vg_read_raw_area(&fid, vgsummary.vgname, &rl->dev_area, NULL, NULL, 0, 0, 0); if (vg) lvmcache_update_vg(vg, 0); } @@ -1333,7 +1334,7 @@ static int _write_single_mda(struct metadata_area *mda, void *baton) mdah->size = mdac->area.size; rlocn_set_ignored(mdah->raw_locns, mda_is_ignored(mda)); - if (!_raw_write_mda_header(p->fmt, mdac->area.dev, + if (!_raw_write_mda_header(p->fmt, mdac->area.dev, mda_is_primary(mda), mdac->area.start, mdah)) { if (!dev_close(p->pv->dev)) stack; @@ -1772,7 +1773,7 @@ static int _mda_export_text_raw(struct metadata_area *mda, struct mda_context *mdc = (struct mda_context *) mda->metadata_locn; char mdah[MDA_HEADER_SIZE]; /* temporary */ - if (!mdc || !_raw_read_mda_header((struct mda_header *)mdah, &mdc->area)) + if (!mdc || !_raw_read_mda_header((struct mda_header *)mdah, &mdc->area, mda_is_primary(mda))) return 1; /* pretend the MDA does not exist */ return config_make_nodes(cft, parent, NULL, @@ -2314,7 +2315,7 @@ static int _text_pv_add_metadata_area(const struct format_type *fmt, /* Wipe metadata area with zeroes. */ if (!dev_set(pv->dev, mda_start, (size_t) ((mda_size > wipe_size) ? wipe_size : mda_size), - DEV_IO_MDA_HEADER, 0)) { + MDA_HEADER_REASON(!mda_index), 0)) { log_error("Failed to wipe new metadata area " "at the %s of the %s", mda_index ? "end" : "start", diff --git a/lib/format_text/import-export.h b/lib/format_text/import-export.h index 2f39e2a..894d881 100644 --- a/lib/format_text/import-export.h +++ b/lib/format_text/import-export.h @@ -76,7 +76,7 @@ struct volume_group *text_vg_import_fd(struct format_instance *fid, struct cached_vg_fmtdata **vg_fmtdata, unsigned *use_previous_vg, int single_device, - struct device *dev, + struct device *dev, int primary_mda, off_t offset, uint32_t size, off_t offset2, uint32_t size2, checksum_fn_t checksum_fn, @@ -84,7 +84,7 @@ struct volume_group *text_vg_import_fd(struct format_instance *fid, time_t *when, char **desc); int text_vgsummary_import(const struct format_type *fmt, - struct device *dev, + struct device *dev, dev_io_reason_t reason, off_t offset, uint32_t size, off_t offset2, uint32_t size2, checksum_fn_t checksum_fn, diff --git a/lib/format_text/import.c b/lib/format_text/import.c index 62dee8f..da4cefd 100644 --- a/lib/format_text/import.c +++ b/lib/format_text/import.c @@ -36,7 +36,7 @@ static void _init_text_import(void) * Find out vgname on a given device. */ int text_vgsummary_import(const struct format_type *fmt, - struct device *dev, + struct device *dev, dev_io_reason_t reason, off_t offset, uint32_t size, off_t offset2, uint32_t size2, checksum_fn_t checksum_fn, @@ -53,7 +53,7 @@ int text_vgsummary_import(const struct format_type *fmt, return_0; if ((!dev && !config_file_read(cft)) || - (dev && !config_file_read_fd(cft, dev, offset, size, + (dev && !config_file_read_fd(cft, dev, reason, offset, size, offset2, size2, checksum_fn, vgsummary->mda_checksum, checksum_only, 1))) { @@ -96,7 +96,7 @@ struct volume_group *text_vg_import_fd(struct format_instance *fid, struct cached_vg_fmtdata **vg_fmtdata, unsigned *use_previous_vg, int single_device, - struct device *dev, + struct device *dev, int primary_mda, off_t offset, uint32_t size, off_t offset2, uint32_t size2, checksum_fn_t checksum_fn, @@ -128,7 +128,7 @@ struct volume_group *text_vg_import_fd(struct format_instance *fid, ((*vg_fmtdata)->cached_mda_size == (size + size2)); if ((!dev && !config_file_read(cft)) || - (dev && !config_file_read_fd(cft, dev, offset, size, + (dev && !config_file_read_fd(cft, dev, MDA_CONTENT_REASON(primary_mda), offset, size, offset2, size2, checksum_fn, checksum, skip_parse, 1))) goto_out; @@ -170,7 +170,7 @@ struct volume_group *text_vg_import_file(struct format_instance *fid, const char *file, time_t *when, char **desc) { - return text_vg_import_fd(fid, file, NULL, NULL, 0, NULL, (off_t)0, 0, (off_t)0, 0, NULL, 0, + return text_vg_import_fd(fid, file, NULL, NULL, 0, NULL, 0, (off_t)0, 0, (off_t)0, 0, NULL, 0, when, desc); } diff --git a/lib/format_text/layout.h b/lib/format_text/layout.h index 75a935b..c88812f 100644 --- a/lib/format_text/layout.h +++ b/lib/format_text/layout.h @@ -81,7 +81,7 @@ struct mda_header { } __attribute__ ((packed)); struct mda_header *raw_read_mda_header(const struct format_type *fmt, - struct device_area *dev_area); + struct device_area *dev_area, int primary_mda); struct mda_lists { struct dm_list dirs; @@ -103,7 +103,7 @@ struct mda_context { #define LVM2_LABEL "LVM2 001" #define MDA_SIZE_MIN (8 * (unsigned) lvm_getpagesize()) -int vgname_from_mda(const struct format_type *fmt, struct mda_header *mdah, +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, uint64_t *mda_free_sectors); diff --git a/lib/format_text/text_label.c b/lib/format_text/text_label.c index 6d9cfbd..c567709 100644 --- a/lib/format_text/text_label.c +++ b/lib/format_text/text_label.c @@ -245,9 +245,9 @@ int add_mda(const struct format_type *fmt, struct dm_pool *mem, struct dm_list * struct device *dev, uint64_t start, uint64_t size, unsigned ignored) { /* FIXME List size restricted by pv_header SECTOR_SIZE */ - struct metadata_area *mdal; + struct metadata_area *mdal, *mda; struct mda_lists *mda_lists = (struct mda_lists *) fmt->private; - struct mda_context *mdac; + struct mda_context *mdac, *mdac2; if (!mem) { if (!(mdal = dm_malloc(sizeof(struct metadata_area)))) { @@ -274,13 +274,23 @@ int add_mda(const struct format_type *fmt, struct dm_pool *mem, struct dm_list * mdal->ops = mda_lists->raw_ops; mdal->metadata_locn = mdac; - mdal->status = 0; mdac->area.dev = dev; mdac->area.start = start; mdac->area.size = size; mdac->free_sectors = UINT64_C(0); memset(&mdac->rlocn, 0, sizeof(mdac->rlocn)); + + /* Set MDA_PRIMARY only if this is the first metadata area on this device. */ + mdal->status = MDA_PRIMARY; + dm_list_iterate_items(mda, mdas) { + mdac2 = mda->metadata_locn; + if (mdac2->area.dev == dev) { + mdal->status = 0; + break; + } + } + mda_set_ignored(mdal, ignored); dm_list_add(mdas, &mdal->list); @@ -334,7 +344,7 @@ static int _update_mda(struct metadata_area *mda, void *baton) return 1; } - if (!(mdah = raw_read_mda_header(fmt, &mdac->area))) { + if (!(mdah = raw_read_mda_header(fmt, &mdac->area, mda_is_primary(mda)))) { stack; goto close_dev; } @@ -350,7 +360,7 @@ static int _update_mda(struct metadata_area *mda, void *baton) return 1; } - if (vgname_from_mda(fmt, mdah, &mdac->area, &vgsummary, + if (vgname_from_mda(fmt, mdah, mda_is_primary(mda), &mdac->area, &vgsummary, &mdac->free_sectors) && !lvmcache_update_vgname_and_id(p->info, &vgsummary)) { if (!dev_close(mdac->area.dev)) diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h index 0de9ed8..3a4abc3 100644 --- a/lib/metadata/metadata.h +++ b/lib/metadata/metadata.h @@ -162,6 +162,13 @@ struct metadata_area_ops { #define MDA_INCONSISTENT 0x00000002 #define MDA_FAILED 0x00000004 +/* The primary metadata area on a device if the format supports more than one. */ +#define MDA_PRIMARY 0x00000008 + +#define mda_is_primary(mda) (((mda->status) & MDA_PRIMARY) ? 1 : 0) +#define MDA_CONTENT_REASON(primary_mda) ((primary_mda) ? DEV_IO_MDA_CONTENT : DEV_IO_MDA_EXTRA_CONTENT) +#define MDA_HEADER_REASON(primary_mda) ((primary_mda) ? DEV_IO_MDA_HEADER : DEV_IO_MDA_EXTRA_HEADER) + struct metadata_area { struct dm_list list; struct metadata_area_ops *ops;

1 0

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

06 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=54154dc6f11ae869228cf… Commit: 54154dc6f11ae869228cf9f36dc5ae919e861caa Parent: 0f0f6978e76f2ee55da51b378d951f6e81d7e32d Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Dec 6 10:48:32 2017 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Dec 6 10:49:31 2017 -0600 lvmlockd: clear coverity complaint --- lib/locking/lvmlockd.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lib/locking/lvmlockd.c b/lib/locking/lvmlockd.c index eb7076c..0365797 100644 --- a/lib/locking/lvmlockd.c +++ b/lib/locking/lvmlockd.c @@ -2163,7 +2163,8 @@ static int _lockd_lv_thin(struct cmd_context *cmd, struct logical_volume *lv, } else if (lv_is_thin_pool_metadata(lv)) { struct lv_segment *pool_seg = get_only_segment_using_this_lv(lv); - pool_lv = pool_seg->lv; + if (pool_seg) + pool_lv = pool_seg->lv; } else { /* This should not happen AFAIK. */

1 0

master - lvmlock: return an error if lvb cannot be written
by David Teigland 06 Dec '17

06 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0f0f6978e76f2ee55da51… Commit: 0f0f6978e76f2ee55da51b378d951f6e81d7e32d Parent: 9e4dc8324117165358f2e329e5f9a5b9f27b1e0a Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Dec 6 10:42:43 2017 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Dec 6 10:49:31 2017 -0600 lvmlock: return an error if lvb cannot be written It doesn't make much difference, because if this happens, it means there are other more significant problems. --- daemons/lvmlockd/lvmlockd-sanlock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemons/lvmlockd/lvmlockd-sanlock.c b/daemons/lvmlockd/lvmlockd-sanlock.c index 2171c7a..16db2d6 100644 --- a/daemons/lvmlockd/lvmlockd-sanlock.c +++ b/daemons/lvmlockd/lvmlockd-sanlock.c @@ -1675,7 +1675,7 @@ int lm_convert_sanlock(struct lockspace *ls, struct resource *r, if (rv < 0) { log_error("S %s R %s convert_san set_lvb error %d", ls->name, r->name, rv); - rv = -ELMERR; + return -ELMERR; } } @@ -1810,7 +1810,7 @@ int lm_unlock_sanlock(struct lockspace *ls, struct resource *r, if (rv < 0) { log_error("S %s R %s unlock_san set_lvb error %d", ls->name, r->name, rv); - rv = -ELMERR; + return -ELMERR; } }

1 0

master - Update WHATS_NEW
by Marian Csontos 06 Dec '17

06 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9e4dc8324117165358f2e… Commit: 9e4dc8324117165358f2e329e5f9a5b9f27b1e0a Parent: b910c34f09f45987fe56f0e90455a166e047144c Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Wed Dec 6 10:41:14 2017 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Wed Dec 6 10:41:14 2017 +0100 Update WHATS_NEW --- WHATS_NEW | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 674e7f1..a5ec3e7 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,7 +1,12 @@ Version 2.02.177 - ==================================== + Fix lvmlockd to use pool lock when accessing _tmeta volume. + Report expected sanlock_convert errors only when retries fail. + Avoid blocking in sanlock_convert on SH to EX lock conversion. + Deactivate missing raid LV legs (_rimage_X-missing_Y_Z) on decativation. Skip read-modify-write when entire block is replaced. Categorise I/O with reason annotations in debug messages. + Allow extending of raid LVs created with --nosync after a failed repair. Command will lock memory only when suspending volumes. Merge segments when pvmove is finished. Remove label_verify that has never been used.

1 0

master - lvmlockd: use pool lock for tmeta access
by David Teigland 05 Dec '17

05 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b910c34f09f45987fe56f… Commit: b910c34f09f45987fe56f0e90455a166e047144c Parent: b9e419850086473d4309c5211852b0237020421d Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Dec 5 14:31:03 2017 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Dec 5 14:31:03 2017 -0600 lvmlockd: use pool lock for tmeta access When a command is run on a named tmeta LV, use the lock on the pool. --- lib/locking/lvmlockd.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/lib/locking/lvmlockd.c b/lib/locking/lvmlockd.c index d8bb818..eb7076c 100644 --- a/lib/locking/lvmlockd.c +++ b/lib/locking/lvmlockd.c @@ -2161,6 +2161,10 @@ static int _lockd_lv_thin(struct cmd_context *cmd, struct logical_volume *lv, /* FIXME: there should be a function to get pool lv from data lv. */ pool_lv = lv_parent(lv); + } else if (lv_is_thin_pool_metadata(lv)) { + struct lv_segment *pool_seg = get_only_segment_using_this_lv(lv); + pool_lv = pool_seg->lv; + } else { /* This should not happen AFAIK. */ log_error("Lock on incorrect thin lv type %s/%s",

1 0

master - lvmlockd: fix log print
by David Teigland 05 Dec '17

05 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b9e419850086473d4309c… Commit: b9e419850086473d4309c5211852b0237020421d Parent: 5d5807b238f12cbe1e3ba7bbb31e2db2f08ed173 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Dec 5 13:48:30 2017 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Dec 5 13:48:30 2017 -0600 lvmlockd: fix log print from previous commit --- lib/locking/lvmlockd.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/locking/lvmlockd.c b/lib/locking/lvmlockd.c index 5870d05..d8bb818 100644 --- a/lib/locking/lvmlockd.c +++ b/lib/locking/lvmlockd.c @@ -1920,11 +1920,11 @@ int lockd_vg(struct cmd_context *cmd, const char *vg_name, const char *def_mode, ret = 1; goto out; } else if (!strcmp(mode, "sh")) { - log_warn("VG %s lock skipped: held by other host.", vg_name, result); + log_warn("VG %s lock skipped: held by other host.", vg_name); ret = 1; goto out; } else { - log_error("VG %s lock failed: held by other host.", vg_name, result); + log_error("VG %s lock failed: held by other host.", vg_name); ret = 0; goto out; }

1 0

master - lvmlockd: improve error message for VG lock conflict
by David Teigland 05 Dec '17

05 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5d5807b238f12cbe1e3ba… Commit: 5d5807b238f12cbe1e3ba7bbb31e2db2f08ed173 Parent: 46d6f7a6393d1d99411d7896285f6f1556de8547 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Nov 29 15:54:44 2017 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Dec 5 11:53:03 2017 -0600 lvmlockd: improve error message for VG lock conflict When there is significant VG lock contention which retries have not been able to mask, print a better error message. --- lib/locking/lvmlockd.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/lib/locking/lvmlockd.c b/lib/locking/lvmlockd.c index 325549a..5870d05 100644 --- a/lib/locking/lvmlockd.c +++ b/lib/locking/lvmlockd.c @@ -1913,6 +1913,23 @@ int lockd_vg(struct cmd_context *cmd, const char *vg_name, const char *def_mode, } /* + * The lock is held by another host, and retries have been unsuccessful. + */ + if (result == -EAGAIN) { + if (!strcmp(mode, "un")) { + ret = 1; + goto out; + } else if (!strcmp(mode, "sh")) { + log_warn("VG %s lock skipped: held by other host.", vg_name, result); + ret = 1; + goto out; + } else { + log_error("VG %s lock failed: held by other host.", vg_name, result); + ret = 0; + goto out; + } + } + /* * No lockspace for the VG was found. It may be a local * VG that lvmlockd doesn't keep track of, or it may be * a lockd VG that lvmlockd doesn't yet know about (it hasn't

1 0

master - lvmlockd: recognize normal errors from sanlock_convert
by David Teigland 05 Dec '17

05 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=46d6f7a6393d1d99411d7… Commit: 46d6f7a6393d1d99411d7896285f6f1556de8547 Parent: bd893348b415d4e604a7f9a503f17623d485e76e Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Nov 29 15:17:25 2017 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Dec 5 11:53:03 2017 -0600 lvmlockd: recognize normal errors from sanlock_convert Don't log an error message for error values returned by sanlock_convert for expected conditions like lock contention or io timeouts. --- daemons/lvmlockd/lvmlockd-core.c | 9 ++++----- daemons/lvmlockd/lvmlockd-sanlock.c | 20 +++++++++++++++----- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/daemons/lvmlockd/lvmlockd-core.c b/daemons/lvmlockd/lvmlockd-core.c index a921140..df6e214 100644 --- a/daemons/lvmlockd/lvmlockd-core.c +++ b/daemons/lvmlockd/lvmlockd-core.c @@ -1389,12 +1389,11 @@ static int res_convert(struct lockspace *ls, struct resource *r, } rv = lm_convert(ls, r, act->mode, act, r_version); - if (rv < 0) { - log_error("S %s R %s res_convert lm error %d", ls->name, r->name, rv); - return rv; - } - log_debug("S %s R %s res_convert lm done", ls->name, r->name); + log_debug("S %s R %s res_convert rv %d", ls->name, r->name, rv); + + if (rv < 0) + return rv; if (lk->mode == LD_LK_EX && act->mode == LD_LK_SH) { r->sh_count = 1; diff --git a/daemons/lvmlockd/lvmlockd-sanlock.c b/daemons/lvmlockd/lvmlockd-sanlock.c index 079e952..2171c7a 100644 --- a/daemons/lvmlockd/lvmlockd-sanlock.c +++ b/daemons/lvmlockd/lvmlockd-sanlock.c @@ -1699,12 +1699,22 @@ int lm_convert_sanlock(struct lockspace *ls, struct resource *r, flags |= SANLK_ACQUIRE_OWNER_NOWAIT; rv = sanlock_convert(lms->sock, -1, flags, rs); - if (rv == -EAGAIN) { - /* FIXME: When could this happen? Should something different be done? */ - log_error("S %s R %s convert_san EAGAIN", ls->name, r->name); + if (!rv) + return 0; + + switch (rv) { + case -EAGAIN: + case SANLK_ACQUIRE_IDLIVE: + case SANLK_ACQUIRE_OWNED: + case SANLK_ACQUIRE_OWNED_RETRY: + case SANLK_ACQUIRE_OTHER: + case SANLK_AIO_TIMEOUT: + case SANLK_DBLOCK_LVER: + case SANLK_DBLOCK_MBAL: + /* expected errors from known/normal cases like lock contention or io timeouts */ + log_debug("S %s R %s convert_san error %d", ls->name, r->name, rv); return -EAGAIN; - } - if (rv < 0) { + default: log_error("S %s R %s convert_san convert error %d", ls->name, r->name, rv); rv = -ELMERR; }

1 0

master - lvmlockd: avoid blocking in sanlock_convert
by David Teigland 05 Dec '17

05 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=bd893348b415d4e604a7f… Commit: bd893348b415d4e604a7f9a503f17623d485e76e Parent: 94632eb155a0a1814e69b1baa0516323cbbae648 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Nov 29 14:59:11 2017 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Dec 5 11:53:03 2017 -0600 lvmlockd: avoid blocking in sanlock_convert Use the same flag as sanlock_acquire() for the same purpose. sanlock_convert can block like acquire when doing a sh to ex conversion. --- daemons/lvmlockd/lvmlockd-sanlock.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/daemons/lvmlockd/lvmlockd-sanlock.c b/daemons/lvmlockd/lvmlockd-sanlock.c index 358c588..079e952 100644 --- a/daemons/lvmlockd/lvmlockd-sanlock.c +++ b/daemons/lvmlockd/lvmlockd-sanlock.c @@ -1688,6 +1688,16 @@ int lm_convert_sanlock(struct lockspace *ls, struct resource *r, if (daemon_test) return 0; + /* + * Don't block waiting for a failed lease to expire since it causes + * sanlock_convert to block for a long time, which would prevent this + * thread from processing other lock requests. + * + * FIXME: SANLK_CONVERT_OWNER_NOWAIT is the same as SANLK_ACQUIRE_OWNER_NOWAIT. + * Change to use the CONVERT define when the latest sanlock version has it. + */ + flags |= SANLK_ACQUIRE_OWNER_NOWAIT; + rv = sanlock_convert(lms->sock, -1, flags, rs); if (rv == -EAGAIN) { /* FIXME: When could this happen? Should something different be done? */

1 0

master - deactivate_lvs: deactivate any missing RaidLV legs
by Heinz Mauelshagen 05 Dec '17

05 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=94632eb155a0a1814e69b… Commit: 94632eb155a0a1814e69b1baa0516323cbbae648 Parent: 7195df5acace29e77add6aa2f3df9c684e44694a Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Tue Dec 5 18:48:06 2017 +0100 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Tue Dec 5 18:48:06 2017 +0100 deactivate_lvs: deactivate any missing RaidLV legs In case of failed legs, raid replaces those with e.g. "vg-lv_rimage_0-missing_0_0" mapped to an error target. Those errouneously remain on deactivation. Fix by removing them on deactivation/removal of the RaidLV. --- lib/activate/activate.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/activate/activate.c b/lib/activate/activate.c index e7653a2..4c69af7 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -2506,6 +2506,16 @@ int lv_deactivate(struct cmd_context *cmd, const char *lvid_s, const struct logi critical_section_inc(cmd, "deactivating"); r = _lv_deactivate(lv); + + /* + * Remove any transiently activated error + * devices which arean't used any more. + */ + if (r && lv_is_raid(lv) && !lv_deactivate_any_missing_subdevs(lv)) { + log_error("Failed to remove temporary SubLVs from %s", + display_lvname(lv)); + r = 0; + } critical_section_dec(cmd, "deactivated"); if (!lv_info(cmd, lv, 0, &info, 0, 0) || info.exists) { @@ -2735,10 +2745,8 @@ static int _lv_remove_any_missing_subdevs(struct logical_volume *lv) struct lv_segment *seg; dm_list_iterate_items(seg, &lv->segments) { - if (seg->area_count != 1) - return_0; if (dm_snprintf(name, sizeof(name), "%s-%s-missing_%u_0", seg->lv->vg->name, seg->lv->name, seg_no) < 0) - return 0; + return_0; if (!_remove_dm_dev_by_name(name)) return 0;

1 0

master - device: Skip read-modify-write if replacing whole block.
by Alasdair Kergon 05 Dec '17

05 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7195df5acace29e77add6… Commit: 7195df5acace29e77add6aa2f3df9c684e44694a Parent: e4805e48830c66e5fdcabf162a09cc27d6b73bc1 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Tue Dec 5 01:00:38 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Tue Dec 5 01:00:38 2017 +0000 device: Skip read-modify-write if replacing whole block. --- WHATS_NEW | 1 + lib/device/dev-io.c | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 541d764..674e7f1 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.177 - ==================================== + Skip read-modify-write when entire block is replaced. Categorise I/O with reason annotations in debug messages. Command will lock memory only when suspending volumes. Merge segments when pvmove is finished. diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c index e108437..f77494f 100644 --- a/lib/device/dev-io.c +++ b/lib/device/dev-io.c @@ -231,6 +231,7 @@ static int _aligned_io(struct device_area *where, char *buffer, char *bounce, *bounce_buf; unsigned int physical_block_size = 0; unsigned int block_size = 0; + unsigned buffer_was_widened = 0; uintptr_t mask; struct device_area widened; int r = 0; @@ -241,18 +242,19 @@ static int _aligned_io(struct device_area *where, char *buffer, if (!block_size) block_size = lvm_getpagesize(); + mask = block_size - 1; _widen_region(block_size, where, &widened); - /* Do we need to use a bounce buffer? */ - mask = block_size - 1; - if (!memcmp(where, &widened, sizeof(widened)) && - !((uintptr_t) buffer & mask)) + /* Did we widen the buffer? When writing, this means means read-modify-write. */ + if (where->size != widened.size || where->start != widened.start) { + buffer_was_widened = 1; + log_debug_io("Widening request for %" PRIu64 " bytes at %" PRIu64 " to %" PRIu64 " bytes at %" PRIu64 " on %s (for %s)", + where->size, (uint64_t) where->start, widened.size, (uint64_t) widened.start, dev_name(where->dev), _reason_text(reason)); + } else if (!((uintptr_t) buffer & mask)) + /* Perform the I/O directly. */ return _io(where, buffer, should_write, reason); - log_debug_io("Widening request for %" PRIu64 " bytes at %" PRIu64 " to %" PRIu64 " bytes at %" PRIu64 " on %s (for %s)", - where->size, (uint64_t) where->start, widened.size, (uint64_t) widened.start, dev_name(where->dev), _reason_text(reason)); - /* Allocate a bounce buffer with an extra block */ if (!(bounce_buf = bounce = dm_malloc((size_t) widened.size + block_size))) { log_error("Bounce buffer malloc failed"); @@ -265,10 +267,12 @@ static int _aligned_io(struct device_area *where, char *buffer, if (((uintptr_t) bounce) & mask) bounce = (char *) ((((uintptr_t) bounce) + mask) & ~mask); - /* channel the io through the bounce buffer */ - if (!_io(&widened, bounce, 0, reason)) { + /* Do we need to read into the bounce buffer? */ + if ((!should_write || buffer_was_widened) && + !_io(&widened, bounce, 0, reason)) { if (!should_write) goto_out; + /* FIXME Handle errors properly! */ /* FIXME pre-extend the file */ memset(bounce, '\n', widened.size); }

1 0

master - device: categorise block i/o
by Alasdair Kergon 04 Dec '17

04 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e4805e48830c66e5fdcab… Commit: e4805e48830c66e5fdcabf162a09cc27d6b73bc1 Parent: 698483b5a1bc71e3f48581e2e0bbc269e7d237a9 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Mon Dec 4 23:18:56 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Mon Dec 4 23:45:26 2017 +0000 device: categorise block i/o Introduce enum dev_io_reason to categorise block device I/O in debug messages so it's obvious what it is for. DEV_IO_SIGNATURES /* Scanning device signatures */ DEV_IO_LABEL /* LVM PV disk label */ DEV_IO_MDA_HEADER /* Text format metadata area header */ DEV_IO_MDA_CONTENT /* Text format metadata area content */ DEV_IO_FMT1 /* Original LVM1 metadata format */ DEV_IO_POOL /* Pool metadata format */ DEV_IO_LV /* Content written to an LV */ DEV_IO_LOG /* Logging messages */ --- WHATS_NEW | 1 + lib/config/config.c | 2 +- lib/device/dev-io.c | 58 ++++++++++++++++++++++++--------------- lib/device/dev-luks.c | 2 +- lib/device/dev-md.c | 2 +- lib/device/dev-swap.c | 2 +- lib/device/dev-type.c | 6 ++-- lib/device/device.h | 24 +++++++++++++--- lib/format1/disk-rep.c | 22 +++++++------- lib/format_pool/disk_rep.c | 2 +- lib/format_text/archiver.c | 2 +- lib/format_text/format-text.c | 35 +++++++++++------------- lib/label/label.c | 8 +++--- lib/locking/lvmlockd.c | 2 +- lib/log/log.c | 2 +- lib/metadata/lv_manip.c | 2 +- lib/metadata/metadata-liblvm.c | 2 +- lib/metadata/metadata.c | 2 +- lib/metadata/mirror.c | 2 +- tools/toollib.c | 2 +- 20 files changed, 103 insertions(+), 77 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 8bbe4ee..541d764 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.177 - ==================================== + Categorise I/O with reason annotations in debug messages. Command will lock memory only when suspending volumes. Merge segments when pvmove is finished. Remove label_verify that has never been used. diff --git a/lib/config/config.c b/lib/config/config.c index e8e330b..947cb7b 100644 --- a/lib/config/config.c +++ b/lib/config/config.c @@ -533,7 +533,7 @@ int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, return 0; } if (!dev_read_circular(dev, (uint64_t) offset, size, - (uint64_t) offset2, size2, buf)) { + (uint64_t) offset2, size2, DEV_IO_MDA_CONTENT, buf)) { goto out; } fb = buf; diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c index 35c510f..e108437 100644 --- a/lib/device/dev-io.c +++ b/lib/device/dev-io.c @@ -56,11 +56,27 @@ static DM_LIST_INIT(_open_devices); static unsigned _dev_size_seqno = 1; +static const char *_reasons[] = { + "dev signatures", + "PV labels", + "VG metadata header", + "VG metadata content", + "LVM1 metadata", + "pool metadata", + "LV content", + "logging", +}; + +static const char *_reason_text(dev_io_reason_t reason) +{ + return _reasons[(unsigned) reason]; +} + /*----------------------------------------------------------------- * The standard io loop that keeps submitting an io until it's * all gone. *---------------------------------------------------------------*/ -static int _io(struct device_area *where, char *buffer, int should_write) +static int _io(struct device_area *where, char *buffer, int should_write, dev_io_reason_t reason) { int fd = dev_fd(where->dev); ssize_t n = 0; @@ -72,10 +88,10 @@ static int _io(struct device_area *where, char *buffer, int should_write) return 0; } - log_debug_io("%s %s:%8" PRIu64 " bytes (sync) at %" PRIu64 "%s", + log_debug_io("%s %s:%8" PRIu64 " bytes (sync) at %" PRIu64 "%s (for %s)", should_write ? "Write" : "Read ", dev_name(where->dev), where->size, (uint64_t) where->start, - (should_write && test_mode()) ? " (test mode - suppressed)" : ""); + (should_write && test_mode()) ? " (test mode - suppressed)" : "", _reason_text(reason)); /* * Skip all writes in test mode. @@ -210,7 +226,7 @@ static void _widen_region(unsigned int block_size, struct device_area *region, } static int _aligned_io(struct device_area *where, char *buffer, - int should_write) + int should_write, dev_io_reason_t reason) { char *bounce, *bounce_buf; unsigned int physical_block_size = 0; @@ -232,10 +248,10 @@ static int _aligned_io(struct device_area *where, char *buffer, mask = block_size - 1; if (!memcmp(where, &widened, sizeof(widened)) && !((uintptr_t) buffer & mask)) - return _io(where, buffer, should_write); + return _io(where, buffer, should_write, reason); - log_debug_io("Widening request for %" PRIu64 " bytes at %" PRIu64 " to %" PRIu64 " bytes at %" PRIu64 " on %s", - where->size, (uint64_t) where->start, widened.size, (uint64_t) widened.start, dev_name(where->dev)); + log_debug_io("Widening request for %" PRIu64 " bytes at %" PRIu64 " to %" PRIu64 " bytes at %" PRIu64 " on %s (for %s)", + where->size, (uint64_t) where->start, widened.size, (uint64_t) widened.start, dev_name(where->dev), _reason_text(reason)); /* Allocate a bounce buffer with an extra block */ if (!(bounce_buf = bounce = dm_malloc((size_t) widened.size + block_size))) { @@ -250,7 +266,7 @@ static int _aligned_io(struct device_area *where, char *buffer, bounce = (char *) ((((uintptr_t) bounce) + mask) & ~mask); /* channel the io through the bounce buffer */ - if (!_io(&widened, bounce, 0)) { + if (!_io(&widened, bounce, 0, reason)) { if (!should_write) goto_out; /* FIXME pre-extend the file */ @@ -262,7 +278,7 @@ static int _aligned_io(struct device_area *where, char *buffer, (size_t) where->size); /* ... then we write */ - if (!(r = _io(&widened, bounce, 1))) + if (!(r = _io(&widened, bounce, 1, reason))) stack; goto out; @@ -699,7 +715,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, void *buffer) +int dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason, void *buffer) { struct device_area where; int ret; @@ -714,9 +730,7 @@ int dev_read(struct device *dev, uint64_t offset, size_t len, void *buffer) where.start = offset; where.size = len; - // fprintf(stderr, "READ: %s, %lld, %d\n", dev_name(dev), offset, len); - - ret = _aligned_io(&where, buffer, 0); + ret = _aligned_io(&where, buffer, 0, reason); if (!ret) _dev_inc_error_count(dev); @@ -729,9 +743,9 @@ int dev_read(struct device *dev, uint64_t offset, size_t len, void *buffer) * 'buf' should be len+len2. */ int dev_read_circular(struct device *dev, uint64_t offset, size_t len, - uint64_t offset2, size_t len2, char *buf) + uint64_t offset2, size_t len2, dev_io_reason_t reason, char *buf) { - if (!dev_read(dev, offset, len, buf)) { + if (!dev_read(dev, offset, len, reason, buf)) { log_error("Read from %s failed", dev_name(dev)); return 0; } @@ -743,7 +757,7 @@ int dev_read_circular(struct device *dev, uint64_t offset, size_t len, if (!len2) return 1; - if (!dev_read(dev, offset2, len2, buf + len)) { + if (!dev_read(dev, offset2, len2, reason, buf + len)) { log_error("Circular read from %s failed", dev_name(dev)); return 0; @@ -757,14 +771,14 @@ int dev_read_circular(struct device *dev, uint64_t offset, size_t len, */ /* FIXME pre-extend the file */ -int dev_append(struct device *dev, size_t len, char *buffer) +int dev_append(struct device *dev, size_t len, dev_io_reason_t reason, char *buffer) { int r; if (!dev->open_count) return_0; - r = dev_write(dev, dev->end, len, buffer); + r = dev_write(dev, dev->end, len, reason, buffer); dev->end += (uint64_t) len; #ifndef O_DIRECT_SUPPORT @@ -773,7 +787,7 @@ int dev_append(struct device *dev, size_t len, char *buffer) return r; } -int dev_write(struct device *dev, uint64_t offset, size_t len, void *buffer) +int dev_write(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason, void *buffer) { struct device_area where; int ret; @@ -790,14 +804,14 @@ int dev_write(struct device *dev, uint64_t offset, size_t len, void *buffer) dev->flags |= DEV_ACCESSED_W; - ret = _aligned_io(&where, buffer, 1); + ret = _aligned_io(&where, buffer, 1, reason); if (!ret) _dev_inc_error_count(dev); return ret; } -int dev_set(struct device *dev, uint64_t offset, size_t len, int value) +int dev_set(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason, int value) { size_t s; char buffer[4096] __attribute__((aligned(8))); @@ -816,7 +830,7 @@ int dev_set(struct device *dev, uint64_t offset, size_t len, int value) memset(buffer, value, sizeof(buffer)); while (1) { s = len > sizeof(buffer) ? sizeof(buffer) : len; - if (!dev_write(dev, offset, s, buffer)) + if (!dev_write(dev, offset, s, reason, buffer)) break; len -= s; diff --git a/lib/device/dev-luks.c b/lib/device/dev-luks.c index f7070b2..8513e14 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, buf)) + if (!dev_read(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 6e0a312..92ee214 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), &md_magic) && + if (dev_read(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 7d16dd1..a7ff10b 100644 --- a/lib/device/dev-swap.c +++ b/lib/device/dev-swap.c @@ -61,7 +61,7 @@ int dev_is_swap(struct device *dev, uint64_t *offset_found) if (size < (page >> SECTOR_SHIFT)) break; if (!dev_read(dev, page - SIGNATURE_SIZE, - SIGNATURE_SIZE, buf)) { + SIGNATURE_SIZE, DEV_IO_SIGNATURES, buf)) { ret = -1; break; } diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c index 05e5bef..9608146 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), &buf)) + if (!dev_read(dev, UINT64_C(0), sizeof(buf), DEV_IO_SIGNATURES, &buf)) return_0; /* FIXME Check for other types of partition table too */ @@ -675,7 +675,7 @@ static int _blkid_wipe(blkid_probe probe, struct device *dev, const char *name, } else log_verbose(_msg_wiping, type, name); - if (!dev_set(dev, offset_value, len, 0)) { + if (!dev_set(dev, offset_value, len, DEV_IO_SIGNATURES, 0)) { log_error("Failed to wipe %s signature on %s.", type, name); return 0; } @@ -772,7 +772,7 @@ static int _wipe_signature(struct device *dev, const char *type, const char *nam } log_print_unless_silent("Wiping %s on %s.", type, name); - if (!dev_set(dev, offset_found, wipe_len, 0)) { + if (!dev_set(dev, offset_found, wipe_len, DEV_IO_SIGNATURES, 0)) { log_error("Failed to wipe %s on %s.", type, name); return 0; } diff --git a/lib/device/device.h b/lib/device/device.h index fa03f10..254edfe 100644 --- a/lib/device/device.h +++ b/lib/device/device.h @@ -79,6 +79,20 @@ struct device { char _padding[7]; }; +/* + * All I/O is annotated with the reason it is performed. + */ +typedef enum dev_io_reason { + DEV_IO_SIGNATURES = 0, /* Scanning device signatures */ + DEV_IO_LABEL, /* LVM PV disk label */ + DEV_IO_MDA_HEADER, /* Text format metadata area header */ + DEV_IO_MDA_CONTENT, /* Text format metadata area content */ + DEV_IO_FMT1, /* Original LVM1 metadata format */ + DEV_IO_POOL, /* Pool metadata format */ + DEV_IO_LV, /* Content written to an LV */ + DEV_IO_LOG /* Logging messages */ +} dev_io_reason_t; + struct device_list { struct dm_list list; struct device *dev; @@ -129,12 +143,12 @@ 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, void *buffer); +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, char *buf); -int dev_write(struct device *dev, uint64_t offset, size_t len, void *buffer); -int dev_append(struct device *dev, size_t len, char *buffer); -int dev_set(struct device *dev, uint64_t offset, size_t len, int value); + uint64_t offset2, size_t len2, dev_io_reason_t reason, char *buf); +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); void dev_flush(struct device *dev); struct device *dev_create_file(const char *filename, struct device *dev, diff --git a/lib/format1/disk-rep.c b/lib/format1/disk-rep.c index c4d1348..41955af 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), pvd)) { + if (!dev_read(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), disk)) + if (!dev_read(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), vgd)) + if (!dev_read(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), buffer)) + if (!dev_read(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, extents)) + if (!dev_read(data->dev, pos, len, DEV_IO_FMT1, extents)) return_0; _xlate_extents(extents, data->pvd.pe_total); @@ -539,7 +539,7 @@ static int _write_vgd(struct disk_list *data) data->pvd.vg_name, dev_name(data->dev), pos, sizeof(*vgd)); _xlate_vgd(vgd); - if (!dev_write(data->dev, pos, sizeof(*vgd), vgd)) + if (!dev_write(data->dev, pos, sizeof(*vgd), DEV_IO_FMT1, vgd)) return_0; _xlate_vgd(vgd); @@ -564,7 +564,7 @@ static int _write_uuids(struct disk_list *data) data->pvd.vg_name, dev_name(data->dev), pos, NAME_LEN); - if (!dev_write(data->dev, pos, NAME_LEN, ul->uuid)) + if (!dev_write(data->dev, pos, NAME_LEN, DEV_IO_FMT1, ul->uuid)) return_0; pos += NAME_LEN; @@ -580,7 +580,7 @@ static int _write_lvd(struct device *dev, uint64_t pos, struct lv_disk *disk) pos, sizeof(*disk)); _xlate_lvd(disk); - if (!dev_write(dev, pos, sizeof(*disk), disk)) + if (!dev_write(dev, pos, sizeof(*disk), DEV_IO_FMT1, disk)) return_0; _xlate_lvd(disk); @@ -595,7 +595,7 @@ static int _write_lvs(struct disk_list *data) pos = data->pvd.lv_on_disk.base; - if (!dev_set(data->dev, pos, data->pvd.lv_on_disk.size, 0)) { + if (!dev_set(data->dev, pos, data->pvd.lv_on_disk.size, DEV_IO_FMT1, 0)) { log_error("Couldn't zero lv area on device '%s'", dev_name(data->dev)); return 0; @@ -626,7 +626,7 @@ static int _write_extents(struct disk_list *data) pos, len); _xlate_extents(extents, data->pvd.pe_total); - if (!dev_write(data->dev, pos, len, extents)) + if (!dev_write(data->dev, pos, len, DEV_IO_FMT1, extents)) return_0; _xlate_extents(extents, data->pvd.pe_total); @@ -661,7 +661,7 @@ static int _write_pvd(struct disk_list *data) pos, size); _xlate_pvd((struct pv_disk *) buf); - if (!dev_write(data->dev, pos, size, buf)) { + if (!dev_write(data->dev, pos, size, DEV_IO_FMT1, buf)) { dm_free(buf); return_0; } diff --git a/lib/format_pool/disk_rep.c b/lib/format_pool/disk_rep.c index 0462eb4..374ff44 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, buf)) { + if (!dev_read(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/archiver.c b/lib/format_text/archiver.c index d381155..3e519ca 100644 --- a/lib/format_text/archiver.c +++ b/lib/format_text/archiver.c @@ -493,7 +493,7 @@ int backup_restore_vg(struct cmd_context *cmd, struct volume_group *vg, return 0; } - if (!dev_set(dev, UINT64_C(0), (size_t) 2048, 0)) { + if (!dev_set(dev, UINT64_C(0), (size_t) 2048, DEV_IO_LABEL, 0)) { log_error("%s not wiped: aborting", pv_name); if (!dev_close(dev)) stack; diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 797ead0..31d92a5 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -230,8 +230,7 @@ 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, buf)) + if (!dev_read_circular(area->dev, offset, size, offset2, size2, DEV_IO_MDA_CONTENT, buf)) goto_out; /* @@ -321,7 +320,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, mdah)) { + if (!dev_read(dev_area->dev, dev_area->start, MDA_HEADER_SIZE, DEV_IO_MDA_HEADER, mdah)) { if (!dev_close(dev_area->dev)) stack; return_0; @@ -396,7 +395,7 @@ static int _raw_write_mda_header(const struct format_type *fmt, MDA_HEADER_SIZE - sizeof(mdah->checksum_xl))); - if (!dev_write(dev, start_byte, MDA_HEADER_SIZE, mdah)) + if (!dev_write(dev, start_byte, MDA_HEADER_SIZE, DEV_IO_MDA_HEADER, mdah)) return_0; return 1; @@ -450,7 +449,7 @@ 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), vgnamebuf)) + sizeof(vgnamebuf), DEV_IO_MDA_CONTENT, vgnamebuf)) goto_bad; if (!strncmp(vgnamebuf, vgname, len = strlen(vgname)) && @@ -678,7 +677,7 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, /* Write text out, circularly */ if (!dev_write(mdac->area.dev, mdac->area.start + mdac->rlocn.offset, - (size_t) (mdac->rlocn.size - new_wrap), + (size_t) (mdac->rlocn.size - new_wrap), DEV_IO_MDA_CONTENT, fidtc->raw_metadata_buf)) goto_out; @@ -687,11 +686,9 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, dev_name(mdac->area.dev), mdac->area.start + MDA_HEADER_SIZE, new_wrap); - if (!dev_write(mdac->area.dev, - mdac->area.start + MDA_HEADER_SIZE, - (size_t) new_wrap, - fidtc->raw_metadata_buf + - mdac->rlocn.size - new_wrap)) + if (!dev_write(mdac->area.dev, mdac->area.start + MDA_HEADER_SIZE, + (size_t) new_wrap, DEV_IO_MDA_CONTENT, + fidtc->raw_metadata_buf + mdac->rlocn.size - new_wrap)) goto_out; } @@ -1207,7 +1204,7 @@ 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, buf)) + NAME_LEN, DEV_IO_MDA_CONTENT, buf)) return_0; while (buf[len] && !isspace(buf[len]) && buf[len] != '{' && @@ -2316,13 +2313,13 @@ static int _text_pv_add_metadata_area(const struct format_type *fmt, /* Wipe metadata area with zeroes. */ if (!dev_set(pv->dev, mda_start, - (size_t) ((mda_size > wipe_size) ? - wipe_size : mda_size), 0)) { - log_error("Failed to wipe new metadata area " - "at the %s of the %s", - mda_index ? "end" : "start", - pv_dev_name(pv)); - return 0; + (size_t) ((mda_size > wipe_size) ? wipe_size : mda_size), + DEV_IO_MDA_HEADER, 0)) { + log_error("Failed to wipe new metadata area " + "at the %s of the %s", + mda_index ? "end" : "start", + pv_dev_name(pv)); + return 0; } /* Finally, add new metadata area to PV's format instance. */ diff --git a/lib/label/label.c b/lib/label/label.c index 7a7c500..249927b 100644 --- a/lib/label/label.c +++ b/lib/label/label.c @@ -122,7 +122,7 @@ static struct labeller *_find_labeller(struct device *dev, char *buf, char readbuf[LABEL_SCAN_SIZE] __attribute__((aligned(8))); if (!dev_read(dev, scan_sector << SECTOR_SHIFT, - LABEL_SCAN_SIZE, readbuf)) { + LABEL_SCAN_SIZE, DEV_IO_LABEL, readbuf)) { log_debug_devs("%s: Failed to read label area", dev_name(dev)); goto out; } @@ -217,7 +217,7 @@ int label_remove(struct device *dev) */ dev_flush(dev); - if (!dev_read(dev, UINT64_C(0), LABEL_SCAN_SIZE, readbuf)) { + if (!dev_read(dev, UINT64_C(0), LABEL_SCAN_SIZE, DEV_IO_LABEL, readbuf)) { log_debug_devs("%s: Failed to read label area", dev_name(dev)); goto out; } @@ -246,7 +246,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, + if (dev_write(dev, sector << SECTOR_SHIFT, LABEL_SIZE, DEV_IO_LABEL, buf)) { /* Also remove the PV record from cache. */ info = lvmcache_info_from_pvid(dev->pvid, dev, 0); @@ -342,7 +342,7 @@ int label_write(struct device *dev, struct label *label) log_very_verbose("%s: Writing label to sector %" PRIu64 " with stored offset %" PRIu32 ".", dev_name(dev), label->sector, xlate32(lh->offset_xl)); - if (!dev_write(dev, label->sector << SECTOR_SHIFT, LABEL_SIZE, buf)) { + if (!dev_write(dev, label->sector << SECTOR_SHIFT, LABEL_SIZE, DEV_IO_LABEL, buf)) { log_debug_devs("Failed to write label to %s", dev_name(dev)); r = 0; } diff --git a/lib/locking/lvmlockd.c b/lib/locking/lvmlockd.c index cf2c3d5..325549a 100644 --- a/lib/locking/lvmlockd.c +++ b/lib/locking/lvmlockd.c @@ -412,7 +412,7 @@ static int _extend_sanlock_lv(struct cmd_context *cmd, struct volume_group *vg, return 0; } - if (!dev_set(dev, old_size_bytes, new_size_bytes - old_size_bytes, 0)) { + if (!dev_set(dev, old_size_bytes, new_size_bytes - old_size_bytes, DEV_IO_LV, 0)) { log_error("Extend sanlock LV %s cannot zero device.", display_lvname(lv)); dev_close_immediate(dev); return 0; diff --git a/lib/log/log.c b/lib/log/log.c index 208959b..808090f 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -694,7 +694,7 @@ static void _vprint_log(int level, const char *file, int line, int dm_errno_or_c buf[bufused] = '\n'; buf[sizeof(buf) - 1] = '\n'; /* FIXME real size bufused */ - dev_append(&_log_dev, sizeof(buf), buf); + dev_append(&_log_dev, sizeof(buf), DEV_IO_LOG, buf); _already_logging = 0; } } diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 6b2d1f1..70dc2d9 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -7192,7 +7192,7 @@ int wipe_lv(struct logical_volume *lv, struct wipe_params wp) display_size(lv->vg->cmd, zero_sectors), lv->vg->name, lv->name, wp.zero_value); - if (!dev_set(dev, UINT64_C(0), (size_t) zero_sectors << SECTOR_SHIFT, wp.zero_value)) + if (!dev_set(dev, UINT64_C(0), (size_t) zero_sectors << SECTOR_SHIFT, DEV_IO_LV, wp.zero_value)) stack; } diff --git a/lib/metadata/metadata-liblvm.c b/lib/metadata/metadata-liblvm.c index 4202950..a4284bc 100644 --- a/lib/metadata/metadata-liblvm.c +++ b/lib/metadata/metadata-liblvm.c @@ -71,7 +71,7 @@ static int _pvcreate_write(struct cmd_context *cmd, struct pv_to_write *pvw) return 0; } - if (!dev_set(dev, UINT64_C(0), (size_t) 2048, 0)) { + if (!dev_set(dev, UINT64_C(0), (size_t) 2048, DEV_IO_LABEL, 0)) { log_error("%s not wiped: aborting", pv_name); if (!dev_close(dev)) stack; diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index a14dfa6..56b5b13 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -1456,7 +1456,7 @@ static int _pvcreate_write(struct cmd_context *cmd, struct pv_to_write *pvw) return 0; } - if (!dev_set(dev, UINT64_C(0), (size_t) 2048, 0)) { + if (!dev_set(dev, UINT64_C(0), (size_t) 2048, DEV_IO_LABEL, 0)) { log_error("%s not wiped: aborting", pv_name); if (!dev_close(dev)) stack; diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c index 327ce99..38c3df6 100644 --- a/lib/metadata/mirror.c +++ b/lib/metadata/mirror.c @@ -304,7 +304,7 @@ static int _write_log_header(struct cmd_context *cmd, struct logical_volume *lv) if (!dev_open_quiet(dev)) return 0; - if (!dev_write(dev, UINT64_C(0), sizeof(log_header), &log_header)) { + if (!dev_write(dev, UINT64_C(0), sizeof(log_header), DEV_IO_LV, &log_header)) { log_error("Failed to write log header to %s.", name); dev_close_immediate(dev); return 0; diff --git a/tools/toollib.c b/tools/toollib.c index f60014c..0509b5e 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -5771,7 +5771,7 @@ do_command: continue; } - if (!dev_set(pv->dev, UINT64_C(0), (size_t) 2048, 0)) { + if (!dev_set(pv->dev, UINT64_C(0), (size_t) 2048, DEV_IO_LABEL, 0)) { log_error("%s not wiped: aborting.", pv_name); if (!dev_close(pv->dev)) stack;

1 0

master - device: categorise block i/o
by Alasdair Kergon 04 Dec '17

04 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9cefef041a46bff9521e6… Commit: 9cefef041a46bff9521e6f22556e1b95f726e33e Parent: 698483b5a1bc71e3f48581e2e0bbc269e7d237a9 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Mon Dec 4 23:18:56 2017 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Mon Dec 4 23:18:56 2017 +0000 device: categorise block i/o Introduce enum dev_io_reason to categorise block device I/O in debug messages so it's obvious what it is for. DEV_IO_SIGNATURES /* Scanning device signatures */ DEV_IO_LABEL /* LVM PV disk label */ DEV_IO_MDA_HEADER /* Text format metadata area header */ DEV_IO_MDA_CONTENT /* Text format metadata area content */ DEV_IO_FMT1 /* Original LVM1 metadata format */ DEV_IO_POOL /* Pool metadata format */ DEV_IO_LV /* Content written to an LV */ DEV_IO_LOG /* Logging messages */ --- WHATS_NEW | 1 + lib/config/config.c | 2 +- lib/device/dev-io.c | 58 ++++++++++++++++++++++++--------------- lib/device/dev-luks.c | 2 +- lib/device/dev-md.c | 2 +- lib/device/dev-swap.c | 2 +- lib/device/dev-type.c | 6 ++-- lib/device/device.h | 24 +++++++++++++--- lib/format1/disk-rep.c | 22 +++++++------- lib/format_pool/disk_rep.c | 2 +- lib/format_text/archiver.c | 2 +- lib/format_text/format-text.c | 35 +++++++++++------------- lib/label/label.c | 8 +++--- lib/locking/lvmlockd.c | 2 +- lib/log/log.c | 2 +- lib/metadata/lv_manip.c | 2 +- lib/metadata/metadata-liblvm.c | 2 +- lib/metadata/metadata.c | 2 +- lib/metadata/mirror.c | 2 +- tools/toollib.c | 2 +- 20 files changed, 103 insertions(+), 77 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 8bbe4ee..541d764 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.177 - ==================================== + Categorise I/O with reason annotations in debug messages. Command will lock memory only when suspending volumes. Merge segments when pvmove is finished. Remove label_verify that has never been used. diff --git a/lib/config/config.c b/lib/config/config.c index e8e330b..947cb7b 100644 --- a/lib/config/config.c +++ b/lib/config/config.c @@ -533,7 +533,7 @@ int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, return 0; } if (!dev_read_circular(dev, (uint64_t) offset, size, - (uint64_t) offset2, size2, buf)) { + (uint64_t) offset2, size2, DEV_IO_MDA_CONTENT, buf)) { goto out; } fb = buf; diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c index 35c510f..e108437 100644 --- a/lib/device/dev-io.c +++ b/lib/device/dev-io.c @@ -56,11 +56,27 @@ static DM_LIST_INIT(_open_devices); static unsigned _dev_size_seqno = 1; +static const char *_reasons[] = { + "dev signatures", + "PV labels", + "VG metadata header", + "VG metadata content", + "LVM1 metadata", + "pool metadata", + "LV content", + "logging", +}; + +static const char *_reason_text(dev_io_reason_t reason) +{ + return _reasons[(unsigned) reason]; +} + /*----------------------------------------------------------------- * The standard io loop that keeps submitting an io until it's * all gone. *---------------------------------------------------------------*/ -static int _io(struct device_area *where, char *buffer, int should_write) +static int _io(struct device_area *where, char *buffer, int should_write, dev_io_reason_t reason) { int fd = dev_fd(where->dev); ssize_t n = 0; @@ -72,10 +88,10 @@ static int _io(struct device_area *where, char *buffer, int should_write) return 0; } - log_debug_io("%s %s:%8" PRIu64 " bytes (sync) at %" PRIu64 "%s", + log_debug_io("%s %s:%8" PRIu64 " bytes (sync) at %" PRIu64 "%s (for %s)", should_write ? "Write" : "Read ", dev_name(where->dev), where->size, (uint64_t) where->start, - (should_write && test_mode()) ? " (test mode - suppressed)" : ""); + (should_write && test_mode()) ? " (test mode - suppressed)" : "", _reason_text(reason)); /* * Skip all writes in test mode. @@ -210,7 +226,7 @@ static void _widen_region(unsigned int block_size, struct device_area *region, } static int _aligned_io(struct device_area *where, char *buffer, - int should_write) + int should_write, dev_io_reason_t reason) { char *bounce, *bounce_buf; unsigned int physical_block_size = 0; @@ -232,10 +248,10 @@ static int _aligned_io(struct device_area *where, char *buffer, mask = block_size - 1; if (!memcmp(where, &widened, sizeof(widened)) && !((uintptr_t) buffer & mask)) - return _io(where, buffer, should_write); + return _io(where, buffer, should_write, reason); - log_debug_io("Widening request for %" PRIu64 " bytes at %" PRIu64 " to %" PRIu64 " bytes at %" PRIu64 " on %s", - where->size, (uint64_t) where->start, widened.size, (uint64_t) widened.start, dev_name(where->dev)); + log_debug_io("Widening request for %" PRIu64 " bytes at %" PRIu64 " to %" PRIu64 " bytes at %" PRIu64 " on %s (for %s)", + where->size, (uint64_t) where->start, widened.size, (uint64_t) widened.start, dev_name(where->dev), _reason_text(reason)); /* Allocate a bounce buffer with an extra block */ if (!(bounce_buf = bounce = dm_malloc((size_t) widened.size + block_size))) { @@ -250,7 +266,7 @@ static int _aligned_io(struct device_area *where, char *buffer, bounce = (char *) ((((uintptr_t) bounce) + mask) & ~mask); /* channel the io through the bounce buffer */ - if (!_io(&widened, bounce, 0)) { + if (!_io(&widened, bounce, 0, reason)) { if (!should_write) goto_out; /* FIXME pre-extend the file */ @@ -262,7 +278,7 @@ static int _aligned_io(struct device_area *where, char *buffer, (size_t) where->size); /* ... then we write */ - if (!(r = _io(&widened, bounce, 1))) + if (!(r = _io(&widened, bounce, 1, reason))) stack; goto out; @@ -699,7 +715,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, void *buffer) +int dev_read(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason, void *buffer) { struct device_area where; int ret; @@ -714,9 +730,7 @@ int dev_read(struct device *dev, uint64_t offset, size_t len, void *buffer) where.start = offset; where.size = len; - // fprintf(stderr, "READ: %s, %lld, %d\n", dev_name(dev), offset, len); - - ret = _aligned_io(&where, buffer, 0); + ret = _aligned_io(&where, buffer, 0, reason); if (!ret) _dev_inc_error_count(dev); @@ -729,9 +743,9 @@ int dev_read(struct device *dev, uint64_t offset, size_t len, void *buffer) * 'buf' should be len+len2. */ int dev_read_circular(struct device *dev, uint64_t offset, size_t len, - uint64_t offset2, size_t len2, char *buf) + uint64_t offset2, size_t len2, dev_io_reason_t reason, char *buf) { - if (!dev_read(dev, offset, len, buf)) { + if (!dev_read(dev, offset, len, reason, buf)) { log_error("Read from %s failed", dev_name(dev)); return 0; } @@ -743,7 +757,7 @@ int dev_read_circular(struct device *dev, uint64_t offset, size_t len, if (!len2) return 1; - if (!dev_read(dev, offset2, len2, buf + len)) { + if (!dev_read(dev, offset2, len2, reason, buf + len)) { log_error("Circular read from %s failed", dev_name(dev)); return 0; @@ -757,14 +771,14 @@ int dev_read_circular(struct device *dev, uint64_t offset, size_t len, */ /* FIXME pre-extend the file */ -int dev_append(struct device *dev, size_t len, char *buffer) +int dev_append(struct device *dev, size_t len, dev_io_reason_t reason, char *buffer) { int r; if (!dev->open_count) return_0; - r = dev_write(dev, dev->end, len, buffer); + r = dev_write(dev, dev->end, len, reason, buffer); dev->end += (uint64_t) len; #ifndef O_DIRECT_SUPPORT @@ -773,7 +787,7 @@ int dev_append(struct device *dev, size_t len, char *buffer) return r; } -int dev_write(struct device *dev, uint64_t offset, size_t len, void *buffer) +int dev_write(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason, void *buffer) { struct device_area where; int ret; @@ -790,14 +804,14 @@ int dev_write(struct device *dev, uint64_t offset, size_t len, void *buffer) dev->flags |= DEV_ACCESSED_W; - ret = _aligned_io(&where, buffer, 1); + ret = _aligned_io(&where, buffer, 1, reason); if (!ret) _dev_inc_error_count(dev); return ret; } -int dev_set(struct device *dev, uint64_t offset, size_t len, int value) +int dev_set(struct device *dev, uint64_t offset, size_t len, dev_io_reason_t reason, int value) { size_t s; char buffer[4096] __attribute__((aligned(8))); @@ -816,7 +830,7 @@ int dev_set(struct device *dev, uint64_t offset, size_t len, int value) memset(buffer, value, sizeof(buffer)); while (1) { s = len > sizeof(buffer) ? sizeof(buffer) : len; - if (!dev_write(dev, offset, s, buffer)) + if (!dev_write(dev, offset, s, reason, buffer)) break; len -= s; diff --git a/lib/device/dev-luks.c b/lib/device/dev-luks.c index f7070b2..8513e14 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, buf)) + if (!dev_read(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 6e0a312..92ee214 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), &md_magic) && + if (dev_read(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 7d16dd1..a7ff10b 100644 --- a/lib/device/dev-swap.c +++ b/lib/device/dev-swap.c @@ -61,7 +61,7 @@ int dev_is_swap(struct device *dev, uint64_t *offset_found) if (size < (page >> SECTOR_SHIFT)) break; if (!dev_read(dev, page - SIGNATURE_SIZE, - SIGNATURE_SIZE, buf)) { + SIGNATURE_SIZE, DEV_IO_SIGNATURES, buf)) { ret = -1; break; } diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c index 05e5bef..9608146 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), &buf)) + if (!dev_read(dev, UINT64_C(0), sizeof(buf), DEV_IO_SIGNATURES, &buf)) return_0; /* FIXME Check for other types of partition table too */ @@ -675,7 +675,7 @@ static int _blkid_wipe(blkid_probe probe, struct device *dev, const char *name, } else log_verbose(_msg_wiping, type, name); - if (!dev_set(dev, offset_value, len, 0)) { + if (!dev_set(dev, offset_value, len, DEV_IO_SIGNATURES, 0)) { log_error("Failed to wipe %s signature on %s.", type, name); return 0; } @@ -772,7 +772,7 @@ static int _wipe_signature(struct device *dev, const char *type, const char *nam } log_print_unless_silent("Wiping %s on %s.", type, name); - if (!dev_set(dev, offset_found, wipe_len, 0)) { + if (!dev_set(dev, offset_found, wipe_len, DEV_IO_SIGNATURES, 0)) { log_error("Failed to wipe %s on %s.", type, name); return 0; } diff --git a/lib/device/device.h b/lib/device/device.h index fa03f10..550b9bc 100644 --- a/lib/device/device.h +++ b/lib/device/device.h @@ -79,6 +79,20 @@ struct device { char _padding[7]; }; +/* + * All I/O is annotated with the reason it is performed. + */ +typedef enum dev_io_reason { + DEV_IO_SIGNATURES = 0, /* Scanning device signatures */ + DEV_IO_LABEL, /* LVM PV disk label */ + DEV_IO_MDA_HEADER, /* Text format metadata area header */ + DEV_IO_MDA_CONTENT, /* Text format metadata area content */ + DEV_IO_FMT1, /* Original LVM1 metadata format */ + DEV_IO_POOL, /* Pool metadata format */ + DEV_IO_LV, /* Content written to an LV */ + DEV_IO_LOG /* Logging messages */ +} dev_io_reason_t; + struct device_list { struct dm_list list; struct device *dev; @@ -129,12 +143,12 @@ 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, void *buffer); +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, char *buf); -int dev_write(struct device *dev, uint64_t offset, size_t len, void *buffer); -int dev_append(struct device *dev, size_t len, char *buffer); -int dev_set(struct device *dev, uint64_t offset, size_t len, int value); + uint64_t offset2, size_t len2, dev_io_reason_t reason, char *buf); +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); void dev_flush(struct device *dev); struct device *dev_create_file(const char *filename, struct device *dev, diff --git a/lib/format1/disk-rep.c b/lib/format1/disk-rep.c index c4d1348..41955af 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), pvd)) { + if (!dev_read(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), disk)) + if (!dev_read(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), vgd)) + if (!dev_read(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), buffer)) + if (!dev_read(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, extents)) + if (!dev_read(data->dev, pos, len, DEV_IO_FMT1, extents)) return_0; _xlate_extents(extents, data->pvd.pe_total); @@ -539,7 +539,7 @@ static int _write_vgd(struct disk_list *data) data->pvd.vg_name, dev_name(data->dev), pos, sizeof(*vgd)); _xlate_vgd(vgd); - if (!dev_write(data->dev, pos, sizeof(*vgd), vgd)) + if (!dev_write(data->dev, pos, sizeof(*vgd), DEV_IO_FMT1, vgd)) return_0; _xlate_vgd(vgd); @@ -564,7 +564,7 @@ static int _write_uuids(struct disk_list *data) data->pvd.vg_name, dev_name(data->dev), pos, NAME_LEN); - if (!dev_write(data->dev, pos, NAME_LEN, ul->uuid)) + if (!dev_write(data->dev, pos, NAME_LEN, DEV_IO_FMT1, ul->uuid)) return_0; pos += NAME_LEN; @@ -580,7 +580,7 @@ static int _write_lvd(struct device *dev, uint64_t pos, struct lv_disk *disk) pos, sizeof(*disk)); _xlate_lvd(disk); - if (!dev_write(dev, pos, sizeof(*disk), disk)) + if (!dev_write(dev, pos, sizeof(*disk), DEV_IO_FMT1, disk)) return_0; _xlate_lvd(disk); @@ -595,7 +595,7 @@ static int _write_lvs(struct disk_list *data) pos = data->pvd.lv_on_disk.base; - if (!dev_set(data->dev, pos, data->pvd.lv_on_disk.size, 0)) { + if (!dev_set(data->dev, pos, data->pvd.lv_on_disk.size, DEV_IO_FMT1, 0)) { log_error("Couldn't zero lv area on device '%s'", dev_name(data->dev)); return 0; @@ -626,7 +626,7 @@ static int _write_extents(struct disk_list *data) pos, len); _xlate_extents(extents, data->pvd.pe_total); - if (!dev_write(data->dev, pos, len, extents)) + if (!dev_write(data->dev, pos, len, DEV_IO_FMT1, extents)) return_0; _xlate_extents(extents, data->pvd.pe_total); @@ -661,7 +661,7 @@ static int _write_pvd(struct disk_list *data) pos, size); _xlate_pvd((struct pv_disk *) buf); - if (!dev_write(data->dev, pos, size, buf)) { + if (!dev_write(data->dev, pos, size, DEV_IO_FMT1, buf)) { dm_free(buf); return_0; } diff --git a/lib/format_pool/disk_rep.c b/lib/format_pool/disk_rep.c index 0462eb4..374ff44 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, buf)) { + if (!dev_read(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/archiver.c b/lib/format_text/archiver.c index d381155..3e519ca 100644 --- a/lib/format_text/archiver.c +++ b/lib/format_text/archiver.c @@ -493,7 +493,7 @@ int backup_restore_vg(struct cmd_context *cmd, struct volume_group *vg, return 0; } - if (!dev_set(dev, UINT64_C(0), (size_t) 2048, 0)) { + if (!dev_set(dev, UINT64_C(0), (size_t) 2048, DEV_IO_LABEL, 0)) { log_error("%s not wiped: aborting", pv_name); if (!dev_close(dev)) stack; diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 797ead0..31d92a5 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -230,8 +230,7 @@ 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, buf)) + if (!dev_read_circular(area->dev, offset, size, offset2, size2, DEV_IO_MDA_CONTENT, buf)) goto_out; /* @@ -321,7 +320,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, mdah)) { + if (!dev_read(dev_area->dev, dev_area->start, MDA_HEADER_SIZE, DEV_IO_MDA_HEADER, mdah)) { if (!dev_close(dev_area->dev)) stack; return_0; @@ -396,7 +395,7 @@ static int _raw_write_mda_header(const struct format_type *fmt, MDA_HEADER_SIZE - sizeof(mdah->checksum_xl))); - if (!dev_write(dev, start_byte, MDA_HEADER_SIZE, mdah)) + if (!dev_write(dev, start_byte, MDA_HEADER_SIZE, DEV_IO_MDA_HEADER, mdah)) return_0; return 1; @@ -450,7 +449,7 @@ 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), vgnamebuf)) + sizeof(vgnamebuf), DEV_IO_MDA_CONTENT, vgnamebuf)) goto_bad; if (!strncmp(vgnamebuf, vgname, len = strlen(vgname)) && @@ -678,7 +677,7 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, /* Write text out, circularly */ if (!dev_write(mdac->area.dev, mdac->area.start + mdac->rlocn.offset, - (size_t) (mdac->rlocn.size - new_wrap), + (size_t) (mdac->rlocn.size - new_wrap), DEV_IO_MDA_CONTENT, fidtc->raw_metadata_buf)) goto_out; @@ -687,11 +686,9 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, dev_name(mdac->area.dev), mdac->area.start + MDA_HEADER_SIZE, new_wrap); - if (!dev_write(mdac->area.dev, - mdac->area.start + MDA_HEADER_SIZE, - (size_t) new_wrap, - fidtc->raw_metadata_buf + - mdac->rlocn.size - new_wrap)) + if (!dev_write(mdac->area.dev, mdac->area.start + MDA_HEADER_SIZE, + (size_t) new_wrap, DEV_IO_MDA_CONTENT, + fidtc->raw_metadata_buf + mdac->rlocn.size - new_wrap)) goto_out; } @@ -1207,7 +1204,7 @@ 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, buf)) + NAME_LEN, DEV_IO_MDA_CONTENT, buf)) return_0; while (buf[len] && !isspace(buf[len]) && buf[len] != '{' && @@ -2316,13 +2313,13 @@ static int _text_pv_add_metadata_area(const struct format_type *fmt, /* Wipe metadata area with zeroes. */ if (!dev_set(pv->dev, mda_start, - (size_t) ((mda_size > wipe_size) ? - wipe_size : mda_size), 0)) { - log_error("Failed to wipe new metadata area " - "at the %s of the %s", - mda_index ? "end" : "start", - pv_dev_name(pv)); - return 0; + (size_t) ((mda_size > wipe_size) ? wipe_size : mda_size), + DEV_IO_MDA_HEADER, 0)) { + log_error("Failed to wipe new metadata area " + "at the %s of the %s", + mda_index ? "end" : "start", + pv_dev_name(pv)); + return 0; } /* Finally, add new metadata area to PV's format instance. */ diff --git a/lib/label/label.c b/lib/label/label.c index 7a7c500..249927b 100644 --- a/lib/label/label.c +++ b/lib/label/label.c @@ -122,7 +122,7 @@ static struct labeller *_find_labeller(struct device *dev, char *buf, char readbuf[LABEL_SCAN_SIZE] __attribute__((aligned(8))); if (!dev_read(dev, scan_sector << SECTOR_SHIFT, - LABEL_SCAN_SIZE, readbuf)) { + LABEL_SCAN_SIZE, DEV_IO_LABEL, readbuf)) { log_debug_devs("%s: Failed to read label area", dev_name(dev)); goto out; } @@ -217,7 +217,7 @@ int label_remove(struct device *dev) */ dev_flush(dev); - if (!dev_read(dev, UINT64_C(0), LABEL_SCAN_SIZE, readbuf)) { + if (!dev_read(dev, UINT64_C(0), LABEL_SCAN_SIZE, DEV_IO_LABEL, readbuf)) { log_debug_devs("%s: Failed to read label area", dev_name(dev)); goto out; } @@ -246,7 +246,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, + if (dev_write(dev, sector << SECTOR_SHIFT, LABEL_SIZE, DEV_IO_LABEL, buf)) { /* Also remove the PV record from cache. */ info = lvmcache_info_from_pvid(dev->pvid, dev, 0); @@ -342,7 +342,7 @@ int label_write(struct device *dev, struct label *label) log_very_verbose("%s: Writing label to sector %" PRIu64 " with stored offset %" PRIu32 ".", dev_name(dev), label->sector, xlate32(lh->offset_xl)); - if (!dev_write(dev, label->sector << SECTOR_SHIFT, LABEL_SIZE, buf)) { + if (!dev_write(dev, label->sector << SECTOR_SHIFT, LABEL_SIZE, DEV_IO_LABEL, buf)) { log_debug_devs("Failed to write label to %s", dev_name(dev)); r = 0; } diff --git a/lib/locking/lvmlockd.c b/lib/locking/lvmlockd.c index cf2c3d5..325549a 100644 --- a/lib/locking/lvmlockd.c +++ b/lib/locking/lvmlockd.c @@ -412,7 +412,7 @@ static int _extend_sanlock_lv(struct cmd_context *cmd, struct volume_group *vg, return 0; } - if (!dev_set(dev, old_size_bytes, new_size_bytes - old_size_bytes, 0)) { + if (!dev_set(dev, old_size_bytes, new_size_bytes - old_size_bytes, DEV_IO_LV, 0)) { log_error("Extend sanlock LV %s cannot zero device.", display_lvname(lv)); dev_close_immediate(dev); return 0; diff --git a/lib/log/log.c b/lib/log/log.c index 208959b..808090f 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -694,7 +694,7 @@ static void _vprint_log(int level, const char *file, int line, int dm_errno_or_c buf[bufused] = '\n'; buf[sizeof(buf) - 1] = '\n'; /* FIXME real size bufused */ - dev_append(&_log_dev, sizeof(buf), buf); + dev_append(&_log_dev, sizeof(buf), DEV_IO_LOG, buf); _already_logging = 0; } } diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 6b2d1f1..70dc2d9 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -7192,7 +7192,7 @@ int wipe_lv(struct logical_volume *lv, struct wipe_params wp) display_size(lv->vg->cmd, zero_sectors), lv->vg->name, lv->name, wp.zero_value); - if (!dev_set(dev, UINT64_C(0), (size_t) zero_sectors << SECTOR_SHIFT, wp.zero_value)) + if (!dev_set(dev, UINT64_C(0), (size_t) zero_sectors << SECTOR_SHIFT, DEV_IO_LV, wp.zero_value)) stack; } diff --git a/lib/metadata/metadata-liblvm.c b/lib/metadata/metadata-liblvm.c index 4202950..0ea84e1 100644 --- a/lib/metadata/metadata-liblvm.c +++ b/lib/metadata/metadata-liblvm.c @@ -71,7 +71,7 @@ static int _pvcreate_write(struct cmd_context *cmd, struct pv_to_write *pvw) return 0; } - if (!dev_set(dev, UINT64_C(0), (size_t) 2048, 0)) { + if (!dev_set(dev, UINT64_C(0), (size_t) 2048, DEV_IO_LV, 0)) { log_error("%s not wiped: aborting", pv_name); if (!dev_close(dev)) stack; diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index a14dfa6..d17db92 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -1456,7 +1456,7 @@ static int _pvcreate_write(struct cmd_context *cmd, struct pv_to_write *pvw) return 0; } - if (!dev_set(dev, UINT64_C(0), (size_t) 2048, 0)) { + if (!dev_set(dev, UINT64_C(0), (size_t) 2048, DEV_IO_LV, 0)) { log_error("%s not wiped: aborting", pv_name); if (!dev_close(dev)) stack; diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c index 327ce99..38c3df6 100644 --- a/lib/metadata/mirror.c +++ b/lib/metadata/mirror.c @@ -304,7 +304,7 @@ static int _write_log_header(struct cmd_context *cmd, struct logical_volume *lv) if (!dev_open_quiet(dev)) return 0; - if (!dev_write(dev, UINT64_C(0), sizeof(log_header), &log_header)) { + if (!dev_write(dev, UINT64_C(0), sizeof(log_header), DEV_IO_LV, &log_header)) { log_error("Failed to write log header to %s.", name); dev_close_immediate(dev); return 0; diff --git a/tools/toollib.c b/tools/toollib.c index f60014c..0509b5e 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -5771,7 +5771,7 @@ do_command: continue; } - if (!dev_set(pv->dev, UINT64_C(0), (size_t) 2048, 0)) { + if (!dev_set(pv->dev, UINT64_C(0), (size_t) 2048, DEV_IO_LABEL, 0)) { log_error("%s not wiped: aborting.", pv_name); if (!dev_close(pv->dev)) stack;

1 0

master - activation: also lock memory for clustered locking
by Zdenek Kabelac 04 Dec '17

04 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=698483b5a1bc71e3f4858… Commit: 698483b5a1bc71e3f48581e2e0bbc269e7d237a9 Parent: 406b566cfc4be2cc04157ea7bd3c24ea729a4bb5 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 4 18:40:37 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 4 23:33:02 2017 +0100 activation: also lock memory for clustered locking Commit c086dfadc389551b9a2d7b4c26931e5e74ada8d6 missed to lock memory for clustering suspend part since it's using differnt locking reason. --- lib/mm/memlock.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c index 7edd9de..f72b86c 100644 --- a/lib/mm/memlock.c +++ b/lib/mm/memlock.c @@ -602,7 +602,9 @@ static void _unlock_mem_if_possible(struct cmd_context *cmd) */ void critical_section_inc(struct cmd_context *cmd, const char *reason) { - if (!_critical_section && (strcmp(reason, "suspending") == 0)) { + if (!_critical_section && + ((strcmp(reason, "suspending") == 0) || + (strcmp(reason, "locking for suspend") == 0))) { /* * Profiles are loaded on-demand so make sure that before * entering the critical section all needed profiles are

1 0

master - cleanup: drop unneeded check
by Zdenek Kabelac 04 Dec '17

04 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=406b566cfc4be2cc04157… Commit: 406b566cfc4be2cc04157ea7bd3c24ea729a4bb5 Parent: 5abf6b7c21c86531eedeebe56de2633d43ef1879 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 4 15:45:49 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 4 15:45:49 2017 +0100 cleanup: drop unneeded check Code already has dereferenced UUID before this point, and its already given we require name & uuid when ading new node (although uuid could be empty string). --- libdm/libdm-deptree.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 48323de..34a1547 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -513,14 +513,13 @@ static struct dm_tree_node *_create_dm_tree_node(struct dm_tree *dtree, dev = MKDEV((dev_t)info->major, (dev_t)info->minor); if (!dm_hash_insert_binary(dtree->devs, (const char *) &dev, - sizeof(dev), node)) { + sizeof(dev), node)) { log_error("dtree node hash insertion failed"); dm_pool_free(dtree->mem, node); return NULL; } - if (uuid && *uuid && - !dm_hash_insert(dtree->uuids, uuid, node)) { + if (*uuid && !dm_hash_insert(dtree->uuids, uuid, node)) { log_error("dtree uuid hash insertion failed"); dm_hash_remove_binary(dtree->devs, (const char *) &dev, sizeof(dev));

1 0

master - cleanup: messsage cleanup
by Zdenek Kabelac 04 Dec '17

04 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5abf6b7c21c86531eedee… Commit: 5abf6b7c21c86531eedeebe56de2633d43ef1879 Parent: 76954884c741e31eb2ddb4f5f5ffe9d2b8c60572 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 4 14:37:01 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 4 15:38:50 2017 +0100 cleanup: messsage cleanup --- libdm/libdm-deptree.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index fb33605..48323de 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1287,7 +1287,7 @@ static int _resume_node(const char *name, uint32_t major, uint32_t minor, struct dm_task *dmt; int r = 0; - log_verbose("Resuming %s (%" PRIu32 ":%" PRIu32 ")", name, major, minor); + log_verbose("Resuming %s (" FMTu32 ":" FMTu32 ").", name, major, minor); if (!(dmt = dm_task_create(DM_DEVICE_RESUME))) { log_debug_activation("Suspend dm_task creation failed for %s.", name); @@ -1607,8 +1607,8 @@ static int _dm_tree_deactivate_children(struct dm_tree_node *dnode, /* When retry is not allowed, error */ if (!child->dtree->retry_remove) { - log_error("Unable to deactivate open %s (%" PRIu32 - ":%" PRIu32 ")", name, info.major, info.minor); + log_error("Unable to deactivate open %s (" FMTu32 ":" + FMTu32 ").", name, info.major, info.minor); r = 0; continue; } @@ -1628,9 +1628,8 @@ static int _dm_tree_deactivate_children(struct dm_tree_node *dnode, uuid_prefix, uuid_prefix_len))) { /* Only report error from (likely non-internal) dependency at top level */ if (!level) { - log_error("Unable to deactivate open %s (%" PRIu32 - ":%" PRIu32 ")", name, info.major, - info.minor); + log_error("Unable to deactivate open %s (" FMTu32 ":" + FMTu32 ").", name, info.major, info.minor); r = 0; } continue; @@ -1644,9 +1643,8 @@ static int _dm_tree_deactivate_children(struct dm_tree_node *dnode, if (!_deactivate_node(name, info.major, info.minor, &child->dtree->cookie, child->udev_flags, (level == 0) ? child->dtree->retry_remove : 0)) { - log_error("Unable to deactivate %s (%" PRIu32 - ":%" PRIu32 ")", name, info.major, - info.minor); + log_error("Unable to deactivate %s (" FMTu32 ":" + FMTu32 ").", name, info.major, info.minor); r = 0; continue; } @@ -1738,9 +1736,8 @@ int dm_tree_suspend_children(struct dm_tree_node *dnode, if (!_suspend_node(name, info.major, info.minor, child->dtree->skip_lockfs, child->dtree->no_flush, &newinfo)) { - log_error("Unable to suspend %s (%" PRIu32 - ":%" PRIu32 ")", name, info.major, - info.minor); + log_error("Unable to suspend %s (" FMTu32 ":" + FMTu32 ")", name, info.major, info.minor); r = 0; continue; }

1 0

master - cleanup: drop unused define
by Zdenek Kabelac 04 Dec '17

04 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=76954884c741e31eb2ddb… Commit: 76954884c741e31eb2ddb4f5f5ffe9d2b8c60572 Parent: 110dac870c0a0f53b4569f99daf5b6ac83a549f0 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 4 14:26:56 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 4 15:38:50 2017 +0100 cleanup: drop unused define --- daemons/dmeventd/plugins/thin/dmeventd_thin.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/daemons/dmeventd/plugins/thin/dmeventd_thin.c b/daemons/dmeventd/plugins/thin/dmeventd_thin.c index 4dfd6c7..404519b 100644 --- a/daemons/dmeventd/plugins/thin/dmeventd_thin.c +++ b/daemons/dmeventd/plugins/thin/dmeventd_thin.c @@ -62,8 +62,6 @@ struct dso_state { DM_EVENT_LOG_FN("thin") -#define UUID_PREFIX "LVM-" - static int _run_command(struct dso_state *state) { char val[3][36];

1 0

master - cleanup: use existing define with prefix
by Zdenek Kabelac 04 Dec '17

04 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=110dac870c0a0f53b4569… Commit: 110dac870c0a0f53b4569f99daf5b6ac83a549f0 Parent: 1f73cadd2d7cf7eaef2bc9c9944b2c72fb67bf2d Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 4 14:26:37 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 4 15:38:50 2017 +0100 cleanup: use existing define with prefix --- lib/commands/toolcontext.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index 1985c30..1d21443 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -566,7 +566,7 @@ static int _process_config(struct cmd_context *cmd) #ifdef DEVMAPPER_SUPPORT dm_set_dev_dir(cmd->dev_dir); - if (!dm_set_uuid_prefix("LVM-")) + if (!dm_set_uuid_prefix(UUID_PREFIX)) return_0; #endif

1 0

master - cleanup: use log_warn
by Zdenek Kabelac 04 Dec '17

04 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1f73cadd2d7cf7eaef2bc… Commit: 1f73cadd2d7cf7eaef2bc9c9944b2c72fb67bf2d Parent: 76322d3b3e1cf7e118a8207975ae8342de454fa3 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 4 15:16:08 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 4 15:38:50 2017 +0100 cleanup: use log_warn Fucntion is not failing execution -> log_warn. --- libdm/libdm-deptree.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index c976cce..fb33605 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -2929,7 +2929,8 @@ int dm_tree_children_use_uuid(struct dm_tree_node *dnode, while ((child = dm_tree_next_child(&handle, dnode, 0))) { if (!(uuid = dm_tree_node_get_uuid(child))) { - log_error("Failed to get uuid for dtree node."); + log_warn("WARNING: Failed to get uuid for dtree node %s.", + _node_name(child)); return 1; }

1 0

master - clenaup: use log_warn
by Zdenek Kabelac 04 Dec '17

04 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=76322d3b3e1cf7e118a82… Commit: 76322d3b3e1cf7e118a8207975ae8342de454fa3 Parent: 2a01e3d4ca56b13c266629ebb343d1dfb5e9b583 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 4 13:34:10 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 4 15:38:50 2017 +0100 clenaup: use log_warn Avoid logging error when function is not failing. Technically can't really happen ATM anyway. --- libdm/libdm-deptree.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 6370e88..c976cce 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -2705,7 +2705,7 @@ static int _load_node(struct dm_tree_node *dnode) } if (!dm_task_no_open_count(dmt)) - log_error("Failed to disable open_count"); + log_warn("WARNING: Failed to disable open_count."); dm_list_iterate_items(seg, &dnode->props.segs) if (!_emit_segment(dmt, dnode->info.major, dnode->info.minor, @@ -2713,7 +2713,7 @@ static int _load_node(struct dm_tree_node *dnode) goto_out; if (!dm_task_suppress_identical_reload(dmt)) - log_error("Failed to suppress reload of identical tables."); + log_warn("WARNING: Failed to suppress reload of identical tables."); if ((r = dm_task_run(dmt))) { r = dm_task_get_info(dmt, &dnode->info);

1 0

master - cleanup: use _node_name
by Zdenek Kabelac 04 Dec '17

04 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2a01e3d4ca56b13c26662… Commit: 2a01e3d4ca56b13c266629ebb343d1dfb5e9b583 Parent: 925fec6ecb8f1915aee20e09a9703e1cb70cd0b1 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 4 13:33:05 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 4 15:38:50 2017 +0100 cleanup: use _node_name Use existing internal method for create 'name (major:minor)' string for debug messages and reduce some messages. --- libdm/libdm-deptree.c | 57 ++++++++++++++++++------------------------------- 1 files changed, 21 insertions(+), 36 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index f662d26..6370e88 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -597,8 +597,9 @@ static struct dm_tree_node *_find_dm_tree_node_by_uuid(struct dm_tree *dtree, static const char *_node_name(struct dm_tree_node *dnode) { if (dm_snprintf(dnode->dtree->buf, sizeof(dnode->dtree->buf), - "%s (%" PRIu32 ":%" PRIu32 ")", - dnode->name, dnode->info.major, dnode->info.minor) < 0) { + "%s (" FMTu32 ":" FMTu32 ")", + dnode->name ? dnode->name : "", + dnode->info.major, dnode->info.minor) < 0) { stack; return dnode->name; } @@ -609,12 +610,9 @@ static const char *_node_name(struct dm_tree_node *dnode) void dm_tree_node_set_udev_flags(struct dm_tree_node *dnode, uint16_t udev_flags) { - struct dm_info *dinfo = &dnode->info; - if (udev_flags != dnode->udev_flags) - log_debug_activation("Resetting %s (%" PRIu32 ":%" PRIu32 - ") udev_flags from 0x%x to 0x%x", - dnode->name, dinfo->major, dinfo->minor, + log_debug_activation("Resetting %s udev_flags from 0x%x to 0x%x.", + _node_name(dnode), dnode->udev_flags, udev_flags); dnode->udev_flags = udev_flags; } @@ -1398,8 +1396,8 @@ static int _thin_pool_get_status(struct dm_tree_node *dnode, dm_get_next_target(dmt, NULL, &start, &length, &type, &params); if (type && (strcmp(type, "thin-pool") != 0)) { - log_error("Expected thin-pool target for %d:%d and got %s.", - dnode->info.major, dnode->info.minor, type); + log_error("Expected thin-pool target for %s and got %s.", + _node_name(dnode), type); goto out; } @@ -1895,9 +1893,7 @@ int dm_tree_activate_children(struct dm_tree_node *dnode, if (!_resume_node(child->name, child->info.major, child->info.minor, child->props.read_ahead, child->props.read_ahead_flags, &newinfo, &child->dtree->cookie, child->udev_flags, child->info.suspended)) { - log_error("Unable to resume %s (%" PRIu32 - ":%" PRIu32 ")", child->name, child->info.major, - child->info.minor); + log_error("Unable to resume %s.", _node_name(child)); r = 0; continue; } @@ -1997,9 +1993,8 @@ static int _remove_node(struct dm_tree_node *dnode) if (!_deactivate_node(dnode->name, dnode->info.major, dnode->info.minor, &dnode->dtree->cookie, dnode->udev_flags, 0)) { - log_error("Failed to clean-up device with no table: %s %u:%u", - dnode->name ? dnode->name : "", - dnode->info.major, dnode->info.minor); + log_error("Failed to clean-up device with no table: %s.", + _node_name(dnode)); return 0; } return 1; @@ -2691,22 +2686,21 @@ static int _load_node(struct dm_tree_node *dnode) struct load_segment *seg; uint64_t seg_start = 0, existing_table_size; - log_verbose("Loading %s table (%" PRIu32 ":%" PRIu32 ")", dnode->name, - dnode->info.major, dnode->info.minor); + log_verbose("Loading table for %s.", _node_name(dnode)); if (!(dmt = dm_task_create(DM_DEVICE_RELOAD))) { - log_error("Reload dm_task creation failed for %s", dnode->name); + log_error("Reload dm_task creation failed for %s.", _node_name(dnode)); return 0; } if (!dm_task_set_major(dmt, dnode->info.major) || !dm_task_set_minor(dmt, dnode->info.minor)) { - log_error("Failed to set device number for %s reload.", dnode->name); + log_error("Failed to set device number for %s reload.", _node_name(dnode)); goto out; } if (dnode->props.read_only && !dm_task_set_ro(dmt)) { - log_error("Failed to set read only flag for %s", dnode->name); + log_error("Failed to set read only flag for %s.", _node_name(dnode)); goto out; } @@ -2724,10 +2718,8 @@ static int _load_node(struct dm_tree_node *dnode) if ((r = dm_task_run(dmt))) { r = dm_task_get_info(dmt, &dnode->info); if (r && !dnode->info.inactive_table) - log_verbose("Suppressed %s (%" PRIu32 ":%" PRIu32 - ") identical table reload.", - dnode->name, - dnode->info.major, dnode->info.minor); + log_verbose("Suppressed %s identical table reload.", + _node_name(dnode)); existing_table_size = dm_task_get_existing_table_size(dmt); if ((dnode->props.size_changed = @@ -2742,9 +2734,8 @@ static int _load_node(struct dm_tree_node *dnode) dnode->props.size_changed = 0; log_debug_activation("Table size changed from %" PRIu64 " to %" - PRIu64 " for %s (%" PRIu32 ":%" PRIu32 ").%s", - existing_table_size, seg_start, dnode->name, - dnode->info.major, dnode->info.minor, + PRIu64 " for %s.%s", existing_table_size, + seg_start, _node_name(dnode), dnode->props.size_changed ? "" : " (Ignoring.)"); } } @@ -2773,9 +2764,7 @@ static int _dm_tree_revert_activated(struct dm_tree_node *parent) } if (!_deactivate_node(child->name, child->info.major, child->info.minor, &child->dtree->cookie, child->udev_flags, 0)) { - log_error("Unable to deactivate %s (%" PRIu32 - ":%" PRIu32 ")", child->name, child->info.major, - child->info.minor); + log_error("Unable to deactivate %s.", _node_name(child)); return 0; } if (!_dm_tree_revert_activated(child)) @@ -2869,16 +2858,12 @@ int dm_tree_preload_children(struct dm_tree_node *dnode, child->props.read_ahead, child->props.read_ahead_flags, &newinfo, &child->dtree->cookie, child->udev_flags, child->info.suspended)) { - log_error("Unable to resume %s (%" PRIu32 - ":%" PRIu32 ")", child->name, child->info.major, - child->info.minor); + log_error("Unable to resume %s.", _node_name(child)); /* If the device was not previously active, we might as well remove this node. */ if (!child->info.live_table && !_deactivate_node(child->name, child->info.major, child->info.minor, &child->dtree->cookie, child->udev_flags, 0)) - log_error("Unable to deactivate %s (%" PRIu32 - ":%" PRIu32 ")", child->name, child->info.major, - child->info.minor); + log_error("Unable to deactivate %s.", _node_name(child)); r = 0; /* Each child is handled independently */ continue;

1 0

master - cleanup: stack tracing
by Zdenek Kabelac 04 Dec '17

04 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=925fec6ecb8f1915aee20… Commit: 925fec6ecb8f1915aee20e09a9703e1cb70cd0b1 Parent: e3366787b6349a190063a09b0c37ad5a641fcccf Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 4 13:31:40 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 4 15:38:50 2017 +0100 cleanup: stack tracing --- libdm/libdm-common.c | 4 ++-- libdm/libdm-deptree.c | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c index e983b03..f5c6062 100644 --- a/libdm/libdm-common.c +++ b/libdm/libdm-common.c @@ -2033,7 +2033,7 @@ int dm_mknodes(const char *name) int r = 0; if (!(dmt = dm_task_create(DM_DEVICE_MKNODES))) - return 0; + return_0; if (name && !dm_task_set_name(dmt, name)) goto out; @@ -2054,7 +2054,7 @@ int dm_driver_version(char *version, size_t size) int r = 0; if (!(dmt = dm_task_create(DM_DEVICE_VERSION))) - return 0; + return_0; if (!dm_task_run(dmt)) log_error("Failed to get driver version"); diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index ba11388..f662d26 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -813,10 +813,8 @@ static int _deps(struct dm_task **dmt, struct dm_pool *mem, uint32_t major, uint return 1; } - if (!(*dmt = dm_task_create(DM_DEVICE_DEPS))) { - log_error("deps dm_task creation failed"); - return 0; - } + if (!(*dmt = dm_task_create(DM_DEVICE_DEPS))) + return_0; if (!dm_task_set_major(*dmt, major) || !dm_task_set_minor(*dmt, minor)) { log_error("_deps: failed to set major:minor for (" FMTu32 ":" FMTu32 ").", @@ -877,10 +875,8 @@ static int _info_by_dev(uint32_t major, uint32_t minor, int with_open_count, struct dm_task *dmt; int r = 0; - if (!(dmt = dm_task_create(DM_DEVICE_INFO))) { - log_error("_info_by_dev: dm_task creation failed"); - return 0; - } + if (!(dmt = dm_task_create(DM_DEVICE_INFO))) + return_0; if (!dm_task_set_major(dmt, major) || !dm_task_set_minor(dmt, minor)) { log_error("_info_by_dev: Failed to set device number.");

1 0

master - cleanup: mark success at the end
by Zdenek Kabelac 04 Dec '17

04 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e3366787b6349a190063a… Commit: e3366787b6349a190063a09b0c37ad5a641fcccf Parent: 10f37345ebbd4822083bd9451f59df6074995bb8 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 4 12:49:57 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 4 15:38:50 2017 +0100 cleanup: mark success at the end Simplify setting 'success' return value and use common use-pattern for handling return code. --- libdm/libdm-deptree.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index d0b4658..ba11388 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -875,7 +875,7 @@ static int _info_by_dev(uint32_t major, uint32_t minor, int with_open_count, const char **name, const char **uuid) { struct dm_task *dmt; - int r; + int r = 0; if (!(dmt = dm_task_create(DM_DEVICE_INFO))) { log_error("_info_by_dev: dm_task creation failed"); @@ -883,32 +883,30 @@ static int _info_by_dev(uint32_t major, uint32_t minor, int with_open_count, } if (!dm_task_set_major(dmt, major) || !dm_task_set_minor(dmt, minor)) { - log_error("_info_by_dev: Failed to set device number"); - dm_task_destroy(dmt); - return 0; + log_error("_info_by_dev: Failed to set device number."); + goto out; } if (!with_open_count && !dm_task_no_open_count(dmt)) log_warn("WARNING: Failed to disable open_count."); - if (!(r = dm_task_run(dmt))) + if (!dm_task_run(dmt)) goto_out; - if (!(r = dm_task_get_info(dmt, info))) + if (!dm_task_get_info(dmt, info)) goto_out; if (name && !(*name = dm_pool_strdup(mem, dm_task_get_name(dmt)))) { log_error("name pool_strdup failed"); - r = 0; goto out; } if (uuid && !(*uuid = dm_pool_strdup(mem, dm_task_get_uuid(dmt)))) { log_error("uuid pool_strdup failed"); - r = 0; goto out; } + r = 1; out: dm_task_destroy(dmt); @@ -1341,7 +1339,7 @@ static int _suspend_node(const char *name, uint32_t major, uint32_t minor, int skip_lockfs, int no_flush, struct dm_info *newinfo) { struct dm_task *dmt; - int r; + int r = 0; log_verbose("Suspending %s (%" PRIu32 ":%" PRIu32 ")%s%s", name, major, minor, @@ -1355,8 +1353,7 @@ static int _suspend_node(const char *name, uint32_t major, uint32_t minor, if (!dm_task_set_major(dmt, major) || !dm_task_set_minor(dmt, minor)) { log_error("Failed to set device number for %s suspension.", name); - dm_task_destroy(dmt); - return 0; + goto out; } if (!dm_task_no_open_count(dmt)) @@ -1372,7 +1369,7 @@ static int _suspend_node(const char *name, uint32_t major, uint32_t minor, inc_suspended(); r = dm_task_get_info(dmt, newinfo); } - +out: dm_task_destroy(dmt); return r;

1 0

master - cleanup: drop impossible test case
by Zdenek Kabelac 04 Dec '17

04 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=10f37345ebbd4822083bd… Commit: 10f37345ebbd4822083bd9451f59df6074995bb8 Parent: 1f6d79ab4827929420e032f4fb77e03393f336a8 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 4 11:28:31 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 4 15:38:50 2017 +0100 cleanup: drop impossible test case This test can never be true since info is embeded struct. --- libdm/libdm-deptree.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 9bc16c9..d0b4658 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1025,7 +1025,7 @@ out: static int _node_clear_table(struct dm_tree_node *dnode, uint16_t udev_flags) { struct dm_task *dmt = NULL, *deps_dmt = NULL; - struct dm_info *info, deps_info; + struct dm_info *info = &dnode->info, deps_info; struct dm_deps *deps = NULL; const char *name, *uuid, *depname, *depuuid; const char *default_uuid_prefix; @@ -1033,11 +1033,6 @@ static int _node_clear_table(struct dm_tree_node *dnode, uint16_t udev_flags) uint32_t i; int r = 0; - if (!(info = &dnode->info)) { - log_error("_node_clear_table failed: missing info"); - return 0; - } - if (!(name = dm_tree_node_get_name(dnode))) { log_error("_node_clear_table failed: missing name"); return 0;

1 0

master - cleanup: simplier error message
by Zdenek Kabelac 04 Dec '17

04 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1f6d79ab4827929420e03… Commit: 1f6d79ab4827929420e032f4fb77e03393f336a8 Parent: 7379a2624beb6bbefff6f6d6222b1eac9f5980e6 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 4 11:25:01 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 4 15:38:50 2017 +0100 cleanup: simplier error message Use single 'error' message just with different reason. --- libdm/libdm-deptree.c | 33 +++++++++++++-------------------- 1 files changed, 13 insertions(+), 20 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 8fac4a1..9bc16c9 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -917,33 +917,26 @@ out: static int _check_device_not_in_use(const char *name, struct dm_info *info) { + const char *reason; + if (!info->exists) return 1; /* If sysfs is not used, use open_count information only. */ if (!*dm_sysfs_dir()) { - if (info->open_count) { - log_error("Device %s (%" PRIu32 ":%" PRIu32 ") in use", - name, info->major, info->minor); - return 0; - } - + if (!info->open_count) + return 1; + reason = "in use"; + } else if (dm_device_has_holders(info->major, info->minor)) + reason = "is used by another device"; + else if (dm_device_has_mounted_fs(info->major, info->minor)) + reason = "constains a filesystem in use"; + else return 1; - } - if (dm_device_has_holders(info->major, info->minor)) { - log_error("Device %s (%" PRIu32 ":%" PRIu32 ") is used " - "by another device.", name, info->major, info->minor); - return 0; - } - - if (dm_device_has_mounted_fs(info->major, info->minor)) { - log_error("Device %s (%" PRIu32 ":%" PRIu32 ") contains " - "a filesystem in use.", name, info->major, info->minor); - return 0; - } - - return 1; + log_error("Device %s (" FMTu32 ":" FMTu32 ") %s.", + name, info->major, info->minor, reason); + return 0; } /* Check if all parent nodes of given node have open_count == 0 */

1 0

master - cleanup: futher code reduction
by Zdenek Kabelac 04 Dec '17

04 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7379a2624beb6bbefff6f… Commit: 7379a2624beb6bbefff6f6d6222b1eac9f5980e6 Parent: 2a22576b2d5b839f30d0dd7fb652920b303366f3 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 4 10:38:39 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 4 15:38:50 2017 +0100 cleanup: futher code reduction Just like everywhere else - use single if() for major:minor setup (it basically can't fail as of today anyway) Always leave funtion with correctly set pointers even on error path. --- libdm/libdm-deptree.c | 26 ++++++++------------------ 1 files changed, 8 insertions(+), 18 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index d6c2693..8fac4a1 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -803,13 +803,11 @@ static int _deps(struct dm_task **dmt, struct dm_pool *mem, uint32_t major, uint struct dm_info *info, struct dm_deps **deps) { memset(info, 0, sizeof(*info)); + *name = ""; + *uuid = ""; + *deps = NULL; if (!dm_is_dm_major(major)) { - if (name) - *name = ""; - if (uuid) - *uuid = ""; - *deps = NULL; info->major = major; info->minor = minor; return 1; @@ -820,14 +818,8 @@ static int _deps(struct dm_task **dmt, struct dm_pool *mem, uint32_t major, uint return 0; } - if (!dm_task_set_major(*dmt, major)) { - log_error("_deps: failed to set major for (%" PRIu32 ":%" PRIu32 ")", - major, minor); - goto failed; - } - - if (!dm_task_set_minor(*dmt, minor)) { - log_error("_deps: failed to set minor for (%" PRIu32 ":%" PRIu32 ")", + if (!dm_task_set_major(*dmt, major) || !dm_task_set_minor(*dmt, minor)) { + log_error("_deps: failed to set major:minor for (" FMTu32 ":" FMTu32 ").", major, minor); goto failed; } @@ -850,11 +842,7 @@ static int _deps(struct dm_task **dmt, struct dm_pool *mem, uint32_t major, uint goto failed; } - if (!info->exists) { - *name = ""; - *uuid = ""; - *deps = NULL; - } else { + if (info->exists) { if (info->major != major) { log_error("Inconsistent dtree major number: %u != %u", major, info->major); @@ -874,6 +862,8 @@ static int _deps(struct dm_task **dmt, struct dm_pool *mem, uint32_t major, uint failed: dm_task_destroy(*dmt); + *dmt = NULL; + return 0; }

1 0

master - cleanup: drop unused header
by Zdenek Kabelac 04 Dec '17

04 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2a22576b2d5b839f30d0d… Commit: 2a22576b2d5b839f30d0dd7fb652920b303366f3 Parent: e447d7ca5e178bc7b13d5aabaef3d160b4655f07 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Dec 1 22:58:47 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 4 15:38:50 2017 +0100 cleanup: drop unused header DM_UUID_LEN is no longer needed. --- lib/activate/dev_manager.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 5662090..c050f34 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -26,7 +26,6 @@ #include "activate.h" #include "lvm-exec.h" #include "str_list.h" -#include "dm-ioctl.h" /* for DM_UUID_LEN */ #include <limits.h> #include <dirent.h>

1 0

master - libdm: support for replicator target is dropped
by Zdenek Kabelac 04 Dec '17

04 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e447d7ca5e178bc7b13d5… Commit: e447d7ca5e178bc7b13d5aabaef3d160b4655f07 Parent: 63368a5064dd20a1fb5a2f4110704059c79b3ced Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 4 15:27:05 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 4 15:38:50 2017 +0100 libdm: support for replicator target is dropped Replicator never really existed in upstream kernel and its support got deprecated. Also its support never got finished so no code is supposed to be using it anyway. Libdm symbols are remaining, just the implementation will always return failure - so any user of: dm_tree_node_add_replicator_dev_target() dm_tree_node_add_replicator_target(). will now always recieve error message. --- WHATS_NEW_DM | 1 + libdm/libdm-deptree.c | 271 ++----------------------------------------------- 2 files changed, 8 insertions(+), 264 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 56b8153..dfa5a97 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.146 - ==================================== + Remove code supporting replicator target. Do not ignore failure of _info_by_dev(). Propagate delayed resume for pvmove subvolumes. Suppress integrity encryption keys in 'table' output unless --showkeys supplied. diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index ff7e9b4..d6c2693 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -24,8 +24,6 @@ #define MAX_TARGET_PARAMSIZE 500000 -#define REPLICATOR_LOCAL_SITE 0 - /* Supported segment types */ enum { SEG_CACHE, @@ -33,8 +31,6 @@ enum { SEG_ERROR, SEG_LINEAR, SEG_MIRRORED, - SEG_REPLICATOR, - SEG_REPLICATOR_DEV, SEG_SNAPSHOT, SEG_SNAPSHOT_ORIGIN, SEG_SNAPSHOT_MERGE, @@ -73,8 +69,6 @@ static const struct { { SEG_ERROR, "error" }, { SEG_LINEAR, "linear" }, { SEG_MIRRORED, "mirror" }, - { SEG_REPLICATOR, "replicator" }, - { SEG_REPLICATOR_DEV, "replicator-dev" }, { SEG_SNAPSHOT, "snapshot" }, { SEG_SNAPSHOT_ORIGIN, "snapshot-origin" }, { SEG_SNAPSHOT_MERGE, "snapshot-merge" }, @@ -118,11 +112,6 @@ struct seg_area { struct dm_tree_node *dev_node; uint64_t offset; - - unsigned rsite_index; /* Replicator site index */ - struct dm_tree_node *slog; /* Replicator sync log node */ - uint64_t region_size; /* Replicator sync log size */ - uint32_t flags; /* Replicator sync log flags */ }; struct dm_thin_message { @@ -151,18 +140,6 @@ struct thin_message { int expected_errno; }; -/* Replicator-log has a list of sites */ -/* FIXME: maybe move to seg_area too? */ -struct replicator_site { - struct dm_list list; - - unsigned rsite_index; - dm_replicator_mode_t mode; - uint32_t async_timeout; - uint32_t fall_behind_ios; - uint64_t fall_behind_data; -}; - /* Per-segment properties */ struct load_segment { struct dm_list list; @@ -171,8 +148,8 @@ struct load_segment { uint64_t size; - unsigned area_count; /* Linear + Striped + Mirrored + Crypt + Replicator */ - struct dm_list areas; /* Linear + Striped + Mirrored + Crypt + Replicator */ + unsigned area_count; /* Linear + Striped + Mirrored + Crypt */ + struct dm_list areas; /* Linear + Striped + Mirrored + Crypt */ uint32_t stripe_size; /* Striped + raid */ @@ -182,7 +159,7 @@ struct load_segment { struct dm_tree_node *origin; /* Snapshot + Snapshot origin + Cache */ struct dm_tree_node *merge; /* Snapshot */ - struct dm_tree_node *log; /* Mirror + Replicator */ + struct dm_tree_node *log; /* Mirror */ uint32_t region_size; /* Mirror + raid */ unsigned clustered; /* Mirror */ unsigned mirror_area_count; /* Mirror */ @@ -199,13 +176,6 @@ struct load_segment { uint64_t iv_offset; /* Crypt */ const char *key; /* Crypt */ - const char *rlog_type; /* Replicator */ - struct dm_list rsites; /* Replicator */ - unsigned rsite_count; /* Replicator */ - unsigned rdevice_count; /* Replicator */ - struct dm_tree_node *replicator;/* Replicator-dev */ - uint64_t rdevice_index; /* Replicator-dev */ - int delta_disks; /* raid reshape number of disks */ int data_offset; /* raid reshape data offset on disk to set */ uint64_t rebuilds[RAID_BITMAP_SIZE]; /* raid */ @@ -2099,47 +2069,9 @@ static int _emit_areas_line(struct dm_task *dmt __attribute__((unused)), struct seg_area *area; char devbuf[DM_FORMAT_DEV_BUFSIZE]; unsigned first_time = 1; - const char *logtype, *synctype; - unsigned log_parm_count; dm_list_iterate_items(area, &seg->areas) { switch (seg->type) { - case SEG_REPLICATOR_DEV: - if (!_build_dev_string(devbuf, sizeof(devbuf), area->dev_node)) - return_0; - - EMIT_PARAMS(*pos, " %d 1 %s", area->rsite_index, devbuf); - if (first_time) - EMIT_PARAMS(*pos, " nolog 0"); - else { - /* Remote devices */ - log_parm_count = (area->flags & - (DM_NOSYNC | DM_FORCESYNC)) ? 2 : 1; - - if (!area->slog) { - devbuf[0] = 0; /* Only core log parameters */ - logtype = "core"; - } else { - devbuf[0] = ' '; /* Extra space before device name */ - if (!_build_dev_string(devbuf + 1, - sizeof(devbuf) - 1, - area->slog)) - return_0; - logtype = "disk"; - log_parm_count++; /* Extra sync log device name parameter */ - } - - EMIT_PARAMS(*pos, " %s %u%s %" PRIu64, logtype, - log_parm_count, devbuf, area->region_size); - - synctype = (area->flags & DM_NOSYNC) ? - " nosync" : (area->flags & DM_FORCESYNC) ? - " sync" : NULL; - - if (synctype) - EMIT_PARAMS(*pos, "%s", synctype); - } - break; case SEG_RAID0: case SEG_RAID0_META: case SEG_RAID1: @@ -2181,42 +2113,6 @@ static int _emit_areas_line(struct dm_task *dmt __attribute__((unused)), return 1; } -static int _replicator_emit_segment_line(const struct load_segment *seg, char *params, - size_t paramsize, int *pos) -{ - const struct load_segment *rlog_seg; - struct replicator_site *rsite; - char rlogbuf[DM_FORMAT_DEV_BUFSIZE]; - unsigned parm_count; - - if (!seg->log || !_build_dev_string(rlogbuf, sizeof(rlogbuf), seg->log)) - return_0; - - rlog_seg = dm_list_item(dm_list_last(&seg->log->props.segs), - struct load_segment); - - EMIT_PARAMS(*pos, "%s 4 %s 0 auto %" PRIu64, - seg->rlog_type, rlogbuf, rlog_seg->size); - - dm_list_iterate_items(rsite, &seg->rsites) { - parm_count = (rsite->fall_behind_data - || rsite->fall_behind_ios - || rsite->async_timeout) ? 4 : 2; - - EMIT_PARAMS(*pos, " blockdev %u %u %s", parm_count, rsite->rsite_index, - (rsite->mode == DM_REPLICATOR_SYNC) ? "synchronous" : "asynchronous"); - - if (rsite->fall_behind_data) - EMIT_PARAMS(*pos, " data %" PRIu64, rsite->fall_behind_data); - else if (rsite->fall_behind_ios) - EMIT_PARAMS(*pos, " ios %" PRIu32, rsite->fall_behind_ios); - else if (rsite->async_timeout) - EMIT_PARAMS(*pos, " timeout %" PRIu32, rsite->async_timeout); - } - - return 1; -} - /* * Returns: 1 on success, 0 on failure */ @@ -2677,21 +2573,6 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major, if (!r) return_0; break; - case SEG_REPLICATOR: - if ((r = _replicator_emit_segment_line(seg, params, paramsize, - &pos)) <= 0) { - stack; - return r; - } - break; - case SEG_REPLICATOR_DEV: - if (!seg->replicator || !_build_dev_string(originbuf, - sizeof(originbuf), - seg->replicator)) - return_0; - - EMIT_PARAMS(pos, "%s %" PRIu64, originbuf, seg->rdevice_index); - break; case SEG_SNAPSHOT: case SEG_SNAPSHOT_MERGE: if (!_build_dev_string(originbuf, sizeof(originbuf), seg->origin)) @@ -2757,7 +2638,6 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major, switch(seg->type) { case SEG_ERROR: - case SEG_REPLICATOR: case SEG_SNAPSHOT: case SEG_SNAPSHOT_ORIGIN: case SEG_SNAPSHOT_MERGE: @@ -2768,7 +2648,6 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major, break; case SEG_CRYPT: case SEG_LINEAR: - case SEG_REPLICATOR_DEV: case SEG_STRIPED: if ((r = _emit_areas_line(dmt, seg, params, paramsize, &pos)) <= 0) { stack; @@ -3573,74 +3452,8 @@ int dm_tree_node_add_replicator_target(struct dm_tree_node *node, uint64_t fall_behind_data, uint32_t fall_behind_ios) { - struct load_segment *rseg; - struct replicator_site *rsite; - - /* Local site0 - adds replicator segment and links rlog device */ - if (rsite_index == REPLICATOR_LOCAL_SITE) { - if (node->props.segment_count) { - log_error(INTERNAL_ERROR "Attempt to add replicator segment to already used node."); - return 0; - } - - if (!(rseg = _add_segment(node, SEG_REPLICATOR, size))) - return_0; - - if (!(rseg->log = dm_tree_find_node_by_uuid(node->dtree, rlog_uuid))) { - log_error("Missing replicator log uuid %s.", rlog_uuid); - return 0; - } - - if (!_link_tree_nodes(node, rseg->log)) - return_0; - - if (strcmp(rlog_type, "ringbuffer") != 0) { - log_error("Unsupported replicator log type %s.", rlog_type); - return 0; - } - - if (!(rseg->rlog_type = dm_pool_strdup(node->dtree->mem, rlog_type))) - return_0; - - dm_list_init(&rseg->rsites); - rseg->rdevice_count = 0; - node->activation_priority = 1; - } - - /* Add site to segment */ - if (mode == DM_REPLICATOR_SYNC - && (async_timeout || fall_behind_ios || fall_behind_data)) { - log_error("Async parameters passed for synchronnous replicator."); - return 0; - } - - if (node->props.segment_count != 1) { - log_error(INTERNAL_ERROR "Attempt to add remote site area before setting replicator log."); - return 0; - } - - rseg = dm_list_item(dm_list_last(&node->props.segs), struct load_segment); - if (rseg->type != SEG_REPLICATOR) { - log_error(INTERNAL_ERROR "Attempt to use non replicator segment %s.", - _dm_segtypes[rseg->type].target); - return 0; - } - - if (!(rsite = dm_pool_zalloc(node->dtree->mem, sizeof(*rsite)))) { - log_error("Failed to allocate remote site segment."); - return 0; - } - - dm_list_add(&rseg->rsites, &rsite->list); - rseg->rsite_count++; - - rsite->mode = mode; - rsite->async_timeout = async_timeout; - rsite->fall_behind_data = fall_behind_data; - rsite->fall_behind_ios = fall_behind_ios; - rsite->rsite_index = rsite_index; - - return 1; + log_error("Replicator segment is unsupported."); + return 0; } /* Appends device node to Replicator */ @@ -3654,78 +3467,8 @@ int dm_tree_node_add_replicator_dev_target(struct dm_tree_node *node, uint32_t slog_flags, uint32_t slog_region_size) { - struct seg_area *area; - struct load_segment *rseg; - struct load_segment *rep_seg; - - if (rsite_index == REPLICATOR_LOCAL_SITE) { - /* Site index for local target */ - if (!(rseg = _add_segment(node, SEG_REPLICATOR_DEV, size))) - return_0; - - if (!(rseg->replicator = dm_tree_find_node_by_uuid(node->dtree, replicator_uuid))) { - log_error("Missing replicator uuid %s.", replicator_uuid); - return 0; - } - - /* Local slink0 for replicator must be always initialized first */ - if (rseg->replicator->props.segment_count != 1) { - log_error(INTERNAL_ERROR "Attempt to use non replicator segment."); - return 0; - } - - rep_seg = dm_list_item(dm_list_last(&rseg->replicator->props.segs), struct load_segment); - if (rep_seg->type != SEG_REPLICATOR) { - log_error(INTERNAL_ERROR "Attempt to use non replicator segment %s.", - _dm_segtypes[rep_seg->type].target); - return 0; - } - rep_seg->rdevice_count++; - - if (!_link_tree_nodes(node, rseg->replicator)) - return_0; - - rseg->rdevice_index = rdevice_index; - } else { - /* Local slink0 for replicator must be always initialized first */ - if (node->props.segment_count != 1) { - log_error(INTERNAL_ERROR "Attempt to use non replicator-dev segment."); - return 0; - } - - rseg = dm_list_item(dm_list_last(&node->props.segs), struct load_segment); - if (rseg->type != SEG_REPLICATOR_DEV) { - log_error(INTERNAL_ERROR "Attempt to use non replicator-dev segment %s.", - _dm_segtypes[rseg->type].target); - return 0; - } - } - - if (!(slog_flags & DM_CORELOG) && !slog_uuid) { - log_error("Unspecified sync log uuid."); - return 0; - } - - if (!dm_tree_node_add_target_area(node, NULL, rdev_uuid, 0)) - return_0; - - area = dm_list_item(dm_list_last(&rseg->areas), struct seg_area); - - if (!(slog_flags & DM_CORELOG)) { - if (!(area->slog = dm_tree_find_node_by_uuid(node->dtree, slog_uuid))) { - log_error("Couldn't find sync log uuid %s.", slog_uuid); - return 0; - } - - if (!_link_tree_nodes(node, area->slog)) - return_0; - } - - area->flags = slog_flags; - area->region_size = slog_region_size; - area->rsite_index = rsite_index; - - return 1; + log_error("Replicator targer is unsupported."); + return 0; } static struct load_segment *_get_single_load_segment(struct dm_tree_node *node,

1 0

master - libdm: watch for failing _info_by_dev
by Zdenek Kabelac 04 Dec '17

04 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=63368a5064dd20a1fb5a2… Commit: 63368a5064dd20a1fb5a2f4110704059c79b3ced Parent: b74e7f6a781bf7dc4914d8294fcbc6881a539f2e Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Dec 4 15:05:44 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Dec 4 15:38:50 2017 +0100 libdm: watch for failing _info_by_dev Separate handling of error code from _info_by_dev. This error can only happeng when we are running out of memory. In such case there is urgent need to stop any futher proceeding of command and run to error ASAP. --- WHATS_NEW_DM | 1 + libdm/libdm-deptree.c | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 9cec953..56b8153 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.146 - ==================================== + Do not ignore failure of _info_by_dev(). Propagate delayed resume for pvmove subvolumes. Suppress integrity encryption keys in 'table' output unless --showkeys supplied. diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 8c623bf..ff7e9b4 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1011,8 +1011,10 @@ static int _node_has_closed_parents(struct dm_tree_node *node, return_0; /* FIXME Is this normal? */ /* Refresh open_count */ - if (!_info_by_dev(dinfo->major, dinfo->minor, 1, &info, NULL, NULL, NULL) || - !info.exists) + if (!_info_by_dev(dinfo->major, dinfo->minor, 1, &info, NULL, NULL, NULL)) + return_0; + + if (!info.exists) continue; if (info.open_count) { @@ -1137,7 +1139,7 @@ static int _node_clear_table(struct dm_tree_node *dnode, uint16_t udev_flags) if (!_info_by_dev(MAJOR(deps->device[i]), MINOR(deps->device[i]), 1, &deps_info, dnode->dtree->mem, &name, &uuid)) - continue; + goto_out; /* Proceed if device is an 'orphan' - unreferenced and without a live table. */ if (!deps_info.exists || deps_info.live_table || deps_info.open_count) @@ -1653,8 +1655,10 @@ static int _dm_tree_deactivate_children(struct dm_tree_node *dnode, continue; /* Refresh open_count */ - if (!_info_by_dev(dinfo->major, dinfo->minor, 1, &info, NULL, NULL, NULL) || - !info.exists) + if (!_info_by_dev(dinfo->major, dinfo->minor, 1, &info, NULL, NULL, NULL)) + return_0; + + if (!info.exists) continue; if (info.open_count) { @@ -1773,8 +1777,10 @@ int dm_tree_suspend_children(struct dm_tree_node *dnode, if (!_children_suspended(child, 1, uuid_prefix, uuid_prefix_len)) continue; - if (!_info_by_dev(dinfo->major, dinfo->minor, 0, &info, NULL, NULL, NULL) || - !info.exists || info.suspended) + if (!_info_by_dev(dinfo->major, dinfo->minor, 0, &info, NULL, NULL, NULL)) + return_0; + + if (!info.exists || info.suspended) continue; /* If child has some real messages send them */

1 0

master - test: allow to succeed in the cluster
by Heinz Mauelshagen 01 Dec '17

01 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b74e7f6a781bf7dc4914d… Commit: b74e7f6a781bf7dc4914d8294fcbc6881a539f2e Parent: 053314f2954dd94f707ef4a6ae9967ecd69fad6e Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Fri Dec 1 18:59:55 2017 +0100 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Fri Dec 1 18:59:55 2017 +0100 test: allow to succeed in the cluster Avoiding "$(get first_extent_sector "$d")" in the loop allows the test to succeed in the cluster. Further cluster analysis needed to get to the core reason. --- test/shell/lvconvert-repair-raid.sh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/test/shell/lvconvert-repair-raid.sh b/test/shell/lvconvert-repair-raid.sh index c866455..d29b72d 100644 --- a/test/shell/lvconvert-repair-raid.sh +++ b/test/shell/lvconvert-repair-raid.sh @@ -25,10 +25,12 @@ aux lvmconf 'allocation/maximise_cling = 0' \ aux prepare_vg 8 80 get_devs +offset=$(get first_extent_sector $dev1) + function delay { for d in "${DEVICES[@]}"; do - aux delay_dev "$d" 0 $1 "$(get first_extent_sector "$d")" + aux delay_dev "$d" 0 $1 "$offset" done }

1 0

master - test: allow to succeed in the cluster
by Heinz Mauelshagen 01 Dec '17

01 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=01b3344cbda712130dec9… Commit: 01b3344cbda712130dec96924fb3c2bdfe4c595b Parent: 053314f2954dd94f707ef4a6ae9967ecd69fad6e Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Fri Dec 1 18:57:21 2017 +0100 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Fri Dec 1 18:57:21 2017 +0100 test: allow to succeed in the cluster Avoiding in the loop allows the test to succeed in the cluster. Further cluster analysis needed to get to the core reason. --- test/shell/lvconvert-repair-raid.sh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/test/shell/lvconvert-repair-raid.sh b/test/shell/lvconvert-repair-raid.sh index c866455..d29b72d 100644 --- a/test/shell/lvconvert-repair-raid.sh +++ b/test/shell/lvconvert-repair-raid.sh @@ -25,10 +25,12 @@ aux lvmconf 'allocation/maximise_cling = 0' \ aux prepare_vg 8 80 get_devs +offset=$(get first_extent_sector $dev1) + function delay { for d in "${DEVICES[@]}"; do - aux delay_dev "$d" 0 $1 "$(get first_extent_sector "$d")" + aux delay_dev "$d" 0 $1 "$offset" done }

1 0

master - test: add large tests skip option
by Heinz Mauelshagen 01 Dec '17

01 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=053314f2954dd94f707ef… Commit: 053314f2954dd94f707ef4a6ae9967ecd69fad6e Parent: 7aef59c6c332e5b9a983f5559acfa13834b2d064 Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Fri Dec 1 18:50:55 2017 +0100 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Fri Dec 1 18:50:55 2017 +0100 test: add large tests skip option The lvm2 test suite aims at small test resource footprints (few PVs, small PV sizes) to run on tmpfs backed loop device. OTOH, lvconvert-reshape-raid.sh aims to test the maxima of supported total stripes of 64. This patch adds a prerequisite conditional to skip tests using more than 14 stripes. It requires the target version 1.13.1 to avoid deadlocks. --- test/shell/lvconvert-raid-reshape.sh | 60 ++++++++++++++++++++------------- 1 files changed, 36 insertions(+), 24 deletions(-) diff --git a/test/shell/lvconvert-raid-reshape.sh b/test/shell/lvconvert-raid-reshape.sh index b07e1ce..28bff0d 100644 --- a/test/shell/lvconvert-raid-reshape.sh +++ b/test/shell/lvconvert-raid-reshape.sh @@ -13,22 +13,25 @@ SKIP_WITH_LVMLOCKD=1 SKIP_WITH_LVMPOLLD=1 -. lib/inittest +LVM_SKIP_LARGE_TESTS=0 -if [[ "$TESTDIR" == /dev/shm/* ]]; then - echo "Disabled. This tests is permanently causing /dev/shm exhaustion. RHBZ#1501145" - false -fi +. lib/inittest which mkfs.ext4 || skip -aux have_raid 1 12 0 || skip +aux have_raid 1 13 1 || skip # needed to address RHBZ#1501145 # Temporarily skip reshape tests on single-core CPUs until there's a fix for # https://bugzilla.redhat.com/1443999 - AGK 2017/04/20 #aux have_multi_core || skip # dropping single-core limitation with 1.12 target -aux prepare_pvs 65 32 +if [ $LVM_SKIP_LARGE_TESTS -eq 0 ] +then + aux prepare_pvs 65 9 +else + aux prepare_pvs 20 9 +fi + get_devs vgcreate -s 1M "$vg" "${DEVICES[@]}" @@ -66,7 +69,7 @@ function _lvconvert [ "${level:0:7}" = "striped" ] && wait_and_check=0 [ "${level:0:5}" = "raid0" ] && wait_and_check=0 - lvconvert -y --ty $req_level $R $vg/$lv || return $? + lvconvert -y --ty $req_level $R "$DM_DEV_DIR/$vg/$lv" || return $? check lv_first_seg_field $vg/$lv segtype "$level" check lv_first_seg_field $vg/$lv data_stripes $data_stripes @@ -97,7 +100,7 @@ function _reshape_layout [[ "$opts" =~ "--stripes" ]] && ignore_a_chars=1 - lvconvert -vvvv -y --ty $type $opts $vg/$lv + lvconvert -y --ty $type $opts "$DM_DEV_DIR/$vg/$lv" check lv_first_seg_field $vg/$lv segtype "$type" check lv_first_seg_field $vg/$lv data_stripes $data_stripes check lv_first_seg_field $vg/$lv stripes $stripes @@ -114,6 +117,7 @@ function _reshape_layout # # Create 3-way striped raid5 (4 legs total) +# _lvcreate raid5_ls 3 4 16M $vg $lv1 _lvcreate raid5_ls 3 4 16M $vg $lv1 check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" aux wait_for_sync $vg $lv1 @@ -149,24 +153,32 @@ _reshape_layout raid5_ls 9 10 $vg $lv1 --stripes 9 # Convert raid5_ls to 14 stripes _reshape_layout raid5_ls 14 15 $vg $lv1 --stripes 14 -# Convert raid5_ls to 63 stripes -_reshape_layout raid5_ls 63 64 $vg $lv1 --stripes 63 - -# Convert raid5_ls back to 27 stripes -_reshape_layout raid5_ls 27 64 $vg $lv1 --stripes 27 --force -_reshape_layout raid5_ls 27 28 $vg $lv1 --stripes 27 - -# Convert raid5_ls back to 4 stripes checking -# conversion to striped/raid* gets rejected -# with existing LVs to be removed afer reshape -_reshape_layout raid5_ls 4 28 $vg $lv1 --stripes 4 --force +if [ $LVM_SKIP_LARGE_TESTS -eq 0 ] +then + # Convert raid5_ls to 63 stripes + _reshape_layout raid5_ls 63 64 $vg $lv1 --stripes 63 + + # Convert raid5_ls back to 27 stripes + _reshape_layout raid5_ls 27 64 $vg $lv1 --stripes 27 --force + _reshape_layout raid5_ls 27 28 $vg $lv1 --stripes 27 + + # Convert raid5_ls back to 4 stripes checking + # conversion to striped/raid* gets rejected + # with existing LVs to be removed afer reshape + _reshape_layout raid5_ls 4 28 $vg $lv1 --stripes 4 --force +else + # Convert raid5_ls back to 4 stripes checking + # conversion to striped/raid* gets rejected + # with existing LVs to be removed afer reshape + _reshape_layout raid5_ls 4 15 $vg $lv1 --stripes 4 --force +fi # No we got the data reshaped and the freed SubLVs still present # -> check takeover request gets rejected -not lvconvert --yes --type striped $vg/$lv1 -not lvconvert --yes --type raid0 $vg/$lv1 -not lvconvert --yes --type raid0_meta $vg/$lv1 -not lvconvert --yes --type raid6 $vg/$lv1 +not lvconvert --yes --type striped "$DM_DEV_DIR/$vg/$lv1" +not lvconvert --yes --type raid0 "$DM_DEV_DIR/$vg/$lv1" +not lvconvert --yes --type "$DM_DEV_DIR/raid0_meta $vg/$lv1" +not lvconvert --yes --type "$DM_DEV_DIR/raid6 $vg/$lv1" # Remove the freed SubLVs _reshape_layout raid5_ls 4 5 $vg $lv1 --stripes 4

1 0

master - test: reduce pv sizes, fix comment and stripe size
by Heinz Mauelshagen 01 Dec '17

01 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7aef59c6c332e5b9a983f… Commit: 7aef59c6c332e5b9a983f5559acfa13834b2d064 Parent: 16fa9d9ed5569ac6b8f87375c2902de8280eefe4 Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Fri Dec 1 18:42:37 2017 +0100 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Fri Dec 1 18:42:37 2017 +0100 test: reduce pv sizes, fix comment and stripe size --- .../lvconvert-raid-reshape-striped_to_linear.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/shell/lvconvert-raid-reshape-striped_to_linear.sh b/test/shell/lvconvert-raid-reshape-striped_to_linear.sh index ba90f57..5230b2b 100644 --- a/test/shell/lvconvert-raid-reshape-striped_to_linear.sh +++ b/test/shell/lvconvert-raid-reshape-striped_to_linear.sh @@ -22,7 +22,7 @@ aux have_raid 1 12 0 || skip # https://bugzilla.redhat.com/1443999 - AGK 2017/04/20 aux have_multi_core || skip -aux prepare_vg 5 +aux prepare_vg 5 20 # # Test single step linear -> striped conversion @@ -69,7 +69,7 @@ fsck -fn $DM_DEV_DIR/$vg/$lv1 check lv_first_seg_field $vg/$lv1 segtype "raid5_n" check lv_first_seg_field $vg/$lv1 data_stripes 1 check lv_first_seg_field $vg/$lv1 stripes 5 -check lv_first_seg_field $vg/$lv1 stripesize "64.00k" +check lv_first_seg_field $vg/$lv1 stripesize "32.00k" check lv_first_seg_field $vg/$lv1 regionsize "1.00m" check lv_first_seg_field $vg/$lv1 reshape_len_le 10 # for slv in {0..4} @@ -84,7 +84,7 @@ lvconvert -y --stripes 1 $vg/$lv1 check lv_first_seg_field $vg/$lv1 segtype "raid5_n" check lv_first_seg_field $vg/$lv1 data_stripes 1 check lv_first_seg_field $vg/$lv1 stripes 2 -check lv_first_seg_field $vg/$lv1 stripesize "64.00k" +check lv_first_seg_field $vg/$lv1 stripesize "32.00k" check lv_first_seg_field $vg/$lv1 regionsize "1.00m" check lv_first_seg_field $vg/$lv1 reshape_len_le 4 @@ -98,7 +98,7 @@ check lv_first_seg_field $vg/$lv1 stripesize "0" check lv_first_seg_field $vg/$lv1 regionsize "1.00m" check lv_first_seg_field $vg/$lv1 reshape_len_le "" -# Convert raid5_n -> linear +# Convert raid1 -> linear lvconvert -y --type linear $vg/$lv1 fsck -fn $DM_DEV_DIR/$vg/$lv1 check lv_first_seg_field $vg/$lv1 segtype "linear"

1 0

master - test: cleanup command
by Heinz Mauelshagen 01 Dec '17

01 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=16fa9d9ed5569ac6b8f87… Commit: 16fa9d9ed5569ac6b8f87375c2902de8280eefe4 Parent: 4daad1cf11d9bb16ff6d8f3adc0918cbacfbe398 Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Fri Dec 1 18:39:38 2017 +0100 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Fri Dec 1 18:39:38 2017 +0100 test: cleanup command --- test/shell/lvchange-partial-raid10.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/shell/lvchange-partial-raid10.sh b/test/shell/lvchange-partial-raid10.sh index 83193b2..caec3a3 100644 --- a/test/shell/lvchange-partial-raid10.sh +++ b/test/shell/lvchange-partial-raid10.sh @@ -26,7 +26,7 @@ lvcreate --type raid10 -m 1 -i 2 -l 2 -n $lv1 $vg aux wait_for_sync $vg $lv1 lvchange -an $vg/$lv1 aux disable_dev "$dev1" "$dev3" -lvchange -ay $vg/$lv1 --partial +lvchange -ay --partial $vg/$lv1 lvchange -an $vg/$lv1 aux enable_dev "$dev1"

1 0

master - lv_manip: allow extension on --nosync raid lv
by Heinz Mauelshagen 01 Dec '17

01 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4daad1cf11d9bb16ff6d8… Commit: 4daad1cf11d9bb16ff6d8f3adc0918cbacfbe398 Parent: 3688eeeea0a81e8dbc02d1c9d46cb983a4d8d79b Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Fri Dec 1 18:38:18 2017 +0100 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Fri Dec 1 18:38:18 2017 +0100 lv_manip: allow extension on --nosync raid lv If the recovery of the repleced leg(s) of a RaidLV created without initial resynchronization (i.e. "lvcreate --nosync ...") got interrupted, it can't be extended because of the < 100% sync rate. --- lib/metadata/lv_manip.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index fb152ac..6b2d1f1 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -4233,7 +4233,8 @@ int lv_extend(struct logical_volume *lv, log_error("Failed to get sync percent for %s.", display_lvname(lv)); goto out; - } else if (sync_percent == DM_PERCENT_100) { + } else if (lv_is_not_synced(lv) || + sync_percent == DM_PERCENT_100) { log_verbose("Skipping initial resync for " "extended portion of %s", display_lvname(lv));

1 0

master - test: disable new reshape test until target version 1.13.1
by Heinz Mauelshagen 01 Dec '17

01 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3688eeeea0a81e8dbc02d… Commit: 3688eeeea0a81e8dbc02d1c9d46cb983a4d8d79b Parent: 9681d98cc401681ab60033b6595caf8355f8748d Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Fri Dec 1 18:33:11 2017 +0100 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Fri Dec 1 18:33:11 2017 +0100 test: disable new reshape test until target version 1.13.1 --- test/shell/lvconvert-raid-reshape-load.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/shell/lvconvert-raid-reshape-load.sh b/test/shell/lvconvert-raid-reshape-load.sh index c01127b..4ccf01f 100644 --- a/test/shell/lvconvert-raid-reshape-load.sh +++ b/test/shell/lvconvert-raid-reshape-load.sh @@ -20,7 +20,7 @@ LVM_SKIP_LARGE_TESTS=1 # Test reshaping under io load which mkfs.ext4 || skip -aux have_raid 1 12 0 || skip +aux have_raid 1 13 1 || skip mpoint=/tmp/mpoint.$$

1 0

master - test: new reshape test under io load
by Heinz Mauelshagen 01 Dec '17

01 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9681d98cc401681ab6003… Commit: 9681d98cc401681ab60033b6595caf8355f8748d Parent: d3d18e637cbd4bfb1ef088a404fdc12dd319309e Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Fri Dec 1 18:31:12 2017 +0100 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Fri Dec 1 18:31:12 2017 +0100 test: new reshape test under io load --- test/shell/lvconvert-raid-reshape-load.sh | 67 +++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/test/shell/lvconvert-raid-reshape-load.sh b/test/shell/lvconvert-raid-reshape-load.sh new file mode 100644 index 0000000..c01127b --- /dev/null +++ b/test/shell/lvconvert-raid-reshape-load.sh @@ -0,0 +1,67 @@ +#!/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 12 0 || skip + +mpoint=/tmp/mpoint.$$ + +trap "[ -d $mpoint ] && rmdir $mpoint" 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 --stripes 13 -L190M -n$lv1 $vg +check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" +check lv_first_seg_field $vg/$lv1 data_stripes 13 +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 + +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 & +sync & + +# Reshape it to 256K stripe size +lvconvert --yes --stripesize 256 $vg/$lv1 +aux delay_dev "$dev2" 0 0 +check lv_first_seg_field $vg/$lv1 stripesize "256.00k" + +kill -9 %% +wait + +umount $mpoint +[ -d $mpoint ] && rmdir $mpoint + +fsck -fn "$DM_DEV_DIR/$vg/$lv1" + +vgremove -ff $vg

1 0

master - raid: ignore --stripesize on raid4/5 conversion to 1 stripe
by Heinz Mauelshagen 01 Dec '17

01 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d3d18e637cbd4bfb1ef08… Commit: d3d18e637cbd4bfb1ef088a404fdc12dd319309e Parent: a42c3a0e90d712652890696fefca51380969d595 Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Fri Dec 1 15:00:09 2017 +0100 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Fri Dec 1 15:00:09 2017 +0100 raid: ignore --stripesize on raid4/5 conversion to 1 stripe In case caller passes in changed stripe size when reshaping raid4/5 to 1 stripe aiming to convert to raid1 and optionally to linear, ignore it to prevent data corruption. --- lib/metadata/raid_manip.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index 2d8aaed..0f56120 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -1989,12 +1989,16 @@ static int _raid_reshape_remove_images(struct logical_volume *lv, const unsigned new_stripes, const unsigned new_stripe_size, struct dm_list *allocate_pvs, struct dm_list *removal_lvs) { - uint32_t available_slvs, current_le_count, reduced_le_count, removed_slvs, s; + int stripe_size_changed; + uint32_t available_slvs, current_le_count, reduced_le_count, removed_slvs, s, stripe_size; uint64_t extend_le_count; unsigned devs_health, devs_in_sync; struct lv_segment *seg = first_seg(lv); struct lvinfo info = { 0 }; + stripe_size = seg->stripe_size; + stripe_size_changed = new_stripe_size && (stripe_size != new_stripe_size); + if (seg_is_any_raid6(seg) && new_stripes < 3) { log_error("Minimum 3 stripes required for %s LV %s.", lvseg_name(seg), display_lvname(lv)); @@ -2119,7 +2123,15 @@ static int _raid_reshape_remove_images(struct logical_volume *lv, return 0; } - seg->stripe_size = new_stripe_size; + /* May allow stripe size changes > 2 legs */ + if (new_image_count > 2) + seg->stripe_size = new_stripe_size; + else { + seg->stripe_size = stripe_size; + if (stripe_size_changed) + log_warn("WARNING: ignoring --stripesize on conversion of %s to 1 stripe.", + display_lvname(lv)); + } return 1; }

1 0

master - cleanup: remove debug code
by Zdenek Kabelac 01 Dec '17

01 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a42c3a0e90d7126528906… Commit: a42c3a0e90d712652890696fefca51380969d595 Parent: 0e177cc7c90139441530fc065125fa510671e610 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Nov 27 16:52:38 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Dec 1 12:19:09 2017 +0100 cleanup: remove debug code --- lib/activate/activate.c | 7 ------- lib/activate/dev_manager.c | 2 -- 2 files changed, 0 insertions(+), 9 deletions(-) diff --git a/lib/activate/activate.c b/lib/activate/activate.c index 381083b..e7653a2 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -323,12 +323,6 @@ int lvs_in_vg_opened(const struct volume_group *vg) { return 0; } -/****** -int lv_suspend(struct cmd_context *cmd, const char *lvid_s) -{ - return 1; -} -*******/ int lv_suspend_if_active(struct cmd_context *cmd, const char *lvid_s, unsigned origin_only, unsigned exclusive, const struct logical_volume *lv, const struct logical_volume *lv_pre) { @@ -2369,7 +2363,6 @@ static int _lv_resume(struct cmd_context *cmd, const char *lvid_s, if (error_if_not_active) goto_out; - /* ATM only thin-pool with origin-only suspend does not really suspend anything * it's used only for message passing to thin-pool */ if (laopts->origin_only && lv_is_thin_pool(lv)) diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 9f19912..5662090 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -3135,8 +3135,6 @@ static int _tree_action(struct dev_manager *dm, const struct logical_volume *lv, if (!dm_tree_preload_children(root, dlid, DLID_SIZE)) goto_out; - //if (action == PRELOAD) { log_debug("SLEEP"); sleep(7); } - if ((dm_tree_node_size_changed(root) < 0)) dm->flush_required = 1; /* Currently keep the code require flush for any

1 0

master - cleanup: simplify _deps code
by Zdenek Kabelac 01 Dec '17

01 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0e177cc7c90139441530f… Commit: 0e177cc7c90139441530fc065125fa510671e610 Parent: 4dc81848034f4f5edb02335af03e50f45c3977f0 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Nov 30 12:53:34 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Dec 1 12:19:09 2017 +0100 cleanup: simplify _deps code Make _deps to always return name & uuid, and postpone duplication of name and uuid into _create_dm_tree_node(). Saves some duplicated code. --- libdm/libdm-deptree.c | 42 +++++++++++------------------------------- 1 files changed, 11 insertions(+), 31 deletions(-) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index d460ce1..8c623bf 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -523,15 +523,14 @@ static struct dm_tree_node *_create_dm_tree_node(struct dm_tree *dtree, struct dm_tree_node *node; dev_t dev; - if (!(node = dm_pool_zalloc(dtree->mem, sizeof(*node)))) { - log_error("_create_dm_tree_node alloc failed"); + if (!(node = dm_pool_zalloc(dtree->mem, sizeof(*node))) || + !(node->name = dm_pool_strdup(dtree->mem, name)) || + !(node->uuid = dm_pool_strdup(dtree->mem, uuid))) { + log_error("_create_dm_tree_node alloc failed."); return NULL; } node->dtree = dtree; - - node->name = name; - node->uuid = uuid; node->info = *info; node->context = context; node->udev_flags = udev_flags; @@ -882,10 +881,8 @@ static int _deps(struct dm_task **dmt, struct dm_pool *mem, uint32_t major, uint } if (!info->exists) { - if (name) - *name = ""; - if (uuid) - *uuid = ""; + *name = ""; + *uuid = ""; *deps = NULL; } else { if (info->major != major) { @@ -898,14 +895,8 @@ static int _deps(struct dm_task **dmt, struct dm_pool *mem, uint32_t major, uint minor, info->minor); goto failed; } - if (name && !(*name = dm_pool_strdup(mem, dm_task_get_name(*dmt)))) { - log_error("name pool_strdup failed"); - goto failed; - } - if (uuid && !(*uuid = dm_pool_strdup(mem, dm_task_get_uuid(*dmt)))) { - log_error("uuid pool_strdup failed"); - goto failed; - } + *name = dm_task_get_name(*dmt); + *uuid = dm_task_get_uuid(*dmt); *deps = dm_task_get_deps(*dmt); } @@ -1081,7 +1072,7 @@ static int _node_clear_table(struct dm_tree_node *dnode, uint16_t udev_flags) struct dm_task *dmt = NULL, *deps_dmt = NULL; struct dm_info *info, deps_info; struct dm_deps *deps = NULL; - const char *name, *uuid; + const char *name, *uuid, *depname, *depuuid; const char *default_uuid_prefix; size_t default_uuid_prefix_len; uint32_t i; @@ -1102,7 +1093,7 @@ static int _node_clear_table(struct dm_tree_node *dnode, uint16_t udev_flags) return 1; /* Get devices used by inactive table that's about to be deleted. */ - if (!_deps(&deps_dmt, dnode->dtree->mem, info->major, info->minor, NULL, NULL, 1, info, &deps)) { + if (!_deps(&deps_dmt, dnode->dtree->mem, info->major, info->minor, &depname, &depuuid, 1, info, &deps)) { log_error("Failed to obtain dependencies for %s before clearing table.", name); return 0; } @@ -1185,8 +1176,6 @@ struct dm_tree_node *dm_tree_add_new_dev_with_udev_flags(struct dm_tree *dtree, { struct dm_tree_node *dnode; struct dm_info info = { 0 }; - const char *name2; - const char *uuid2; if (!name || !uuid) { log_error("Cannot add device without name and uuid."); @@ -1195,16 +1184,7 @@ struct dm_tree_node *dm_tree_add_new_dev_with_udev_flags(struct dm_tree *dtree, /* Do we need to add node to tree? */ if (!(dnode = dm_tree_find_node_by_uuid(dtree, uuid))) { - if (!(name2 = dm_pool_strdup(dtree->mem, name))) { - log_error("name pool_strdup failed"); - return NULL; - } - if (!(uuid2 = dm_pool_strdup(dtree->mem, uuid))) { - log_error("uuid pool_strdup failed"); - return NULL; - } - - if (!(dnode = _create_dm_tree_node(dtree, name2, uuid2, &info, + if (!(dnode = _create_dm_tree_node(dtree, name, uuid, &info, context, 0))) return_NULL;

1 0

master - suspend: optimize generated list
by Zdenek Kabelac 01 Dec '17

01 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4dc81848034f4f5edb023… Commit: 4dc81848034f4f5edb02335af03e50f45c3977f0 Parent: 7e794b7748a84d2e8f48012b6c31ba50992c8ac1 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Nov 30 13:24:41 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Dec 1 12:19:09 2017 +0100 suspend: optimize generated list Avoid adding same LV multiple times into the list. Just saves couple extra calls and ioctls and makes log shorter. --- lib/activate/activate.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/lib/activate/activate.c b/lib/activate/activate.c index eacf638..381083b 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -2089,7 +2089,7 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s, const struct logical_volume *pvmove_lv = NULL; const struct logical_volume *lv_to_free = NULL; const struct logical_volume *lv_pre_to_free = NULL; - struct logical_volume *lv_pre_tmp; + struct logical_volume *lv_pre_tmp, *lv_tmp; struct seg_list *sl; struct lv_segment *snap_seg; struct lvinfo info; @@ -2098,6 +2098,7 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s, struct dm_pool *mem = NULL; struct dm_list suspend_lvs; struct lv_list *lvl; + int found; if (!activation()) return 1; @@ -2247,19 +2248,28 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s, /* Prepare list of all LVs for suspend ahead */ dm_list_init(&suspend_lvs); dm_list_iterate_items(sl, &pvmove_lv->segs_using_this_lv) { + lv_tmp = sl->seg->lv; + if (lv_is_cow(lv_tmp)) + /* Never suspend COW, always has to be origin */ + lv_tmp = origin_from_cow(lv_tmp); + found = 0; + dm_list_iterate_items(lvl, &suspend_lvs) + if (strcmp(lvl->lv->name, lv_tmp->name) == 0) { + found = 1; + break; + } + if (found) + continue; /* LV is already in the list */ if (!(lvl = dm_pool_alloc(mem, sizeof(*lvl)))) { log_error("lv_list alloc failed."); goto out; } /* Look for precommitted LV name in commmitted VG */ - if (!(lvl->lv = find_lv(lv->vg, sl->seg->lv->name))) { + if (!(lvl->lv = find_lv(lv->vg, lv_tmp->name))) { log_error(INTERNAL_ERROR "LV %s missing from preload metadata.", - display_lvname(sl->seg->lv)); + display_lvname(lv_tmp)); goto out; } - /* Never suspend COW, always has to be origin */ - if (lv_is_cow(lvl->lv)) - lvl->lv = origin_from_cow(lvl->lv); dm_list_add(&suspend_lvs, &lvl->list); } dm_list_iterate_items(lvl, &suspend_lvs)

1 0

master - activation: avoid rechecking pvmove node
by Zdenek Kabelac 01 Dec '17

01 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7e794b7748a84d2e8f480… Commit: 7e794b7748a84d2e8f48012b6c31ba50992c8ac1 Parent: e4db42e4769823aceb59698cef9811c11e330b7b Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Nov 30 13:26:44 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Dec 1 12:19:09 2017 +0100 activation: avoid rechecking pvmove node Use new 3rd. state of trace_pvmove_deps == 2. In this state we know, we have already seen the node and can skip futher testing. Remainging value 1 signals we want to track, and value 0 is for ignoring tracking, but node is still checking in this case. Reduces large amount of duplicate ioctl queries. --- lib/activate/dev_manager.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 429f4f6..9f19912 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -2059,6 +2059,9 @@ static int _add_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree, const char *uuid; const struct logical_volume *plv; + if (lv_is_pvmove(lv) && (dm->track_pvmove_deps == 2)) + return 1; /* Avoid rechecking of already seen pvmove LV */ + if (lv_is_cache_pool(lv)) { if (!dm_list_empty(&lv->segs_using_this_lv)) { if (!_add_lv_to_dtree(dm, dtree, seg_lv(first_seg(lv), 0), 0)) @@ -2178,8 +2181,8 @@ static int _add_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree, return_0; /* Add any LVs referencing a PVMOVE LV unless told not to. */ - if (dm->track_pvmove_deps && lv_is_pvmove(lv)) { - dm->track_pvmove_deps = 0; + if ((dm->track_pvmove_deps == 1) && lv_is_pvmove(lv)) { + dm->track_pvmove_deps = 2; /* Mark as already seen */ dm_list_iterate_items(sl, &lv->segs_using_this_lv) { /* If LV is snapshot COW - whole snapshot needs reload */ plv = lv_is_cow(sl->seg->lv) ? origin_from_cow(sl->seg->lv) : sl->seg->lv;

1 0

master - activation: extend resume validation
by Zdenek Kabelac 01 Dec '17

01 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e4db42e4769823aceb596… Commit: e4db42e4769823aceb59698cef9811c11e330b7b Parent: c086dfadc389551b9a2d7b4c26931e5e74ada8d6 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Nov 28 23:11:20 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Dec 1 12:19:09 2017 +0100 activation: extend resume validation Check also all snapshosts when resume is requested, the origin volume is already resume, but possibly some subLV or snapshot LV could be suspended if we are still in critical_section. --- lib/activate/activate.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/lib/activate/activate.c b/lib/activate/activate.c index 17bbe15..eacf638 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -2311,6 +2311,11 @@ static int _check_suspended_lv(struct logical_volume *lv, void *data) return 0; /* There is suspended subLV in the tree */ } + if (lv_layer(lv) && lv_info(lv->vg->cmd, lv, 1, &info, 0, 0) && info.exists && info.suspended) { + log_debug("Found suspended layered LV %s in critical section().", display_lvname(lv)); + return 0; /* There is suspended subLV in the tree */ + } + return 1; } @@ -2319,6 +2324,7 @@ static int _lv_resume(struct cmd_context *cmd, const char *lvid_s, const struct logical_volume *lv) { const struct logical_volume *lv_to_free = NULL; + struct dm_list *snh; struct lvinfo info; int r = 0; @@ -2360,18 +2366,21 @@ static int _lv_resume(struct cmd_context *cmd, const char *lvid_s, critical_section_dec(cmd, "resumed"); if (!info.suspended && critical_section()) { - /* check if any subLV is suspended */ - if ((r = for_each_sub_lv((struct logical_volume *)lv, &_check_suspended_lv, NULL))) { - /* Everything seems resumed */ - log_debug_activation("LV %s not suspended.", display_lvname(lv)); - goto out; + /* Validation check if any subLV is suspended */ + if (!laopts->origin_only && lv_is_origin(lv)) { + /* Check all snapshots for this origin LV */ + dm_list_iterate(snh, &lv->snapshot_segs) + if (!_check_suspended_lv(dm_list_struct_base(snh, struct lv_segment, origin_list)->cow, NULL)) + goto needs_resume; /* Found suspended snapshot */ } + if ((r = for_each_sub_lv((struct logical_volume *)lv, &_check_suspended_lv, NULL))) + goto out; /* Nothing was found suspended */ } else { r = 1; goto out; } } - +needs_resume: laopts->read_only = _passes_readonly_filter(cmd, lv); laopts->resuming = 1;

1 0

master - activation: split priority from memory locking
by Zdenek Kabelac 01 Dec '17

01 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c086dfadc389551b9a2d7… Commit: c086dfadc389551b9a2d7b4c26931e5e74ada8d6 Parent: c489dd2e1764216de07be80d36b1025fb4f6fc85 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Dec 1 11:50:14 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Dec 1 12:19:09 2017 +0100 activation: split priority from memory locking When entering any critical section, lvm2 used to lock process memory and raised task priority to avoid problem with page swapping and minimize time of having non-resumed devices in table. With this patch, memory locking which which is expensive is only used when entering 'suspending' section as only in this section there is risk lvm could be suspending a device which later can be needed for paging. Raised priority is still kept for all section entrances as this is low-cost operation and may accelerate table resumes - although the real impact can be still considered later. --- WHATS_NEW | 1 + lib/mm/memlock.c | 99 ++++++++++++++++++++++++++++++++++++------------------ 2 files changed, 67 insertions(+), 33 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 093fc95..8bbe4ee 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.177 - ==================================== + Command will lock memory only when suspending volumes. Merge segments when pvmove is finished. Remove label_verify that has never been used. Ensure very large numbers used as arguments are not casted to lower values. diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c index 389e213..7edd9de 100644 --- a/lib/mm/memlock.c +++ b/lib/mm/memlock.c @@ -85,6 +85,7 @@ static size_t _size_malloc = 2000000; static void *_malloc_mem = NULL; static int _mem_locked = 0; +static int _priority_raised = 0; static int _critical_section = 0; static int _memlock_count_daemon = 0; static int _priority; @@ -465,6 +466,38 @@ static int _restore_mmap(void) #endif /* ARCH_X86 */ return 1; } +static void _raise_priority(struct cmd_context *cmd) +{ + if (_priority_raised) + return; + + _priority_raised = 1; + errno = 0; + if (((_priority = getpriority(PRIO_PROCESS, 0)) == -1) && errno) + log_sys_debug("getpriority", ""); + else if (_default_priority < _priority) { + if (setpriority(PRIO_PROCESS, 0, _default_priority) == 0) + log_debug_activation("Raised task priority %d -> %d.", + _priority, _default_priority); + else + log_warn("WARNING: setpriority %d failed: %s.", + _default_priority, strerror(errno)); + } +} + +static void _restore_priority_if_possible(struct cmd_context *cmd) +{ + if (!_priority_raised || _critical_section || _memlock_count_daemon) + return; + + if (setpriority(PRIO_PROCESS, 0, _priority) == 0) + log_debug_activation("Restoring original task priority %d.", _priority); + else + log_warn("WARNING: setpriority %u failed: %s.", + _priority, strerror(errno)); + + _priority_raised = 0; +} /* Stop memory getting swapped out */ static void _lock_mem(struct cmd_context *cmd) @@ -502,14 +535,6 @@ static void _lock_mem(struct cmd_context *cmd) if (!_memlock_maps(cmd, LVM_MLOCK, &_mstats)) stack; - - errno = 0; - if (((_priority = getpriority(PRIO_PROCESS, 0)) == -1) && errno) - log_sys_error("getpriority", ""); - else - if (setpriority(PRIO_PROCESS, 0, _default_priority)) - log_error("setpriority %d failed: %s", - _default_priority, strerror(errno)); } static void _unlock_mem(struct cmd_context *cmd) @@ -539,16 +564,15 @@ static void _unlock_mem(struct cmd_context *cmd) } } - if (setpriority(PRIO_PROCESS, 0, _priority)) - log_error("setpriority %u failed: %s", _priority, - strerror(errno)); + _restore_priority_if_possible(cmd); + _release_memory(); } static void _lock_mem_if_needed(struct cmd_context *cmd) { - log_debug_mem("Lock: Memlock counters: locked:%d critical:%d daemon:%d suspended:%d", - _mem_locked, _critical_section, _memlock_count_daemon, dm_get_suspended_counter()); + log_debug_mem("Lock: Memlock counters: prioritized:%d locked:%d critical:%d daemon:%d suspended:%d", + _priority_raised, _mem_locked, _critical_section, _memlock_count_daemon, dm_get_suspended_counter()); if (!_mem_locked && ((_critical_section + _memlock_count_daemon) == 1)) { _mem_locked = 1; @@ -558,8 +582,8 @@ static void _lock_mem_if_needed(struct cmd_context *cmd) static void _unlock_mem_if_possible(struct cmd_context *cmd) { - log_debug_mem("Unlock: Memlock counters: locked:%d critical:%d daemon:%d suspended:%d", - _mem_locked, _critical_section, _memlock_count_daemon, dm_get_suspended_counter()); + log_debug_mem("Unlock: Memlock counters: prioritized:%d locked:%d critical:%d daemon:%d suspended:%d", + _priority_raised, _mem_locked, _critical_section, _memlock_count_daemon, dm_get_suspended_counter()); if (_mem_locked && !_critical_section && !_memlock_count_daemon) { @@ -568,29 +592,41 @@ static void _unlock_mem_if_possible(struct cmd_context *cmd) } } +/* + * Critical section is only triggered with suspending reason. + * Other reasons only raise process priority so the table manipulation + * remains fast. + * + * Memory stays locked until 'memlock_unlock()' is called so when possible + * it may stay locked across multiple crictical section entrances. + */ void critical_section_inc(struct cmd_context *cmd, const char *reason) { - /* - * Profiles are loaded on-demand so make sure that before - * entering the critical section all needed profiles are - * loaded to avoid the disk access later. - */ - (void) load_pending_profiles(cmd); - - if (!_critical_section) { + if (!_critical_section && (strcmp(reason, "suspending") == 0)) { + /* + * Profiles are loaded on-demand so make sure that before + * entering the critical section all needed profiles are + * loaded to avoid the disk access later. + */ + (void) load_pending_profiles(cmd); _critical_section = 1; - log_debug_mem("Entering critical section (%s).", reason); - } + log_debug_activation("Entering critical section (%s).", reason); + _lock_mem_if_needed(cmd); + } else + log_debug_activation("Entering prioritized section (%s).", reason); - _lock_mem_if_needed(cmd); + _raise_priority(cmd); } void critical_section_dec(struct cmd_context *cmd, const char *reason) { if (_critical_section && !dm_get_suspended_counter()) { _critical_section = 0; - log_debug_mem("Leaving critical section (%s).", reason); - } + log_debug_activation("Leaving critical section (%s).", reason); + } else + log_debug_activation("Leaving section (%s).", reason); + + _restore_priority_if_possible(cmd); } int critical_section(void) @@ -612,6 +648,7 @@ void memlock_inc_daemon(struct cmd_context *cmd) log_error(INTERNAL_ERROR "_memlock_inc_daemon used in critical section."); log_debug_mem("memlock_count_daemon inc to %d", _memlock_count_daemon); _lock_mem_if_needed(cmd); + _raise_priority(cmd); } void memlock_dec_daemon(struct cmd_context *cmd) @@ -620,11 +657,6 @@ void memlock_dec_daemon(struct cmd_context *cmd) log_error(INTERNAL_ERROR "_memlock_count_daemon has dropped below 0."); --_memlock_count_daemon; log_debug_mem("memlock_count_daemon dec to %d", _memlock_count_daemon); - if (!_memlock_count_daemon && _critical_section && _mem_locked) { - log_error("Unlocking daemon memory in critical section."); - _unlock_mem(cmd); - _mem_locked = 0; - } _unlock_mem_if_possible(cmd); } @@ -641,6 +673,7 @@ void memlock_reset(void) { log_debug_mem("memlock reset."); _mem_locked = 0; + _priority_raised = 0; _critical_section = 0; _memlock_count_daemon = 0; }

1 0

master - pvmove: add missing segment merging
by Zdenek Kabelac 01 Dec '17

01 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c489dd2e1764216de07be… Commit: c489dd2e1764216de07be80d36b1025fb4f6fc85 Parent: fbd8b456dbc963bbc306e5b3c643d0f67d3a2d6c Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Nov 29 22:19:46 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Dec 1 12:19:09 2017 +0100 pvmove: add missing segment merging When pvmove is finished and metadata are updated, the code missed to merge possible mergable segments - so add explicit merging call after pvmoved volumes are unlocked. This avoids weird results where i.e. lvs could have been reporting non-matching segments as lvs upon metadata read is doing silent segment merging while dm table left after pvmove was still preserving non-merged segments. --- WHATS_NEW | 1 + lib/metadata/lv_manip.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 32ed3c9..093fc95 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.177 - ==================================== + Merge segments when pvmove is finished. Remove label_verify that has never been used. Ensure very large numbers used as arguments are not casted to lower values. Enhance reading and validation of options stripes and stripes_size. diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index d4a4b8b..fb152ac 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -6637,6 +6637,8 @@ int remove_layers_for_segments_all(struct cmd_context *cmd, dm_list_iterate_items(lvl, lvs_changed) { /* FIXME Assumes only one pvmove at a time! */ lvl->lv->status &= ~LOCKED; + if (!lv_merge_segments(lvl->lv)) + return_0; } return 1;

1 0

master - pvmove: move code from tools to lib
by Zdenek Kabelac 01 Dec '17

01 Dec '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=fbd8b456dbc963bbc306e… Commit: fbd8b456dbc963bbc306e5b3c643d0f67d3a2d6c Parent: 94d3878efb7cec344681bf4a2b28774ffebda3ba Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Nov 29 22:19:05 2017 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Dec 1 12:18:32 2017 +0100 pvmove: move code from tools to lib Move code manipulating with locking flags into /lib part of lvm. --- lib/metadata/lv_manip.c | 6 ++++++ tools/pvmove_poll.c | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 33a4f7d..d4a4b8b 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -6633,6 +6633,12 @@ int remove_layers_for_segments_all(struct cmd_context *cmd, if (!lv_empty(layer_lv)) return_0; + /* Assumes only used by PVMOVE ATM when unlocking LVs */ + dm_list_iterate_items(lvl, lvs_changed) { + /* FIXME Assumes only one pvmove at a time! */ + lvl->lv->status &= ~LOCKED; + } + return 1; } diff --git a/tools/pvmove_poll.c b/tools/pvmove_poll.c index f573eb9..e50747c 100644 --- a/tools/pvmove_poll.c +++ b/tools/pvmove_poll.c @@ -52,7 +52,6 @@ static int _detach_pvmove_mirror(struct cmd_context *cmd, { uint32_t mimage_to_remove = 0; struct dm_list lvs_completed; - struct lv_list *lvl; /* Update metadata to remove mirror segments and break dependencies */ dm_list_init(&lvs_completed); @@ -67,10 +66,6 @@ static int _detach_pvmove_mirror(struct cmd_context *cmd, return_0; } - dm_list_iterate_items(lvl, &lvs_completed) - /* FIXME Assumes only one pvmove at a time! */ - lvl->lv->status &= ~LOCKED; - return 1; }

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits December 2017