lvm2-commits November 2012

lvm2-commits@lists.fedorahosted.org

6 participants
39 discussions

master - thin: man page updates
by Zdenek Kabelac 19 Nov '12

19 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=bf1cf1459f414eb1… Commit: bf1cf1459f414eb1b397c21a0cdbd5acda7540f6 Parent: 1794f777f48be29184ef8030b6e11b3a8e61757b Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Oct 30 17:11:59 2012 +0000 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Nov 19 14:38:17 2012 +0100 thin: man page updates Cover latest extensions of lvconvert functionality. Update also lvcreate page. --- man/lvconvert.8.in | 103 ++++++++++++++++++++++++++++++++++++++++++++-------- man/lvcreate.8.in | 18 +++++----- 2 files changed, 96 insertions(+), 25 deletions(-) diff --git a/man/lvconvert.8.in b/man/lvconvert.8.in index 2659719..48345a9 100644 --- a/man/lvconvert.8.in +++ b/man/lvconvert.8.in @@ -40,7 +40,7 @@ lvconvert \- convert a logical volume from linear to mirror or snapshot .B lvconvert .BR \-s | \-\-snapshot .RB [ \-c | \-\-chunksize -.IR ChunkSize ] +.IR ChunkSize [ bBsSkK ]] .RB [ \-h | \-? | \-\-help ] .RB [ \-\-noudevsync ] .RB [ \-v | \-\-verbose ] @@ -59,17 +59,6 @@ lvconvert \- convert a logical volume from linear to mirror or snapshot .RB [ \-\-version ] .IR LogicalVolume [ Path ]... .sp -.B lvconvert \-\-thinpool -.IR ThinPoolLogicalVolume { Name | Path } -.RB [ \-c | \-\-chunksize -.IR ChunkSize ] -.RB [ \-h | \-? | \-\-help ] -.RB [ \-v | \-\-verbose ] -.RB [ \-\-version ] -.RB [ \-Z | \-\-zero -.RI { y | n }] -.IR ThinMetadataLogicalVolume { Name | Path } -.sp .B lvconvert \-\-repair .RB [ \-h | \-? | \-\-help ] .RB [ \-v | \-\-verbose ] @@ -83,6 +72,31 @@ lvconvert \- convert a logical volume from linear to mirror or snapshot .RB [ \-\-version ] .IR LogicalVolume [ Path ] .RI [ PhysicalVolume [ Path ]...] +.sp +.B lvconvert \-\-thinpool +.IR ThinPoolLogicalVolume { Name | Path } +.RB [ \-c | \-\-chunksize +.IR ChunkSize [ bBsSkKmMgG ]] +.RB [ \-\-discards +.RI { ignore | nopassdown | passdown }] +.RB [[ \-\-poolmetadata +.IR ThinPoolMetadataLogicalVolume { Name | Path }] +| +.RB [ \-\-poolmetadatasize +.IR ThinPoolMetadataSize [ bBsSkKmMgG ]] +.RB [ \-r | \-\-readahead +.RI { ReadAheadSectors | auto | none }] +.RB [ \-\-stripes +.I Stripes +.RB [ \-I | \-\-stripesize +.IR StripeSize ]]] +.RB [ \-Z | \-\-zero +.RI { y | n }] +.RB [ \-h | \-? | \-\-help ] +.RB [ \-v | \-\-verbose ] +.RB [ \-\-version ] +.RI [ PhysicalVolume [ Path ][ :PE [ -PE ]]...] +.sp .SH DESCRIPTION lvconvert is used to change the segment type (i.e. linear, mirror, etc) or @@ -102,8 +116,9 @@ the freed extents come first from the specified PhysicalVolumes. See \fBlvm\fP(8) for common options. .br Exactly one of -.BR \-\-splitmirrors ", " \-\-mirrors ", " \-\-repair ", " \-\-snapshot -or \fB\-\-merge\fP arguments is required. +.BR \-\-merge ", " \-\-mirrors ", " \-\-repair ", " \-\-replace +.RB ", " \-\-snapshot ", " \-\-splitmirrors " or " \-\-thinpool +arguments is required. .TP .BR \-m ", " \-\-mirrors " " \fIMirrors Specifies the degree of the mirror you wish to create. @@ -170,12 +185,28 @@ implementation and not with the original device-mapper mirror implementation. Create a snapshot from existing logical volume using another existing logical volume as its origin. .TP -.BR \-c ", " \-\-chunksize " " \fIChunkSize -Power of 2 chunk size for the snapshot logical volume between 4KiB and 512KiB. +.BR \-c ", " \-\-chunksize " " \fIChunkSize [ \fIbBsSkKmMgG ] +Gives the size of chunk for snapshot and thin pool logical volumes. +For snapshots the value must be power of 2 between 4KiB and 512KiB +and the default value is 4. +For thin pools the value must be between 64KiB and +1GiB and the default value starts with 64 and scales +up to fit the pool metadata size within 128MB, +if the pool metadata size is not specified. +Older dm thin pool target version (<1.4) requires the value to be power of 2. +The newer version requires to be the multiple of 64KiB, however discard is +not supported for non power of 2 values. +Default unit is in kilobytes. +.TP +.BR \-\-discards " {" \fIignore | \fInopassdown | \fIpassdown } +Sets discards behavior for thin pool. +Default is \fIpassdown\fP. .TP .BR \-Z ", " \-\-zero " {" \fIy | \fIn } Controls zeroing of the first KB of data in the snapshot. If the volume is read-only the snapshot will not be zeroed. +For thin pool volumes it controls zeroing of provisioned blocks. +Note: Provisioning of large zeroed chunks impacts performance. .TP .B \-\-merge Merges a snapshot into its origin volume or merges a raid1 image that has @@ -195,6 +226,28 @@ merge finishes, the merged snapshot is removed. Multiple snapshots may be specified on the commandline or a @tag may be used to specify multiple snapshots be merged to their respective origin. .TP +.BR \-\-poolmetadata " " \fIThinPoolMetadataLogicalVolume { \fIName | \fIPath } +Specifies thin pool metadata logical volume. +The size should be in between 2MiB and 16GiB. +Thin pool is specified with the option +\fB\-\-thinpool\fP. +.TP +.BR \-\-poolmetadatasize " " \fIThinPoolMetadataSize [ \fIbBsSkKmMgG ] +Sets the size of thin pool's metadata logical volume, +if the pool metadata volume is undefined. +Thin pool is specified with the option +\fB\-\-thinpool\fP. +Supported value is in the range between 2MiB and 16GiB. +The default value is estimated with this formula +(Pool_LV_size / Pool_LV_chunk_size * 64b). +Default unit is megabytes. +.TP +.IR \fB\-r ", " \fB\-\-readahead " {" ReadAheadSectors | auto | none } +Sets read ahead sector count of thin pool metadata logical volume. +The default value is "auto" which allows the kernel to choose +a suitable value automatically. +"None" is equivalent to specifying zero. +.TP .B \-\-repair Repair a mirror after suffering a disk failure. The mirror will be brought back into a consistent state. By default, the original number of mirrors will be @@ -210,6 +263,24 @@ Remove the specified device (\fIPhysicalVolume\fP) and replace it with one that is available in the volume group or from the specific list provided. This option is only available to RAID segment types (e.g. "raid1", "raid5", etc). +.TP +.BR \-\-stripes " " \fIStripes +Gives the number of stripes. +This is equal to the number of physical volumes to scatter +the logical volume. +.TP +.BR \-I ", " \-\-stripesize " " \fIStripeSize +Gives the number of kilobytes for the granularity of the stripes. +.br +StripeSize must be 2^n (n = 2 to 9) for metadata in LVM1 format. +For metadata in LVM2 format, the stripe size may be a larger +power of 2 but must not exceed the physical extent size. +.TP +.IR \fB\-\-thinpool " " ThinPoolLogicalVolume { Name | Path } +Changes logical volume into a thin pool volume. The volume +will store the pool's data. +Thin pool metadata logical volume can be specified with the option +\fB\-\-poolmetadata\fP or allocated with \fB\-\-poolmetadatasize\fP. .SH Examples Converts the linear logical volume "vg00/lvol1" to a two-way mirror diff --git a/man/lvcreate.8.in b/man/lvcreate.8.in index f374950..705ebae 100644 --- a/man/lvcreate.8.in +++ b/man/lvcreate.8.in @@ -53,11 +53,11 @@ lvcreate \- create a logical volume in an existing volume group .RB [ \-t | \-\-test ] .RB [ \-T | \-\-thin .RB [ \-c | \-\-chunksize -.IR ChunkSize ] +.IR ChunkSize [ bBsSkKmMgG ]] .RB [ \-\-discards .RI { ignore | nopassdown | passdown }] .RB [ \-\-poolmetadatasize -.IR MetadataSize [ bBsSkKmMgG ]]] +.IR ThinPoolMetadataSize [ bBsSkKmMgG ]]] .RB [ \-\-thinpool .IR ThinPoolLogicalVolume { Name | Path }] .RB [ \-\-type @@ -76,7 +76,7 @@ lvcreate \- create a logical volume in an existing volume group .BR \-L | \-\-size .IR LogicalVolumeSize [ bBsSkKmMgGtTpPeE ]] .RB [ \-c | \-\-chunksize -.IR ChunkSize ] +.IR ChunkSize [ bBsSkK ]] .RB [ \-\-noudevsync ] .RB [ \-\-ignoremonitoring ] .RB [ \-\-monitor " {" \fIy | \fIn }] @@ -125,14 +125,14 @@ always assumed and it can't be overridden. If clustered locking is enabled, \fB\-a\fIey\fR will activate exclusively on one node and \fB\-a\fIly\fR will activate only on the local node. .TP -.BR \-c ", " \-\-chunksize " " \fIChunkSize +.BR \-c ", " \-\-chunksize " " \fIChunkSize [ \fIbBsSkKmMgG ] Gives the size of chunk for snapshot and thin pool logical volumes. For snapshots the value must be power of 2 between 4KiB and 512KiB and the default value is 4. For thin pools the value must be between 64KiB and -1048576KiB and the default value starts with 64 and scales +1GiB and the default value starts with 64 and scales up to fit the pool metadata size within 128MB, -if the poolmetadata size is not specified. +if the pool metadata size is not specified. Older dm thin pool target version (<1.4) requires the value to be power of 2. The newer version requires to be the multiple of 64KiB, however discard is not supported for non power of 2 values. @@ -144,7 +144,7 @@ logical volumes. Default is no contiguous allocation based on a next free principle. .TP .BR \-\-discards " {" \fIignore | \fInopassdown | \fIpassdown } -Set discards behavior. +Set discards behavior for thin pool. Default is \fIpassdown\fP. .TP .BR \-i ", " \-\-stripes " " \fIStripes @@ -236,7 +236,7 @@ Set access permissions to read only or read and write. .br Default is read and write. .TP -.IR \fB\-\-poolmetadatasize " " MetadataSize [ bBsSkKmMgG ] +.IR \fB\-\-poolmetadatasize " " ThinPoolMetadataSize [ bBsSkKmMgG ] Set the size of thin pool's metadata logical volume. Supported value is in range between 2MiB and 16GiB. Default value is (Pool_LV_size / Pool_LV_chunk_size * 64b). @@ -372,7 +372,7 @@ copies. .B lvcreate \-\-type raid10 \-L 5G \-i 2 \-m 1 \-n my_lv vg00 Creates 100MiB pool logical volume for thin provisioning -build with 2 stripes 64KiB and chunk size 128KiB together with +build with 2 stripes 64KiB and chunk size 256KiB together with 1TiB thin provisioned logical volume "vg00/thin_lv": .sp .B lvcreate \-i 2 \-I 64 \-c 256 \-L100M \-T vg00/pool \-V 1T \-\-name thin_lv

1 0

master - thin: lvcreate use common functions
by Zdenek Kabelac 19 Nov '12

19 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1794f777f48be291… Commit: 1794f777f48be29184ef8030b6e11b3a8e61757b Parent: b21d3e3592e380cb79e5e45f2aa8164ae0747e15 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Nov 19 12:47:34 2012 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Nov 19 14:38:17 2012 +0100 thin: lvcreate use common functions Use common functions from toollib and eliminate code from here. --- tools/lvcreate.c | 100 +++++++++++------------------------------------------- 1 files changed, 20 insertions(+), 80 deletions(-) diff --git a/tools/lvcreate.c b/tools/lvcreate.c index dad0ba7..470084c 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c @@ -234,7 +234,6 @@ static int _update_extents_params(struct volume_group *vg, { uint32_t pv_extent_count; struct logical_volume *origin = NULL; - int changed = 0; uint32_t size_rest; uint32_t stripesize_extents; @@ -308,38 +307,11 @@ static int _update_extents_params(struct volume_group *vg, } if (lp->create_thin_pool) { - if (!arg_count(vg->cmd, poolmetadatasize_ARG)) { - /* Defaults to nr_pool_blocks * 64b */ - lp->poolmetadatasize = (uint64_t) lp->extents * vg->extent_size / - (uint64_t) (lp->chunk_size * (SECTOR_SIZE / UINT64_C(64))); - - /* Check if we could eventually use bigger chunk size */ - if (!arg_count(vg->cmd, chunksize_ARG)) { - while ((lp->poolmetadatasize > - (DEFAULT_THIN_POOL_OPTIMAL_SIZE / SECTOR_SIZE)) && - (lp->chunk_size < DM_THIN_MAX_DATA_BLOCK_SIZE)) { - lp->chunk_size <<= 1; - lp->poolmetadatasize >>= 1; - changed++; - } - if (changed) - log_verbose("Changed chunksize to %u sectors.", - lp->chunk_size); - } - } - - if (lp->poolmetadatasize > (2 * DEFAULT_THIN_POOL_MAX_METADATA_SIZE)) { - if (arg_count(vg->cmd, poolmetadatasize_ARG)) - log_warn("WARNING: Maximum supported pool metadata size is 16GB."); - lp->poolmetadatasize = 2 * DEFAULT_THIN_POOL_MAX_METADATA_SIZE; - } else if (lp->poolmetadatasize < (2 * DEFAULT_THIN_POOL_MIN_METADATA_SIZE)) { - if (arg_count(vg->cmd, poolmetadatasize_ARG)) - log_warn("WARNING: Minimum supported pool metadata size is 2M."); - lp->poolmetadatasize = 2 * DEFAULT_THIN_POOL_MIN_METADATA_SIZE; - } - - log_verbose("Setting pool metadata size to %" PRIu64 " sectors.", - lp->poolmetadatasize); + if (!update_pool_params(vg->cmd, lp->target_attr, + lp->extents, vg->extent_size, + &lp->chunk_size, &lp->discards, + &lp->poolmetadatasize)) + return_0; if (!(lp->poolmetadataextents = extents_from_size(vg->cmd, lp->poolmetadatasize, vg->extent_size))) @@ -386,16 +358,9 @@ static int _read_size_params(struct lvcreate_params *lp, if (lp->thin && (arg_count(cmd, size_ARG) || arg_count(cmd, extents_ARG))) lp->create_thin_pool = 1; - if (arg_count(cmd, poolmetadatasize_ARG)) { - if (!seg_is_thin(lp)) { - log_error("--poolmetadatasize may only be specified when allocating the thin pool."); - return 0; - } - if (arg_sign_value(cmd, poolmetadatasize_ARG, SIGN_NONE) == SIGN_MINUS) { - log_error("Negative poolmetadatasize is invalid."); - return 0; - } - lp->poolmetadatasize = arg_uint64_value(cmd, poolmetadatasize_ARG, UINT64_C(0)); + if (arg_count(cmd, poolmetadatasize_ARG) && !seg_is_thin(lp)) { + log_error("--poolmetadatasize may only be specified when allocating the thin pool."); + return 0; } /* Size returned in kilobyte units; held in sectors */ @@ -820,13 +785,13 @@ static int _lvcreate_params(struct lvcreate_params *lp, if (!_lvcreate_name_params(lp, cmd, &argc, &argv) || !_read_size_params(lp, lcp, cmd) || !get_stripe_params(cmd, &lp->stripes, &lp->stripe_size) || + !get_pool_params(cmd, &lp->chunk_size, &lp->discards, + &lp->poolmetadatasize, &lp->zero) || !_read_mirror_params(lp, cmd) || !_read_raid_params(lp, cmd)) return_0; - if (lp->create_thin_pool) - lp->discards = (thin_discards_t) arg_uint_value(cmd, discards_ARG, THIN_DISCARDS_PASSDOWN); - else if (arg_count(cmd, discards_ARG)) { + if (!lp->create_thin_pool && arg_count(cmd, discards_ARG)) { log_error("--discards is only available for thin pool creation."); return 0; } @@ -836,48 +801,23 @@ static int _lvcreate_params(struct lvcreate_params *lp, else if (lp->thin && !lp->create_thin_pool) { if (arg_count(cmd, chunksize_ARG)) log_warn("WARNING: Ignoring --chunksize when using an existing pool."); - } else if (lp->snapshot || lp->create_thin_pool) { + } else if (lp->snapshot) { if (arg_sign_value(cmd, chunksize_ARG, SIGN_NONE) == SIGN_MINUS) { log_error("Negative chunk size is invalid"); return 0; } - if (lp->snapshot) { - lp->chunk_size = arg_uint_value(cmd, chunksize_ARG, 8); - if (lp->chunk_size < 8 || lp->chunk_size > 1024 || - (lp->chunk_size & (lp->chunk_size - 1))) { - log_error("Chunk size must be a power of 2 in the " - "range 4K to 512K"); - return 0; - } - } else { - lp->chunk_size = arg_uint_value(cmd, chunksize_ARG, - DM_THIN_MIN_DATA_BLOCK_SIZE); - if ((lp->chunk_size < DM_THIN_MIN_DATA_BLOCK_SIZE) || - (lp->chunk_size > DM_THIN_MAX_DATA_BLOCK_SIZE)) { - log_error("Chunk size must be in the range %uK to %uK", - (DM_THIN_MIN_DATA_BLOCK_SIZE / 2), - (DM_THIN_MAX_DATA_BLOCK_SIZE / 2)); - return 0; - } - if (!(attr & THIN_FEATURE_BLOCK_SIZE) && - (lp->chunk_size & (lp->chunk_size - 1))) { - log_error("Chunk size must be a power of 2 for this thin target version."); - return 0; - } else if (lp->chunk_size & (DM_THIN_MIN_DATA_BLOCK_SIZE - 1)) { - log_error("Chunk size must be multiple of %uK.", - DM_THIN_MIN_DATA_BLOCK_SIZE / 2); - return 0; - } else if ((lp->discards != THIN_DISCARDS_IGNORE) && - (lp->chunk_size & (lp->chunk_size - 1))) { - log_warn("WARNING: Using discards ignore for chunk size non power of 2."); - lp->discards = THIN_DISCARDS_IGNORE; - } + lp->chunk_size = arg_uint_value(cmd, chunksize_ARG, 8); + if (lp->chunk_size < 8 || lp->chunk_size > 1024 || + (lp->chunk_size & (lp->chunk_size - 1))) { + log_error("Chunk size must be a power of 2 in the " + "range 4K to 512K"); + return 0; } - log_verbose("Setting chunksize to %u sectors.", lp->chunk_size); + log_verbose("Setting chunksize to %s.", display_size(cmd, lp->chunk_size)); if (!lp->thin && lp->snapshot && !(lp->segtype = get_segtype_from_string(cmd, "snapshot"))) return_0; - } else if (arg_count(cmd, chunksize_ARG)) { + } else if (arg_count(cmd, chunksize_ARG) && !lp->create_thin_pool) { log_error("-c is only available with snapshots and thin pools"); return 0; }

1 0

master - thin: lvconvert update
by Zdenek Kabelac 19 Nov '12

19 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b21d3e3592e380cb… Commit: b21d3e3592e380cb79e5e45f2aa8164ae0747e15 Parent: b78609686399ee01a53d8a2e8685cd05389d8cc9 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Nov 19 13:37:57 2012 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Nov 19 14:38:17 2012 +0100 thin: lvconvert update Use common function from toollib and support allocation of metadata LV with give thin pool data LV. --- WHATS_NEW | 1 + tools/commands.h | 7 ++- tools/lvconvert.c | 162 +++++++++++++++++++++++++++++------------------------ 3 files changed, 94 insertions(+), 76 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 59a69da..84afb82 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.99 - =================================== + Support allocation of pool metadata with lvconvert command. Move common functionality for thin lvcreate and lvconvert to toollib. Mirrored log is now fixed before its mirror when double-fault occurs. Add python-lvm unit test case diff --git a/tools/commands.h b/tools/commands.h index 6415d34..8d5d190 100644 --- a/tools/commands.h +++ b/tools/commands.h @@ -147,13 +147,16 @@ xx(lvconvert, "--thinpool ThinPoolLogicalVolume[Path]\n" "\t[--chunksize size]\n" "\t[--discards {ignore|nopassdown|passdown}]\n" - "\t[[--poolmetadatasize size] | --poolmetadata ThinMetadataLogicalVolume[Path]]\n" + "\t[--poolmetadata ThinMetadataLogicalVolume[Path] |\n" + "\t [--poolmetadatasize size]\n" + "\t [-r|--readahead ReadAheadSectors|auto|none]\n" + "\t [--stripes Stripes [-I|--stripesize StripeSize]]]\n" "\t[-Z|--zero {y|n}]\n" "\t[-d|--debug] [-h|-?|--help] [-v|--verbose]\n", alloc_ARG, background_ARG, chunksize_ARG, corelog_ARG, interval_ARG, merge_ARG, mirrorlog_ARG, mirrors_ARG, name_ARG, noudevsync_ARG, - regionsize_ARG, repair_ARG, replace_ARG, snapshot_ARG, splitmirrors_ARG, + readahead_ARG, regionsize_ARG, repair_ARG, replace_ARG, snapshot_ARG, splitmirrors_ARG, trackchanges_ARG, type_ARG, stripes_long_ARG, stripesize_ARG, test_ARG, chunksize_ARG, discards_ARG, poolmetadata_ARG, poolmetadatasize_ARG, thinpool_ARG, use_policies_ARG, yes_ARG, force_ARG, zero_ARG) diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 7d03a5f..7a01cce 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -39,6 +39,7 @@ struct lvconvert_params { uint32_t keep_mimages; uint32_t stripes; uint32_t stripe_size; + uint32_t read_ahead; const struct segment_type *segtype; unsigned target_attr; @@ -336,53 +337,21 @@ static int _read_params(struct lvconvert_params *lp, struct cmd_context *cmd, return 0; } + if (!get_pool_params(cmd, + &lp->chunk_size, + &lp->discards, + &lp->poolmetadata_size, + &lp->zero)) + return_0; + if (arg_count(cmd, poolmetadata_ARG)) { - lp->pool_metadata_lv_name = arg_str_value(cmd, poolmetadata_ARG, ""); - } else if (arg_count(cmd, poolmetadatasize_ARG)) { - if (arg_sign_value(cmd, poolmetadatasize_ARG, SIGN_NONE) == SIGN_MINUS) { - log_error("Negative pool metadata size is invalid."); + if (arg_count(cmd, poolmetadatasize_ARG)) { + log_error("--poolmetadatasize is invalid with --poolmetadata."); return 0; } - lp->poolmetadata_size = arg_uint64_value(cmd, poolmetadatasize_ARG, UINT64_C(0)); - - if (lp->poolmetadata_size > (2 * DEFAULT_THIN_POOL_MAX_METADATA_SIZE)) { - if (arg_count(cmd, poolmetadatasize_ARG)) - log_warn("WARNING: Maximum supported pool metadata size is 16GB."); - lp->poolmetadata_size = 2 * DEFAULT_THIN_POOL_MAX_METADATA_SIZE; - } else if (lp->poolmetadata_size < (2 * DEFAULT_THIN_POOL_MIN_METADATA_SIZE)) { - if (arg_count(cmd, poolmetadatasize_ARG)) - log_warn("WARNING: Minimum supported pool metadata size is 2M."); - lp->poolmetadata_size = 2 * DEFAULT_THIN_POOL_MIN_METADATA_SIZE; - } - - log_verbose("Setting pool metadata size to %" PRIu64 " sectors.", - lp->poolmetadata_size); + lp->pool_metadata_lv_name = arg_str_value(cmd, poolmetadata_ARG, ""); } - if (arg_count(cmd, chunksize_ARG)) { - if (arg_sign_value(cmd, chunksize_ARG, SIGN_NONE) == SIGN_MINUS) { - log_error("Negative chunk size is invalid."); - return 0; - } - lp->chunk_size = arg_uint_value(cmd, chunksize_ARG, - DM_THIN_MIN_DATA_BLOCK_SIZE); - - if ((lp->chunk_size < DM_THIN_MIN_DATA_BLOCK_SIZE) || - (lp->chunk_size > DM_THIN_MAX_DATA_BLOCK_SIZE)) { - log_error("Chunk size must be in the range %uK to %uK.", - (DM_THIN_MIN_DATA_BLOCK_SIZE / 2), - (DM_THIN_MAX_DATA_BLOCK_SIZE / 2)); - return 0; - } - } else - lp->chunk_size = DM_THIN_MIN_DATA_BLOCK_SIZE; - - log_verbose("Setting pool metadata chunk size to %u sectors.", - lp->chunk_size); - - if (arg_count(cmd, zero_ARG)) - lp->zero = strcmp(arg_str_value(cmd, zero_ARG, "y"), "n"); - /* If --thinpool contains VG name, extract it. */ if ((tmp_str = strchr(lp->pool_data_lv_name, (int) '/'))) { if (!(lp->vg_name = extract_vgname(cmd, lp->pool_data_lv_name))) @@ -1827,6 +1796,12 @@ static int _lvconvert_thinpool(struct cmd_context *cmd, struct logical_volume *data_lv; struct logical_volume *metadata_lv; + if (!lv_is_visible(pool_lv)) { + log_error("Can't convert internal LV %s/%s.", + pool_lv->vg->name, pool_lv->name); + return 0; + } + if (lv_is_thin_type(pool_lv)) { log_error("Can't use thin logical volume %s/%s for thin pool data.", pool_lv->vg->name, pool_lv->name); @@ -1840,14 +1815,41 @@ static int _lvconvert_thinpool(struct cmd_context *cmd, return 0; } + len = strlen(pool_lv->name) + 16; + if (!(name = dm_pool_alloc(pool_lv->vg->vgmem, len))) { + log_error("Can't allocate new name."); + return 0; + } + + if (dm_snprintf(name, len, "%s_tmeta", pool_lv->name) < 0) + return_0; + if (lp->pool_metadata_lv_name) { + if (arg_count(cmd, stripesize_ARG) || arg_count(cmd, stripes_long_ARG)) { + log_error("Can't use --stripes and --stripesize with --poolmetadata."); + return 0; + } + if (arg_count(cmd, readahead_ARG)) { + log_error("Can't use --readahead with --poolmetadata."); + return 0; + } metadata_lv = find_lv(pool_lv->vg, lp->pool_metadata_lv_name); if (!metadata_lv) { - log_error("Unknown metadata LV %s", lp->pool_metadata_lv_name); + log_error("Unknown metadata LV %s.", lp->pool_metadata_lv_name); + return 0; + } + if (!lv_is_visible(metadata_lv)) { + log_error("Can't convert internal LV %s/%s.", + metadata_lv->vg->name, metadata_lv->name); + return 0; + } + if (metadata_lv->status & LOCKED) { + log_error("Can't convert locked LV %s/%s.", + metadata_lv->vg->name, metadata_lv->name); return 0; } if (metadata_lv == pool_lv) { - log_error("Can't use same LV for thin data and metadata LV %s", + log_error("Can't use same LV for thin pool data and metadata LV %s.", lp->pool_metadata_lv_name); return 0; } @@ -1857,37 +1859,51 @@ static int _lvconvert_thinpool(struct cmd_context *cmd, metadata_lv->vg->name, metadata_lv->name); return 0; } - } else if (arg_count(cmd, poolmetadatasize_ARG)) { - /* FIXME: allocate metadata LV! */ - metadata_lv = NULL; - log_error("Uncreated metadata."); - return 0; - } else { - log_error("Uknown metadata."); - return 0; - } - - len = strlen(pool_lv->name) + 16; - if (!(name = dm_pool_alloc(pool_lv->vg->vgmem, len))) { - log_error("Cannot allocate new name."); - return 0; - } - - if (!lv_is_active(metadata_lv)) { - if (!deactivate_lv(cmd, metadata_lv)) { - log_error("Can't deactivate logical volume %s/%s.", - metadata_lv->vg->name, metadata_lv->name); + if (!lv_is_active(metadata_lv) && + !activate_lv_local(cmd, metadata_lv)) { + log_error("Aborting. Failed to activate thin metadata lv."); + return 0; + } + if (!set_lv(cmd, metadata_lv, UINT64_C(0), 0)) { + log_error("Aborting. Failed to wipe thin metadata lv."); return 0; } - if (!activate_lv_local(cmd, metadata_lv)) { - log_error("Aborting. Failed to activate thin metadata lv."); + + lp->poolmetadata_size = + (uint64_t) metadata_lv->le_count * metadata_lv->vg->extent_size; + if (lp->poolmetadata_size > (2 * DEFAULT_THIN_POOL_MAX_METADATA_SIZE)) { + log_warn("WARNING: Maximum size used by metadata is %s, rest is unused.", + display_size(cmd, 2 * DEFAULT_THIN_POOL_MAX_METADATA_SIZE)); + lp->poolmetadata_size = 2 * DEFAULT_THIN_POOL_MAX_METADATA_SIZE; + } else if (lp->poolmetadata_size < (2 * DEFAULT_THIN_POOL_MIN_METADATA_SIZE)) { + log_error("Logical volume %s/%s is too small (<%s) for metadata.", + metadata_lv->vg->name, metadata_lv->name, + display_size(cmd, 2 * DEFAULT_THIN_POOL_MIN_METADATA_SIZE)); return 0; } - } + if (!update_pool_params(cmd, lp->target_attr, + pool_lv->le_count, pool_lv->vg->extent_size, + &lp->chunk_size, &lp->discards, + &lp->poolmetadata_size)) + return_0; + } else { + if (!update_pool_params(cmd, lp->target_attr, + pool_lv->le_count, pool_lv->vg->extent_size, + &lp->chunk_size, &lp->discards, + &lp->poolmetadata_size)) + return_0; - if (!set_lv(cmd, metadata_lv, UINT64_C(0), 0)) { - log_error("Aborting. Failed to wipe thin metadata lv."); - return 0; + if (!get_stripe_params(cmd, &lp->stripes, &lp->stripe_size)) + return_0; + /* Hmm _read_activation_params */ + lp->read_ahead = arg_uint_value(cmd, readahead_ARG, + cmd->default_settings.read_ahead); + + if (!(metadata_lv = alloc_pool_metadata(pool_lv, lp->alloc, name, + lp->pvh, lp->read_ahead, + lp->stripes, lp->stripe_size, + lp->poolmetadata_size))) + return_0; } if (!deactivate_lv(cmd, metadata_lv)) { @@ -1896,12 +1912,10 @@ static int _lvconvert_thinpool(struct cmd_context *cmd, return 0; } - if (dm_snprintf(name, len, "%s_tmeta", pool_lv->name) < 0) - return_0; - /* Rename deactivated metadata LV to have _tmeta suffix */ /* Implicit checks if metadata_lv is visible */ - if (!lv_rename_update(cmd, metadata_lv, name, 0)) + if (strcmp(metadata_lv->name, name) && + !lv_rename_update(cmd, metadata_lv, name, 0)) return_0; /*

1 0

master - thin: add alloc_pool_metadata
by Zdenek Kabelac 19 Nov '12

19 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b78609686399ee01… Commit: b78609686399ee01a53d8a2e8685cd05389d8cc9 Parent: f4137640f60af5377615a1b9e50238b593cf272b Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Nov 19 13:37:36 2012 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Nov 19 14:38:17 2012 +0100 thin: add alloc_pool_metadata Since our api call is not yet powerfull enough, use this wrapper to preset options. --- tools/toollib.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ tools/toollib.h | 5 +++++ 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/tools/toollib.c b/tools/toollib.c index c3c6381..ba1ba94 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -1650,6 +1650,50 @@ int update_pool_params(struct cmd_context *cmd, unsigned attr, return 1; } +struct logical_volume *alloc_pool_metadata(struct logical_volume *pool_lv, + alloc_policy_t alloc, + const char *name, + struct dm_list *pvh, + uint32_t read_ahead, + uint32_t stripes, + uint32_t stripe_size, + uint64_t size) +{ + struct logical_volume *metadata_lv; + struct lvcreate_params lvc; + + /* FIXME: Make lvm2api usable */ + memset(&lvc, 0, sizeof(lvc)); + + if (!(lvc.extents = extents_from_size(pool_lv->vg->cmd, size, + pool_lv->vg->extent_size))) + return_0; + + if (!(lvc.segtype = get_segtype_from_string(pool_lv->vg->cmd, "striped"))) + return_0; + + dm_list_init(&lvc.tags); + + /* FIXME: allocate properly space for metadata_lv */ + lvc.activate = CHANGE_ALY; + lvc.alloc = alloc; + lvc.lv_name = name; + lvc.major = -1; + lvc.minor = -1; + lvc.permission = LVM_READ | LVM_WRITE; + lvc.pvh = pvh; + lvc.read_ahead = read_ahead; + lvc.stripe_size = stripe_size; + lvc.stripes = stripes; + lvc.vg_name = pool_lv->vg->name; + lvc.zero = 1; + + if (!(metadata_lv = lv_create_single(pool_lv->vg, &lvc))) + return_0; + + return metadata_lv; +} + /* * Generic stripe parameter checks. */ diff --git a/tools/toollib.h b/tools/toollib.h index 09071b3..80c01fd 100644 --- a/tools/toollib.h +++ b/tools/toollib.h @@ -120,6 +120,11 @@ int update_pool_params(struct cmd_context *cmd, unsigned attr, uint32_t data_extents, uint32_t extent_size, uint32_t *chunk_size, thin_discards_t *discards, uint64_t *pool_metadata_size); +struct logical_volume *alloc_pool_metadata(struct logical_volume *pool_lv, + alloc_policy_t alloc, const char *name, + struct dm_list *pvh, uint32_t read_ahead, + uint32_t stripes, uint32_t stripe_size, + uint64_t size); int get_stripe_params(struct cmd_context *cmd, uint32_t *stripes, uint32_t *stripe_size);

1 0

master - thin: add common pool functions
by Zdenek Kabelac 19 Nov '12

19 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f4137640f60af537… Commit: f4137640f60af5377615a1b9e50238b593cf272b Parent: 2e96ea4a899a0d0a5adb5e3d8fa09e04fd7a4173 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Nov 15 14:48:32 2012 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Nov 19 14:38:17 2012 +0100 thin: add common pool functions Move common functions for lvcreate and lvconvert. get_pool_params() - read thin pool args. update_pool_params() - updates/validates some thin args. It is getting complicated and even few more things will be implemented, so to avoid reimplementing things differently in lvcreate and lvconvert code has been splitted into 2 common functions that allow some future extension. --- WHATS_NEW | 1 + tools/toollib.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/toollib.h | 9 ++++ 3 files changed, 139 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 8117165..59a69da 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.99 - =================================== + Move common functionality for thin lvcreate and lvconvert to toollib. Mirrored log is now fixed before its mirror when double-fault occurs. Add python-lvm unit test case Exit pvscan --cache immediately if cluster locking used or lvmetad not used. diff --git a/tools/toollib.c b/tools/toollib.c index 62f59d8..c3c6381 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -15,6 +15,7 @@ #include "tools.h" #include <sys/stat.h> +#include <strings.h> const char *command_name(struct cmd_context *cmd) { @@ -1521,6 +1522,134 @@ int get_activation_monitoring_mode(struct cmd_context *cmd, return 1; } +int get_pool_params(struct cmd_context *cmd, + uint32_t *chunk_size, + thin_discards_t *discards, + uint64_t *pool_metadata_size, + int *zero) +{ + if (arg_count(cmd, zero_ARG)) + *zero = strcmp(arg_str_value(cmd, zero_ARG, "y"), "n"); + else + *zero = 1; /* TODO: Make default configurable */ + + *discards = (thin_discards_t) arg_uint_value(cmd, discards_ARG, + THIN_DISCARDS_PASSDOWN); + + if (arg_sign_value(cmd, chunksize_ARG, SIGN_NONE) == SIGN_MINUS) { + log_error("Negative chunk size is invalid."); + return 0; + } + *chunk_size = arg_uint_value(cmd, chunksize_ARG, + DM_THIN_MIN_DATA_BLOCK_SIZE); + + if ((*chunk_size < DM_THIN_MIN_DATA_BLOCK_SIZE) || + (*chunk_size > DM_THIN_MAX_DATA_BLOCK_SIZE)) { + log_error("Chunk size must be in the range %s to %s.", + display_size(cmd, DM_THIN_MIN_DATA_BLOCK_SIZE), + display_size(cmd, DM_THIN_MAX_DATA_BLOCK_SIZE)); + return 0; + } + + if (arg_sign_value(cmd, poolmetadatasize_ARG, SIGN_NONE) == SIGN_MINUS) { + log_error("Negative pool metadata size is invalid."); + return 0; + } + *pool_metadata_size = arg_uint64_value(cmd, poolmetadatasize_ARG, UINT64_C(0)); + + return 1; +} + +int update_pool_params(struct cmd_context *cmd, unsigned attr, + uint32_t data_extents, uint32_t extent_size, + uint32_t *chunk_size, thin_discards_t *discards, + uint64_t *pool_metadata_size) +{ + size_t estimate_chunk_size; + + if (!(attr & THIN_FEATURE_BLOCK_SIZE) && + (*chunk_size & (*chunk_size - 1))) { + log_error("Chunk size must be a power of 2 for this thin target version."); + return 0; + } else if (*chunk_size & (DM_THIN_MIN_DATA_BLOCK_SIZE - 1)) { + log_error("Chunk size must be multiple of %s.", + display_size(cmd, DM_THIN_MIN_DATA_BLOCK_SIZE)); + return 0; + } else if ((*discards != THIN_DISCARDS_IGNORE) && + (*chunk_size & (*chunk_size - 1))) { + log_warn("WARNING: Using discards ignore for chunk size non power of 2."); + *discards = THIN_DISCARDS_IGNORE; + } + + if (!*pool_metadata_size) { + /* Defaults to nr_pool_blocks * 64b converted to size in sectors */ + *pool_metadata_size = (uint64_t) data_extents * extent_size / + (*chunk_size * (SECTOR_SIZE / UINT64_C(64))); + /* Check if we could eventually use bigger chunk size */ + if (!arg_count(cmd, chunksize_ARG)) { + while ((*pool_metadata_size > + (DEFAULT_THIN_POOL_OPTIMAL_SIZE / SECTOR_SIZE)) && + (*chunk_size < DM_THIN_MAX_DATA_BLOCK_SIZE)) { + *chunk_size <<= 1; + *pool_metadata_size >>= 1; + } + log_verbose("Setting chunk size to %s.", + display_size(cmd, *chunk_size)); + } else if (*pool_metadata_size > (2 * DEFAULT_THIN_POOL_MAX_METADATA_SIZE)) { + /* Suggest bigger chunk size */ + estimate_chunk_size = (uint64_t) data_extents * extent_size / + (2 * DEFAULT_THIN_POOL_MAX_METADATA_SIZE * + (SECTOR_SIZE / UINT64_C(64))); + log_warn("WARNING: Chunk size is too small for pool, suggested minimum is %s.", + display_size(cmd, 1 << (ffs(estimate_chunk_size) + 1))); + } + + /* Round up to extent size */ + if (*pool_metadata_size % extent_size) + *pool_metadata_size += extent_size - *pool_metadata_size % extent_size; + } else { + estimate_chunk_size = (uint64_t) data_extents * extent_size / + (*pool_metadata_size * (SECTOR_SIZE / UINT64_C(64))); + /* Check to eventually use bigger chunk size */ + if (!arg_count(cmd, chunksize_ARG)) { + *chunk_size = estimate_chunk_size; + + if (*chunk_size < DM_THIN_MIN_DATA_BLOCK_SIZE) + *chunk_size = DM_THIN_MIN_DATA_BLOCK_SIZE; + else if (*chunk_size > DM_THIN_MAX_DATA_BLOCK_SIZE) + *chunk_size = DM_THIN_MAX_DATA_BLOCK_SIZE; + + log_verbose("Setting chunk size %uKiB.", *chunk_size / 2); + } else if (*chunk_size < estimate_chunk_size) { + /* Suggest bigger chunk size */ + log_warn("WARNING: Chunk size is smaller then suggested minimum size %s.", + display_size(cmd, estimate_chunk_size)); + } + } + + if ((uint64_t) *chunk_size > (uint64_t) data_extents * extent_size) { + log_error("Chunk size is bigger then pool data size."); + return 0; + } + + if (*pool_metadata_size > (2 * DEFAULT_THIN_POOL_MAX_METADATA_SIZE)) { + if (arg_count(cmd, poolmetadatasize_ARG)) + log_warn("WARNING: Maximum supported pool metadata size is %s.", + display_size(cmd, 2 * DEFAULT_THIN_POOL_MAX_METADATA_SIZE)); + *pool_metadata_size = 2 * DEFAULT_THIN_POOL_MAX_METADATA_SIZE; + } else if (*pool_metadata_size < (2 * DEFAULT_THIN_POOL_MIN_METADATA_SIZE)) { + if (arg_count(cmd, poolmetadatasize_ARG)) + log_warn("WARNING: Minimum supported pool metadata size is %s.", + display_size(cmd, 2 * DEFAULT_THIN_POOL_MIN_METADATA_SIZE)); + *pool_metadata_size = 2 * DEFAULT_THIN_POOL_MIN_METADATA_SIZE; + } + + log_verbose("Setting pool metadata size to %s.", + display_size(cmd, *pool_metadata_size)); + + return 1; +} + /* * Generic stripe parameter checks. */ diff --git a/tools/toollib.h b/tools/toollib.h index b3b0a7c..09071b3 100644 --- a/tools/toollib.h +++ b/tools/toollib.h @@ -111,6 +111,15 @@ int pvcreate_params_validate(struct cmd_context *cmd, int get_activation_monitoring_mode(struct cmd_context *cmd, int *monitoring_mode); +int get_pool_params(struct cmd_context *cmd, + uint32_t *chunk_size, + thin_discards_t *discards, + uint64_t *pool_metadata_size, + int *zero); +int update_pool_params(struct cmd_context *cmd, unsigned attr, + uint32_t data_extents, uint32_t extent_size, + uint32_t *chunk_size, thin_discards_t *discards, + uint64_t *pool_metadata_size); int get_stripe_params(struct cmd_context *cmd, uint32_t *stripes, uint32_t *stripe_size);

1 0

master - liblvm: internal API change
by Zdenek Kabelac 19 Nov '12

19 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2e96ea4a899a0d0a… Commit: 2e96ea4a899a0d0a5adb5e3d8fa09e04fd7a4173 Parent: cf5242a670010a7c0137090a330b78b3bf43a55b Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Nov 13 10:49:32 2012 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Nov 19 14:37:30 2012 +0100 liblvm: internal API change Return LV/NULL instead of 1/0 which saves lookup for created LV. --- lib/metadata/lv_manip.c | 6 +++--- lib/metadata/metadata-exported.h | 4 ++-- liblvm/lvm_lv.c | 8 +++----- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 9f87854..dc315ac 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -4714,8 +4714,8 @@ revert_new_lv: return NULL; } -int lv_create_single(struct volume_group *vg, - struct lvcreate_params *lp) +struct logical_volume *lv_create_single(struct volume_group *vg, + struct lvcreate_params *lp) { struct logical_volume *lv; @@ -4743,5 +4743,5 @@ int lv_create_single(struct volume_group *vg, out: log_print_unless_silent("Logical volume \"%s\" created", lv->name); - return 1; + return lv; } diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index b586936..ffec129 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -626,8 +626,8 @@ struct lvcreate_params { struct dm_list tags; /* all */ }; -int lv_create_single(struct volume_group *vg, - struct lvcreate_params *lp); +struct logical_volume *lv_create_single(struct volume_group *vg, + struct lvcreate_params *lp); /* * Functions for layer manipulation diff --git a/liblvm/lvm_lv.c b/liblvm/lvm_lv.c index d47a857..77bdebf 100644 --- a/liblvm/lvm_lv.c +++ b/liblvm/lvm_lv.c @@ -146,7 +146,7 @@ lv_t lvm_vg_create_lv_linear(vg_t vg, const char *name, uint64_t size) { struct lvcreate_params lp = { 0 }; uint64_t extents; - struct lv_list *lvl; + struct logival_volume *lv; if (vg_read_error(vg)) return NULL; @@ -162,11 +162,9 @@ lv_t lvm_vg_create_lv_linear(vg_t vg, const char *name, uint64_t size) _lv_set_default_params(&lp, vg, name, extents); if (!_lv_set_default_linear_params(vg->cmd, &lp)) return_NULL; - if (!lv_create_single(vg, &lp)) + if (!(lv = lv_create_single(vg, &lp))) return_NULL; - if (!(lvl = find_lv_in_vg(vg, name))) - return NULL; - return (lv_t) lvl->lv; + return (lv_t) lv; } /*

1 0

master - lvconvert: store target attributes
by Zdenek Kabelac 19 Nov '12

19 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=cf5242a670010a7c… Commit: cf5242a670010a7c0137090a330b78b3bf43a55b Parent: 2c3bbf0a6cf33de8f1b2a08fcb79da3f881d3472 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Nov 15 10:32:13 2012 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Nov 19 14:17:10 2012 +0100 lvconvert: store target attributes Target tells us its version, and we may allow different set of options to be supported with different version of driver. Idea is to provide individual feature flags and later be able to query for them. --- lib/metadata/metadata-exported.h | 1 + tools/lvconvert.c | 3 ++- tools/lvcreate.c | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index 00be606..b586936 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -609,6 +609,7 @@ struct lvcreate_params { uint32_t mirrors; /* mirror */ const struct segment_type *segtype; /* all */ + unsigned target_attr; /* all */ /* size */ uint32_t extents; /* all */ diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 27d8181..7d03a5f 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -41,6 +41,7 @@ struct lvconvert_params { uint32_t stripe_size; const struct segment_type *segtype; + unsigned target_attr; alloc_policy_t alloc; @@ -460,7 +461,7 @@ static int _read_params(struct lvconvert_params *lp, struct cmd_context *cmd, } if (activation() && lp->segtype && lp->segtype->ops->target_present && - !lp->segtype->ops->target_present(cmd, NULL, NULL)) { + !lp->segtype->ops->target_present(cmd, NULL, &lp->target_attr)) { log_error("%s: Required device-mapper target(s) not " "detected in your kernel", lp->segtype->name); return 0; diff --git a/tools/lvcreate.c b/tools/lvcreate.c index 5d687ac..dad0ba7 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c @@ -679,7 +679,6 @@ static int _lvcreate_params(struct lvcreate_params *lp, struct arg_value_group_list *current_group; const char *segtype_str; const char *tag; - unsigned attr = 0; memset(lp, 0, sizeof(*lp)); memset(lcp, 0, sizeof(*lcp)); @@ -796,7 +795,7 @@ static int _lvcreate_params(struct lvcreate_params *lp, } if (activation() && lp->segtype->ops->target_present && - !lp->segtype->ops->target_present(cmd, NULL, &attr)) { + !lp->segtype->ops->target_present(cmd, NULL, &lp->target_attr)) { log_error("%s: Required device-mapper target(s) not " "detected in your kernel", lp->segtype->name); return 0;

1 0

master - cleanup: move setting of parameter zero
by Zdenek Kabelac 19 Nov '12

19 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2c3bbf0a6cf33de8… Commit: 2c3bbf0a6cf33de8f1b2a08fcb79da3f881d3472 Parent: 54c73b7723713f43413584d59ca0bdd42c1d8241 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Nov 15 14:47:37 2012 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Nov 19 14:15:43 2012 +0100 cleanup: move setting of parameter zero Since we may need to use different default value, move read of zero_ARG prior processing of parameters. --- tools/lvcreate.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/lvcreate.c b/tools/lvcreate.c index 3ea8f46..5d687ac 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c @@ -812,6 +812,12 @@ static int _lvcreate_params(struct lvcreate_params *lp, } } + /* + * Should we zero the lv. + */ + lp->zero = strcmp(arg_str_value(cmd, zero_ARG, + (lp->segtype->flags & SEG_CANNOT_BE_ZEROED) ? "n" : "y"), "n"); + if (!_lvcreate_name_params(lp, cmd, &argc, &argv) || !_read_size_params(lp, lcp, cmd) || !get_stripe_params(cmd, &lp->stripes, &lp->stripe_size) || @@ -877,12 +883,6 @@ static int _lvcreate_params(struct lvcreate_params *lp, return 0; } - /* - * Should we zero the lv. - */ - lp->zero = strcmp(arg_str_value(cmd, zero_ARG, - (lp->segtype->flags & SEG_CANNOT_BE_ZEROED) ? "n" : "y"), "n"); - if (lp->mirrors > DEFAULT_MIRROR_MAX_IMAGES) { log_error("Only up to %d images in mirror supported currently.", DEFAULT_MIRROR_MAX_IMAGES);

1 0

master - mirror: Mirrored log should be fixed before mirror when double fault occurs
by Jonathan Brassow 14 Nov '12

14 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=54c73b7723713f43… Commit: 54c73b7723713f43413584d59ca0bdd42c1d8241 Parent: 7a34db0cfdeab53e56182c7499214016a93706b2 Author: Jonathan Brassow <jbrassow(a)redhat.com> AuthorDate: Wed Nov 14 14:58:47 2012 -0600 Committer: Jonathan Brassow <jbrassow(a)redhat.com> CommitterDate: Wed Nov 14 14:58:47 2012 -0600 mirror: Mirrored log should be fixed before mirror when double fault occurs This patch is intended to fix bug 825323 - FS turns read-only during a double fault of a mirror leg and mirrored log's leg at the same time. It only affects a 2-way mirror with a mirrored log. 3+-way mirrors and mirrors without a mirrored log are not affected. The problem resulted from the fact that the top level mirror was not using 'noflush' when suspending before its "down-convert". When a mirror image fails, the bios are queue until a suspend is recieved. If it is a 'noflush' suspend, the bios can be safely requeued in the DM core. If 'noflush' is not used, the bios must be pushed through the target and if a device is failed for a mirror, that means issuing an error. When an error is received by a file system, it results in it turning read-only (depending on the FS). Part of the problem was is due to the nature of the stacking involved in using a mirror as a mirror's log. When an image in each fail, the top level mirror stalls because it is waiting for a log flush. The other stalls waiting for corrective action. When the repair command is issued, the entire stacked arrangement is collapsed to a linear LV. The log flush then fails (somewhat uncleanly) and the top-level mirror is suspended without 'noflush' because it is a linear device. This patch allows the log to be repaired first, which in turn allows the top-level mirror's log flush to complete cleanly. The top-level mirror is then secondarily reduced to a linear device - at which time this mirror is suspended properly with 'noflush'. --- WHATS_NEW | 1 + tools/lvconvert.c | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 972d87b..8117165 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.99 - =================================== + Mirrored log is now fixed before its mirror when double-fault occurs. Add python-lvm unit test case Exit pvscan --cache immediately if cluster locking used or lvmetad not used. Don't use lvmetad in lvm2-monitor.service ExecStop to avoid a systemd issue. diff --git a/tools/lvconvert.c b/tools/lvconvert.c index f23fc4b..27d8181 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -1341,10 +1341,6 @@ int mirror_remove_missing(struct cmd_context *cmd, if (!(failed_pvs = _failed_pv_list(lv->vg))) return_0; - /* No point in keeping a log if the result is not a mirror */ - if (_failed_mirrors_count(lv) + 1 >= lv_mirror_count(lv)) - log_count = 0; - if (force && _failed_mirrors_count(lv) == lv_mirror_count(lv)) { log_error("No usable images left in %s.", lv->name); return lv_remove_with_dependencies(cmd, lv, DONT_PROMPT, 0); @@ -1363,8 +1359,8 @@ int mirror_remove_missing(struct cmd_context *cmd, _is_partial_lv, NULL, 0)) return 0; - if (!_lv_update_log_type(cmd, NULL, lv, failed_pvs, - log_count)) + if (lv_is_mirrored(lv) && + !_lv_update_log_type(cmd, NULL, lv, failed_pvs, log_count)) return 0; if (!_reload_lv(cmd, lv->vg, lv))

1 0

master - python-lvm: Initial check-in of python-lvm unit test case.
by tasleson 14 Nov '12

14 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7a34db0cfdeab53e… Commit: 7a34db0cfdeab53e56182c7499214016a93706b2 Parent: fefb2f03c3fe49e855f21f7d4952b6a2318113cc Author: Tony Asleson <tasleson(a)redhat.com> AuthorDate: Fri Oct 26 15:35:17 2012 -0500 Committer: Tony Asleson <tasleson(a)redhat.com> CommitterDate: Wed Nov 14 13:18:37 2012 -0600 python-lvm: Initial check-in of python-lvm unit test case. Signed-off-by: Tony Asleson <tasleson(a)redhat.com> --- WHATS_NEW | 1 + test/api/pytest.sh | 27 +++ test/api/python_lvm_unit.py | 375 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 403 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index fd38a34..972d87b 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.99 - =================================== + Add python-lvm unit test case Exit pvscan --cache immediately if cluster locking used or lvmetad not used. Don't use lvmetad in lvm2-monitor.service ExecStop to avoid a systemd issue. Remove dependency on fedora-storage-init.service in lvm2 systemd units. diff --git a/test/api/pytest.sh b/test/api/pytest.sh new file mode 100644 index 0000000..ad99624 --- /dev/null +++ b/test/api/pytest.sh @@ -0,0 +1,27 @@ +#!/bin/sh +# Copyright (C) 2012 Red Hat, Inc. All rights reserved. +# +# This file is part of LVM2. +# +# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +. lib/test + +aux prepare_vg 1 +lvcreate -n test -l 5 $vg + +#Locate the python binding library to use. +python_lib=`find $abs_top_builddir -name lvm.so` +if [ "$python_lib" != "" ] +then + export PYTHONPATH=`dirname $python_lib`:$PYTHONPATH + python_lvm_unit.py +else + echo "Unable to test python bindings as library not available" +fi diff --git a/test/api/python_lvm_unit.py b/test/api/python_lvm_unit.py new file mode 100755 index 0000000..fdeca75 --- /dev/null +++ b/test/api/python_lvm_unit.py @@ -0,0 +1,375 @@ +#!/usr/bin/env python + +# Copyright (C) 2012 Red Hat, Inc. All rights reserved. +# +# This file is part of LVM2. +# +# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +import unittest +import random +import string +import lvm + +# Set of basic unit tests for the python bindings. + +def rs(l=10): + """ + Generate a random string + """ + return ''.join(random.choice(string.ascii_uppercase) for x in range(l)) + + +class TestLvm(unittest.TestCase): + def setUp(self): + pass + + def tearDown(self): + pass + + def testOpenClose(self): + pass + + def testVersion(self): + version = lvm.getVersion() + self.assertNotEquals(version, None) + self.assertEquals(type(version), str) + self.assertTrue(len(version) > 0) + + def testVgOpen(self): + vg_names = lvm.listVgNames() + + for i in vg_names: + vg = lvm.vgOpen(i) + vg.close() + + def _get_lv_test(self, mode='r'): + vg_name_list = lvm.listVgNames() + for vgname in vg_name_list: + vg = lvm.vgOpen(vgname, mode) + lvs = vg.listLVs() + if len(lvs): + return lvs[0] + return None + + def _get_pv_test(self, mode='r'): + vg_name_list = lvm.listVgNames() + for vgname in vg_name_list: + vg = lvm.vgOpen(vgname, mode) + pvs = vg.listPVs() + if len(pvs): + return pvs[0] + return None + + def testPvGetters(self): + pv = self._get_pv_test() + + self.assertEqual(type(pv.getName()), str) + self.assertTrue(len(pv.getName()) > 0) + + self.assertEqual(type(pv.getUuid()), str) + self.assertTrue(len(pv.getUuid()) > 0) + + self.assertEqual(type(pv.getMdaCount()), int) + self.assertEqual(type(pv.getMdaCount()), int) + + self.assertEqual(type(pv.getSize()), int) + + self.assertEqual(type(pv.getDevSize()), int) + + self.assertEqual(type(pv.getFree()), int) + + def _test_prop(self, prop_obj, prop, var_type, settable): + result = prop_obj.getProperty(prop) + + self.assertEqual(type(result[0]), var_type) + self.assertEqual(type(result[1]), bool) + self.assertTrue(result[1] == settable) + + def testPvSegs(self): + pv = self._get_pv_test("r") + pv_segs = pv.listPVsegs() + + #LVsegs returns a tuple, (value, bool settable) + + #TODO: Test other properties of pv_seg + for i in pv_segs: + self._test_prop(i, 'pvseg_start', long, False) + + def testPvProperty(self): + pv = self._get_pv_test("r") + self._test_prop(pv, 'pv_mda_count', long, False) + + def testLvProperty(self): + lv = self._get_lv_test("r") + self._test_prop(lv, 'seg_count', long, False) + + def testLvTags(self): + lv = self._get_lv_test("w") + self._testTags(lv) + + def testLvActiveInactive(self): + lv = self._get_lv_test("w") + lv.deactivate() + self.assertTrue(lv.isActive() == False) + lv.activate() + self.assertTrue(lv.isActive() == True) + + def testLvRename(self): + lv = self._get_lv_test("w") + + current_name = lv.getName() + new_name = rs() + lv.rename(new_name) + self.assertEqual(lv.getName(), new_name) + lv.rename(current_name) + + def testLvSuspend(self): + lv = self._get_lv_test("r") + + result = lv.isSuspended() + self.assertTrue(type(result), bool) + + def testLvSize(self): + lv = self._get_lv_test("r") + result = lv.getSize() + self.assertTrue(type(result), bool) + + def testLvResize(self): + pass #Not implemented! + + def testPvResize(self): + pass #Patch available, not committed + + def testLvSeg(self): + lv = self._get_lv_test("r") + + lv_segs = lv.listLVsegs() + + #LVsegs returns a tuple, (value, bool settable) + + #TODO: Test other properties of lv_seg + for i in lv_segs: + self._test_prop(i, 'seg_start_pe', long, False) + + def testLvMisc(self): + #Need to look at lack of vg_write in vg create + + #For this to work cleanly we will remove an existing lv & vg and then + #put it back so that the test framework can clean it up. + vg_name_list = lvm.listVgNames() + + if len(vg_name_list): + vg_name = vg_name_list[0] + + vg = lvm.vgOpen(vg_name, "w") + + vg_mda_copies = vg.getProperty('vg_mda_copies') + vg.setProperty('vg_mda_copies', vg_mda_copies[0]) + + pvs = vg.listPVs() + lvs = vg.listLVs() + + pe_devices = [] + for p in pvs: + pe_devices.append(p.getName()) + + self.assertEquals(len(lvs), 1) + + lv = lvs[0] + + lv_name = lv.getName() + lv_size = lv.getSize() + + lv.remove() + lv = None + + vg.reduce(pe_devices[0]) + + vg.remove() + vg.close() + + nvg = lvm.vgCreate(vg_name) + for p in pe_devices: + nvg.extend(p) + + #2MiB extent size + new_extent = 1024 * 1024 * 2 + + nvg.setExtentSize(new_extent) + self.assertEqual(nvg.getExtentSize(), new_extent) + + v = nvg.createLvLinear(lv_name, lv_size) + + lv_find_name = nvg.lvFromName(lv_name) + lv_find_uuid = nvg.lvFromUuid(v.getUuid()) + + self.assertTrue(lv_find_name.getName() == v.getName()) + self.assertTrue(lv_find_uuid.getUuid() == v.getUuid()) + + nvg.close() + + def testVgNames(self): + vg = lvm.listVgNames() + self.assertTrue(isinstance(vg, tuple)) + + def testDupeLvCreate(self): + """ + Try to create a lv with the same name expecting a failure + Note: This was causing a seg. fault previously + """ + vgs = lvm.listVgNames() + + if len(vgs): + vg_name = vgs[0] + vg = lvm.vgOpen(vg_name, "w") + + lvs = vg.listLVs() + + if len(lvs): + lv = lvs[0] + lv_name = lv.getName() + self.assertRaises(lvm.LibLVMError, vg.createLvLinear, lv_name, + lv.getSize()) + + def testVgUuids(self): + vgs_uuids = lvm.listVgUuids() + + self.assertTrue(isinstance(vgs_uuids, tuple)) + + vgs_uuids = list(vgs_uuids) + + vgs_names = lvm.listVgNames() + + for vg_name in vgs_names: + vg = lvm.vgOpen(vg_name, "r") + + #TODO Write/fix BUG, vg uuid don't match between lvm.listVgUuids + # and vg.getUuid() + vg_uuid_search = vg.getUuid().replace('-', '') + + self.assertTrue(vg_uuid_search in vgs_uuids) + vgs_uuids.remove(vg_uuid_search) + + self.assertTrue(len(vgs_uuids) == 0) + + def testPercentToFloat(self): + self.assertEqual(lvm.percentToFloat(0), 0.0) + self.assertEqual(lvm.percentToFloat(1000000), 1.0) + self.assertEqual(lvm.percentToFloat(1000000 / 2), 0.5) + + def testScan(self): + self.assertEqual(lvm.scan(), None) + + def testConfigReload(self): + self.assertEqual(lvm.configReload(), None) + + def testConfig_override(self): + self.assertEquals(lvm.configOverride("global.test = 1"), None) + + def testConfigFindBool(self): + self.assertTrue(lvm.configFindBool("global/locking_type")) + self.assertFalse(lvm.configFindBool("global/fallback_to_local_locking")) + + def testVgFromPVLookups(self): + vgname_list = lvm.listVgNames() + for vg_name in vgname_list: + vg = lvm.vgOpen(vg_name, 'r') + + vg_name = vg.getName() + + pv_list = vg.listPVs() + for pv in pv_list: + vg_name_from_pv = lvm.vgNameFromPvid(pv.getUuid()) + self.assertEquals(vg_name, vg_name_from_pv) + self.assertEqual(vg_name, lvm.vgNameFromDevice(pv.getName())) + vg.close() + + def testVgGetName(self): + vgname_list = lvm.listVgNames() + + for vg_name in vgname_list: + vg = lvm.vgOpen(vg_name, 'r') + self.assertEqual(vg.getName(), vg_name) + vg.close() + + def testVgGetUuid(self): + vgname_list = lvm.listVgNames() + + for vg_name in vgname_list: + vg = lvm.vgOpen(vg_name, 'r') + uuid = vg.getUuid() + self.assertNotEqual(uuid, None) + self.assertTrue(len(uuid) > 0) + vg.close() + + + RETURN_NUMERIC = ["getSeqno", "getSize", "getFreeSize", "getFreeSize", + "getExtentSize", "getExtentCount", "getFreeExtentCount", + "getPvCount", "getMaxPv", "getMaxLv"] + + def testVgGetters(self): + vg_name_list = lvm.listVgNames() + + for vg_name in vg_name_list: + vg = lvm.vgOpen(vg_name, 'r') + self.assertTrue(type(vg.isClustered()) == bool) + self.assertTrue(type(vg.isExported()) == bool) + self.assertTrue(type(vg.isPartial()) == bool) + + #Loop through the list invoking the method + for method_name in TestLvm.RETURN_NUMERIC: + method = getattr(vg, method_name) + result = method() + self.assertTrue(type(result) == int) + + vg.close() + + def _testTags(self, tag_obj): + existing_tags = tag_obj.getTags() + self.assertTrue(type(existing_tags) == tuple) + + num_tags = random.randint(2, 40) + created_tags = [] + + for i in range(num_tags): + tag_name = rs(random.randint(1, 128)) + tag_obj.addTag(tag_name) + created_tags.append(tag_name) + + tags = tag_obj.getTags() + self.assertTrue(len(existing_tags) + len(created_tags) == len(tags)) + + num_remove = len(created_tags) + + for i in range(num_remove): + tag_to_remove = created_tags[random.randint(0, len(created_tags) - 1)] + + created_tags.remove(tag_to_remove) + + tag_obj.removeTag(tag_to_remove) + + current_tags = tag_obj.getTags() + self.assertFalse(tag_to_remove in current_tags) + + current_tags = tag_obj.getTags() + self.assertTrue(len(current_tags) == len(existing_tags)) + for e in existing_tags: + self.assertTrue(e in current_tags) + + def testVgTags(self): + vg_name_list = lvm.listVgNames() + + for vg_name in vg_name_list: + vg = lvm.vgOpen(vg_name, 'w') + self._testTags(vg) + vg.close() + +if __name__ == "__main__": + unittest.main() \ No newline at end of file

1 0

master - test: set LD_LIBRARY_PATH to all dirs with *.so
by tasleson 14 Nov '12

14 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=fefb2f03c3fe49e8… Commit: fefb2f03c3fe49e855f21f7d4952b6a2318113cc Parent: fc2644ae71a87ea81979f66022b98ec49c692a66 Author: Tony Asleson <tasleson(a)redhat.com> AuthorDate: Fri Oct 26 15:30:21 2012 -0500 Committer: Tony Asleson <tasleson(a)redhat.com> CommitterDate: Wed Nov 14 13:05:55 2012 -0600 test: set LD_LIBRARY_PATH to all dirs with *.so Instead of manually editing entries, add all the directories which contain shared objects. Signed-off-by: Tony Asleson <tasleson(a)redhat.com> --- test/lib/utils.sh | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/lib/utils.sh b/test/lib/utils.sh index 70d9f66..ab5abc1 100644 --- a/test/lib/utils.sh +++ b/test/lib/utils.sh @@ -204,11 +204,11 @@ test -n "${abs_top_builddir+varset}" || . lib/paths || die "you must run make fi case "$PATH" in *"$abs_top_builddir/test/lib"*) ;; *) - PATH="$abs_top_builddir/test/lib":$PATH - for d in daemons/dmeventd/plugins/mirror daemons/dmeventd/plugins/snapshot \ - daemons/dmeventd/plugins/lvm2 daemons/dmeventd liblvm tools libdm; do - LD_LIBRARY_PATH="$abs_top_builddir/$d":$LD_LIBRARY_PATH - done + PATH="$abs_top_builddir/test/lib":"$abs_top_builddir/test/api":$PATH + for i in `find $abs_top_builddir -name \*.so`; do + p=`dirname $i` + LD_LIBRARY_PATH="$p":$LD_LIBRARY_PATH + done export PATH LD_LIBRARY_PATH ;; esac

1 0

master - pvscan: exit --cache immediately if locking_type=3 || use_lvmetad=0
by Peter Rajnoha 09 Nov '12

09 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=fc2644ae71a87ea8… Commit: fc2644ae71a87ea81979f66022b98ec49c692a66 Parent: 7c7672b3c0916b3cee8aec90f90275a1320acc70 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Fri Nov 9 15:56:57 2012 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Fri Nov 9 15:56:57 2012 +0100 pvscan: exit --cache immediately if locking_type=3 || use_lvmetad=0 --- WHATS_NEW | 1 + tools/pvscan.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index a3f8142..fd38a34 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.99 - =================================== + Exit pvscan --cache immediately if cluster locking used or lvmetad not used. Don't use lvmetad in lvm2-monitor.service ExecStop to avoid a systemd issue. Remove dependency on fedora-storage-init.service in lvm2 systemd units. Depend on lvm2-lvmetad.socket in lvm2-monitor.service systemd unit. diff --git a/tools/pvscan.c b/tools/pvscan.c index 3d5ddef..34ab792 100644 --- a/tools/pvscan.c +++ b/tools/pvscan.c @@ -119,6 +119,21 @@ static int _pvscan_lvmetad(struct cmd_context *cmd, int argc, char **argv) char *buf; activation_handler handler = NULL; + /* + * Return here immediately if lvmetad is not used. + * Also return if locking_type=3 (clustered) as we + * dont't support cluster + lvmetad yet. + * + * This is to avoid taking the global lock uselessly + * and to prevent hangs in clustered environment. + */ + /* TODO: Remove this once lvmetad + cluster supported! */ + if (find_config_tree_int(cmd, "global/locking_type", 1) == 3 || + !find_config_tree_int(cmd, "global/use_lvmetad", 0)) { + log_debug("_pvscan_lvmetad: immediate return"); + return ret; + } + if (arg_count(cmd, activate_ARG)) { if (arg_uint_value(cmd, activate_ARG, CHANGE_AAY) != CHANGE_AAY) { log_error("Only --activate ay allowed with pvscan.");

1 0

master - systemd: remove quotes in lvm2-monitor.service ExecStop
by Peter Rajnoha 02 Nov '12

02 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7c7672b3c0916b3c… Commit: 7c7672b3c0916b3cee8aec90f90275a1320acc70 Parent: aa07de5a50175a2cee3f8662a23544d43feaf128 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Fri Nov 2 20:32:28 2012 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Fri Nov 2 20:32:28 2012 +0100 systemd: remove quotes in lvm2-monitor.service ExecStop --- scripts/lvm2_monitoring_systemd_red_hat.service.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in index 3cb998b..670d0c4 100644 --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in @@ -12,7 +12,7 @@ Type=oneshot Environment=LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1 ExecStart=@sbindir@/lvm vgchange --monitor y # The lvmetad must be disabled here, it needs https://bugzilla.redhat.com/show_bug.cgi?id=843587 to be resolved first. -ExecStop="@sbindir@/lvm vgchange --monitor n --config 'global{use_lvmetad=0}'" +ExecStop=@sbindir@/lvm vgchange --monitor n --config 'global{use_lvmetad=0}' RemainAfterExit=yes [Install]

1 0

master - systemd: do not remove lvm2-activation.service
by Peter Rajnoha 01 Nov '12

01 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=aa07de5a50175a2c… Commit: aa07de5a50175a2cee3f8662a23544d43feaf128 Parent: 360c569ce8f0bfe936d59ca91de2716958550524 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Thu Nov 1 13:33:49 2012 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Thu Nov 1 13:33:49 2012 +0100 systemd: do not remove lvm2-activation.service Fix previous commit 360c569ce8f0bfe936d59ca91de2716958550524. Remove only fedora-storage-init/fedora-storage-init-late.service, but not lvm2-activation.service. fedora-storage-init.service fedora-storage-init-late.service --- scripts/lvm2_monitoring_systemd_red_hat.service.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in index e6b4814..3cb998b 100644 --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in @@ -2,7 +2,7 @@ Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8) Requires=dm-event.socket lvm2-lvmetad.socket -After=dm-event.socket lvm2-lvmetad.socket lvm2-lvmetad.service +After=dm-event.socket lvm2-lvmetad.socket lvm2-activation.service lvm2-lvmetad.service Before=local-fs.target DefaultDependencies=no Conflicts=shutdown.target

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits November 2012