master - man: lvmcache update
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=38770db19b3c77e83e4...
Commit: 38770db19b3c77e83e4e451f12ba3cd134c09f05
Parent: 2f02e8d33ae908b1db523fac1690a4c9246daee2
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Nov 6 16:14:59 2018 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Thu Nov 8 15:48:36 2018 -0600
man: lvmcache update
for cache changes including writecache
---
man/lvmcache.7_main | 519 +++++++++++++++++++++++----------------------------
1 files changed, 230 insertions(+), 289 deletions(-)
diff --git a/man/lvmcache.7_main b/man/lvmcache.7_main
index 6672ad3..1e2acf4 100644
--- a/man/lvmcache.7_main
+++ b/man/lvmcache.7_main
@@ -4,423 +4,364 @@ lvmcache \(em LVM caching
.SH DESCRIPTION
-An \fBlvm\fP(8) \fBcache\fP Logical Volume (LV) uses a small and
-fast LV to improve the performance of a large and slow LV. It does this
-by storing the frequently used blocks on the faster LV.
-LVM refers to the small fast LV as a \fBcache pool LV\fP. The large
-slow LV is called the \fBorigin LV\fP. Due to requirements from dm-cache
-(the kernel driver), LVM further splits the cache pool LV into two
-devices - the \fBcache data LV\fP and \fBcache metadata LV\fP. The cache
-data LV is where copies of data blocks are kept from the
-origin LV to increase speed. The cache metadata LV holds the
-accounting information that specifies where data blocks are stored (e.g.
-on the origin LV or on the cache data LV). Users should be familiar with
-these LVs if they wish to create the best and most robust cached
-LVs. All of these associated LVs must be in the same Volume
-Group (VG).
-
-.SH Cache Terms
-.nf
-origin LV OriginLV large slow LV
-cache data LV CacheDataLV small fast LV for cache pool data
-cache metadata LV CacheMetaLV small fast LV for cache pool metadata
-cache pool LV CachePoolLV CacheDataLV + CacheMetaLV
-cache LV CacheLV OriginLV + CachePoolLV
-.fi
+\fBlvm\fP(8) includes two kinds of caching that can be used to improve the
+performance of a Logical Volume (LV). Typically, a smaller, faster device
+is used to improve i/o performance of a larger, slower LV. To do this, a
+separate LV is created from the faster device, and then the original LV is
+converted to start using the fast LV.
-.SH Cache Usage
+The two kinds of caching are:
-The primary method for using a cache type LV:
+.IP \[bu] 2
+A read and write hot-spot cache, using the dm-cache kernel module. This
+cache is slow moving, and adjusts the cache content over time so that the
+most used parts of the LV are kept on the faster device. Both reads and
+writes use the cache. LVM refers to this using the LV type \fBcache\fP.
+.IP \[bu] 2
+A streaming write cache, using the dm-writecache kernel module. This
+cache is intended to be used with SSD or PMEM devices to speed up all
+writes to an LV. Reads do not use this cache. LVM refers to this using
+the LV type \fBwritecache\fP.
-.SS 0. create OriginLV
+.SH USAGE
-Create an LV or identify an existing LV to be the origin LV.
+Both kinds of caching use similar lvm commands:
-.B lvcreate -n OriginLV -L LargeSize VG SlowPVs
+.B 1. Identify main LV that needs caching
-.I Example
-.br
-# lvcreate -n lvol0 -L 100G vg /dev/slow
+A main LV exists on slower devices.
+.nf
+ $ lvcreate -n main -L Size vg /dev/slow
+.fi
-.SS 1. create CacheDataLV
+.B 2. Identify fast LV to use as the cache
-Create the cache data LV. This LV will hold data blocks from the
-OriginLV. The size of this LV is the size of the cache and will be
-reported as the size of the cache pool LV.
+A fast LV exists on faster devices. This LV will be used to hold the
+cache.
-.B lvcreate -n CacheDataLV -L CacheSize VG FastPVs
+.nf
+ $ lvcreate -n fast -L Size vg /dev/fast
-.I Example
-.br
-# lvcreate -n cache0 -L 10G vg /dev/fast
+ $ lvs vg -o+devices
+ LV VG Attr LSize Devices
+ fast vg -wi------- xx.00m /dev/fast(0)
+ main vg -wi------- yyy.00m /dev/slow(0)
+.fi
+.B 3. Start caching the main LV
-.SS 2. create CacheMetaLV
+To start caching the main LV using the fast LV, convert the main LV to the
+desired caching type, and specify the fast LV to use:
-Create the cache metadata LV. This LV will hold cache pool metadata. The
-size of this LV should be 1000 times smaller than the cache data LV, with
-a minimum size of 8MiB.
+.nf
+using dm-cache:
-.B lvcreate -n CacheMetaLV -L MetaSize VG FastPVs
+ $ lvconvert --type cache --cachepool fast vg/main
-.I Example
-.br
-# lvcreate -n cache0meta -L 12M vg /dev/fast
+or dm-writecache:
-.nf
-# lvs -a vg
- LV VG Attr LSize Pool Origin
- cache0 vg -wi-a----- 10.00g
- cache0meta vg -wi-a----- 12.00m
- lvol0 vg -wi-a----- 100.00g
+ $ lvconvert --type writecache --cachepool fast vg/main
.fi
+.B 4. Display LVs
-.SS 3. create CachePoolLV
+Once the fast LV has been attached to the main LV, lvm reports the main LV
+type as either \fBcache\fP or \fBwritecache\fP depending on the type used.
+While attached, the fast LV is hidden, and only displayed when lvs is
+given -a. The _corig or _wcorig LV represents the original LV without the
+cache.
-Combine the data and metadata LVs into a cache pool LV.
-The behavior of the cache pool LV can be set in this step.
-.br
-CachePoolLV takes the name of CacheDataLV.
-.br
-CacheDataLV is renamed CachePoolLV_cdata and becomes hidden.
-.br
-CacheMetaLV is renamed CachePoolLV_cmeta and becomes hidden.
+.nf
+using dm-cache:
-.B lvconvert --type cache-pool --poolmetadata VG/CacheMetaLV
-.RS
-.B VG/CacheDataLV
-.RE
+ $ lvs -a -o name,vgname,lvattr,origin,segtype,devices vg
+ LV VG Attr Origin Type Devices
+ [fast] vg Cwi-aoC--- linear /dev/fast(xx)
+ main vg Cwi-a-C--- [main_corig] cache main_corig(0)
+ [main_corig] vg owi-aoC--- linear /dev/slow(0)
-.I Example
-.br
-# lvconvert --type cache-pool --poolmetadata vg/cache0meta vg/cache0
+or dm-writecache:
-.nf
-# lvs -a vg
- LV VG Attr LSize Pool Origin
- cache0 vg Cwi---C--- 10.00g
- [cache0_cdata] vg Cwi------- 10.00g
- [cache0_cmeta] vg ewi------- 12.00m
- lvol0 vg -wi-a----- 100.00g
+ $ lvs -a -o name,vgname,lvattr,origin,segtype,devices vg
+ LV VG Attr Origin Type Devices
+ [fast] vg -wi-ao---- linear /dev/fast(xx)
+ main vg Cwi-a----- [main_wcorig] writecache main_wcorig(0)
+ [main_wcorig] vg -wi-ao---- linear /dev/slow(0)
.fi
+.B 5. Use the main LV
-.SS 4. create CacheLV
+Use the LV until the cache is no longer wanted, or needs to be changed.
-Create a cache LV by linking the cache pool LV to the origin LV.
-The user accessible cache LV takes the name of the origin LV,
-while the origin LV becomes a hidden LV with the name
-OriginLV_corig. This can be done while the origin LV is in use.
-.br
-CacheLV takes the name of OriginLV.
-.br
-OriginLV is renamed OriginLV_corig and becomes hidden.
+.B 6. Stop caching
-.B lvconvert --type cache --cachepool VG/CachePoolLV VG/OriginLV
-
-.I Example
-.br
-# lvconvert --type cache --cachepool vg/cache0 vg/lvol0
+To stop caching the main LV, separate the fast LV from the main LV. This
+changes the type of the main LV back to what it was before the cache was
+attached.
.nf
-# lvs -a vg
- LV VG Attr LSize Pool Origin
- cache0 vg Cwi---C--- 10.00g
- [cache0_cdata] vg Cwi-ao---- 10.00g
- [cache0_cmeta] vg ewi-ao---- 12.00m
- lvol0 vg Cwi-a-C--- 100.00g cache0 [lvol0_corig]
- [lvol0_corig] vg -wi-ao---- 100.00g
+ $ lvconvert --splitcache vg/main
.fi
-.SH Cache Removal
-
-.SS Split a cache pool LV off of a cache LV
+.SH OPTIONS
\&
-A cache pool LV can be disconnected from a cache LV, leaving an
-unused cache pool LV, and an uncached origin LV. This command
-writes back data from the cache pool to the origin LV when necessary.
-
-.B lvconvert --splitcache VG/CacheLV
-
-.SS Removing a cache pool LV without removing its linked origin LV
+.SS dm-writecache block size
\&
-This writes back data from the cache pool to the origin LV when necessary,
-then removes the cache pool LV, leaving the uncached origin LV.
-
-.B lvremove VG/CachePoolLV
+The dm-writecache block size can be 4096 bytes (the default), or 512
+bytes. The default 4096 has better performance and should be used except
+when 512 is necessary for compatibility. The dm-writecache block size is
+specified with --writecacheblocksize 4096b|512b when caching is started.
-An alternative command that also disconnects the cache pool from the cache
-LV, and deletes the cache pool:
+When a file system like xfs already exists on the main LV prior to
+caching, and the file system is using a block size of 512, then the
+writecache block size should be set to 512. (The file system will likely
+fail to mount if writecache block size of 4096 is used in this case.)
-.B lvconvert --uncache VG/CacheLV
+Check the xfs sector size while the fs is mounted:
-.I Example
.nf
-# lvs vg
- LV VG Attr LSize Pool Origin
- cache0 vg Cwi---C--- 10.00g
- lvol0 vg Cwi-a-C--- 100.00g cache0 [lvol0_corig]
+$ xfs_info /dev/vg/main
+Look for sectsz=512 or sectsz=4096
+.fi
-# lvremove vg/cache0
+The writecache block size should be chosen to match the xfs sectsz value.
-# lvs vg
- LV VG Attr LSize Pool Origin
- lvol0 vg -wi-a----- 100.00g
-.fi
+It is also possible to specify a sector size of 4096 to mkfs.xfs when
+creating the file system. In this case the writecache block size of 4096
+can be used.
-.SS Removing a cache LV: both origin LV and the cache pool LV
+.SS dm-writecache settings
\&
-Removing a cache LV removes both the origin LV and the linked cache pool
-LV.
+Tunable parameters can be passed to the dm-writecache kernel module using
+the --cachesettings option when caching is started, e.g.
-.B lvremove VG/CacheLV
+.nf
+$ lvconvert --type writecache --cachepool fast \\
+ --cachesettings 'high_watermark=N writeback_jobs=N' vg/main
+.fi
+Tunable options are:
-.SH Cache Topics
+.IP \[bu] 2
+high_watermark = <count>
-.SS Tolerate device failures in a cache pool LV
+Start writeback when the number of used blocks reach this watermark
-\&
+.IP \[bu] 2
+low_watermark = <count>
-Users who are concerned about the possibility of failures in their fast
-devices that could lead to data loss might consider making their cache
-pool sub-LVs redundant.
+Stop writeback when the number of used blocks drops below this watermark
-.I Example
-.nf
-0. Create an origin LV we wish to cache
-# lvcreate -L 10G -n lv1 vg /dev/slow
+.IP \[bu] 2
+writeback_jobs = <count>
-1. Create a 2-way RAID1 cache data LV
-# lvcreate --type raid1 -m 1 -L 1G -n cache1 vg \\
- /dev/fast1 /dev/fast2
+Limit the number of blocks that are in flight during writeback. Setting
+this value reduces writeback throughput, but it may improve latency of
+read requests.
-2. Create a 2-way RAID1 cache metadata LV
-# lvcreate --type raid1 -m 1 -L 8M -n cache1meta vg \\
- /dev/fast1 /dev/fast2
+.IP \[bu] 2
+autocommit_blocks = <count>
-3. Create a cache pool LV combining cache data LV and cache metadata LV
-# lvconvert --type cache-pool --poolmetadata vg/cache1meta vg/cache1
+When the application writes this amount of blocks without issuing the
+FLUSH request, the blocks are automatically commited.
-4. Create a cached LV by combining the cache pool LV and origin LV
-# lvconvert --type cache --cachepool vg/cache1 vg/lv1
-.fi
+.IP \[bu] 2
+autocommit_time = <milliseconds>
-.SS Cache mode
+The data is automatically commited if this time passes and no FLUSH
+request is received.
-\&
+.IP \[bu] 2
+fua = 0|1
-The default cache mode is "writethrough". Writethrough ensures that any
-data written will be stored both in the cache pool LV and on the origin
-LV. The loss of a device associated with the cache pool LV in this case
-would not mean the loss of any data.
+Use the FUA flag when writing data from persistent memory back to the
+underlying device.
+Applicable only to persistent memory.
-A second cache mode is "writeback". Writeback delays writing data blocks
-from the cache pool back to the origin LV. This mode will increase
-performance, but the loss of a device associated with the cache pool LV
-can result in lost data.
-
-With the --cachemode option, the cache mode can be set when creating a
-cache LV, or changed on an existing cache LV. The current cache mode of a
-cache LV can be displayed with the cache_mode reporting option:
+.IP \[bu] 2
+nofua = 0|1
-.B lvs -o+cache_mode VG/CacheLV
+Don't use the FUA flag when writing back data and send the FLUSH request
+afterwards. Some underlying devices perform better with fua, some with
+nofua. Testing is necessary to determine which.
+Applicable only to persistent memory.
-.BR lvm.conf (5)
-.B allocation/cache_mode
-.br
-defines the default cache mode.
-.I Example
-.nf
-0. Create an origin LV we wish to cache (yours may already exist)
-# lvcreate -L 10G -n lv1 vg /dev/slow
+.SS dm-cache with separate data and metadata LVs
-1. Create a cache data LV
-# lvcreate -L 1G -n cache1 vg /dev/fast
+\&
-2. Create a cache metadata LV
-# lvcreate -L 8M -n cache1meta vg /dev/fast
+When using dm-cache, the cache metadata and cache data can be stored on
+separate LVs. To do this, a "cache-pool LV" is created, which is a
+special LV that references two sub LVs, one for data and one for metadata.
-3. Create a cache pool LV
-# lvconvert --type cache-pool --poolmetadata vg/cache1meta vg/cache1
+To create a cache-pool LV from two separate LVs:
-4. Create a cache LV by combining the cache pool LV and origin LV,
- and use the writethrough cache mode.
-# lvconvert --type cache --cachepool vg/cache1 \\
- --cachemode writethrough vg/lv1
+.nf
+$ lvcreate -n fastpool -L DataSize vg /dev/fast1
+$ lvcreate -n fastpoolmeta -L MetadataSize vg /dev/fast2
+$ lvconvert --type cache-pool --poolmetadata fastpoolmeta vg/fastpool
.fi
+Then use the cache-pool LV to start caching the main LV:
-.SS Cache policy
+.nf
+$ lvconvert --type cache --cachepool fastpool vg/main
+.fi
-\&
+A variation of the same procedure automatically creates a cache-pool when
+caching is started. To do this, use a standard LV as the --cachepool
+(this will hold cache data), and use another standard LV as the
+--poolmetadata (this will hold cache metadata). LVM will create a
+cache-pool LV from the two specified LVs, and use the cache-pool to start
+caching the main LV.
-The cache subsystem has additional per-LV parameters: the cache policy to
-use, and possibly tunable parameters for the cache policy. Three policies
-are currently available: "smq" is the default policy, "mq" is an older
-implementation, and "cleaner" is used to force the cache to write back
-(flush) all cached writes to the origin LV.
+.nf
+$ lvcreate -n fastpool -L DataSize vg /dev/fast1
+$ lvcreate -n fastpoolmeta -L MetadataSize vg /dev/fast2
+$ lvconvert --type cache --cachepool fastpool \\
+ --poolmetadata fastpoolmeta vg/main
+.fi
-The "mq" policy has a number of tunable parameters. The defaults are
-chosen to be suitable for the majority of systems, but in special
-circumstances, changing the settings can improve performance.
+.SS dm-cache cache modes
-With the --cachepolicy and --cachesettings options, the cache policy
-and settings can be set when creating a cache LV, or changed on an
-existing cache LV (both options can be used together). The current cache
-policy and settings of a cache LV can be displayed with the cache_policy
-and cache_settings reporting options:
+\&
-.B lvs -o+cache_policy,cache_settings VG/CacheLV
+The default dm-cache cache mode is "writethrough". Writethrough ensures
+that any data written will be stored both in the cache and on the origin
+LV. The loss of a device associated with the cache in this case would not
+mean the loss of any data.
-.I Example
-.nf
-Change the cache policy and settings of an existing cache LV.
-# lvchange --cachepolicy mq --cachesettings \\
- \(aqmigration_threshold=2048 random_threshold=4\(aq vg/lv1
-.fi
+A second cache mode is "writeback". Writeback delays writing data blocks
+from the cache back to the origin LV. This mode will increase
+performance, but the loss of a cache device can result in lost data.
-.BR lvm.conf (5)
-.B allocation/cache_policy
-.br
-defines the default cache policy.
+With the --cachemode option, the cache mode can be set when caching is
+started, or changed on an LV that is already cached. The current cache
+mode can be displayed with the cache_mode reporting option:
+
+.B lvs -o+cache_mode VG/LV
.BR lvm.conf (5)
-.B allocation/cache_settings
+.B allocation/cache_mode
.br
-defines the default cache settings.
+defines the default cache mode.
+.nf
+$ lvconvert --type cache --cachepool fast \\
+ --cachemode writethrough vg/main
+.nf
-.SS Chunk size
+.SS dm-cache chunk size
\&
-The size of data blocks managed by a cache pool can be specified with the
---chunksize option when the cache LV is created. The default unit
-is KiB. The value must be a multiple of 32KiB between 32KiB and 1GiB.
+The size of data blocks managed by dm-cache can be specified with the
+--chunksize option when caching is started. The default unit is KiB. The
+value must be a multiple of 32KiB between 32KiB and 1GiB.
Using a chunk size that is too large can result in wasteful use of the
-cache, where small reads and writes can cause large sections of an LV to
-be mapped into the cache. However, choosing a chunk size that is too
-small can result in more overhead trying to manage the numerous chunks
-that become mapped into the cache. Overhead can include both excessive
-CPU time searching for chunks, and excessive memory tracking chunks.
+cache, in which small reads and writes cause large sections of an LV to be
+stored in the cache. However, choosing a chunk size that is too small
+can result in more overhead trying to manage the numerous chunks that
+become mapped into the cache. Overhead can include both excessive CPU
+time searching for chunks, and excessive memory tracking chunks.
-Command to display the cache pool LV chunk size:
+Command to display the chunk size:
.br
-.B lvs -o+chunksize VG/CacheLV
+.B lvs -o+chunksize VG/LV
.BR lvm.conf (5)
.B cache_pool_chunk_size
.br
-controls the default chunk size used when creating a cache LV.
+controls the default chunk size.
The default value is shown by:
.br
.B lvmconfig --type default allocation/cache_pool_chunk_size
-.SS Spare metadata LV
-
-\&
-
-See
-.BR lvmthin (7)
-for a description of the "pool metadata spare" LV.
-The same concept is used for cache pools.
-
-.SS Automatic pool metadata LV
+.SS dm-cache cache policy
\&
-A cache data LV can be converted to cache pool LV without specifying a
-cache pool metadata LV. LVM will automatically create a metadata LV from
-the same VG.
+The dm-cache subsystem has additional per-LV parameters: the cache policy
+to use, and possibly tunable parameters for the cache policy. Three
+policies are currently available: "smq" is the default policy, "mq" is an
+older implementation, and "cleaner" is used to force the cache to write
+back (flush) all cached writes to the origin LV.
-.B lvcreate -n CacheDataLV -L CacheSize VG
-.br
-.B lvconvert --type cache-pool VG/CacheDataLV
+The older "mq" policy has a number of tunable parameters. The defaults are
+chosen to be suitable for the majority of systems, but in special
+circumstances, changing the settings can improve performance.
+With the --cachepolicy and --cachesettings options, the cache policy and
+settings can be set when caching is started, or changed on an existing
+cached LV (both options can be used together). The current cache policy
+and settings can be displayed with the cache_policy and cache_settings
+reporting options:
-.SS Create a new cache LV without an existing origin LV
+.B lvs -o+cache_policy,cache_settings VG/LV
-\&
+.nf
+Change the cache policy and settings of an existing LV.
-A cache LV can be created using an existing cache pool without an existing
-origin LV. A new origin LV is created and linked to the cache pool in a
-single step.
+$ lvchange --cachepolicy mq --cachesettings \\
+ \(aqmigration_threshold=2048 random_threshold=4\(aq vg/main
+.fi
-.B lvcreate --type cache -L LargeSize -n CacheLV
-.RS
-.B --cachepool VG/CachePoolLV VG SlowPVs
-.RE
+.BR lvm.conf (5)
+.B allocation/cache_policy
+.br
+defines the default cache policy.
+.BR lvm.conf (5)
+.B allocation/cache_settings
+.br
+defines the default cache settings.
-.SS Single step cache pool LV creation
+.SS dm-cache spare metadata LV
\&
-A cache pool LV can be created with a single lvcreate command, rather than
-using lvconvert on existing LVs. This one command creates a cache data
-LV, a cache metadata LV, and combines the two into a cache pool LV.
-
-.B lvcreate --type cache-pool -L CacheSize -n CachePoolLV VG FastPVs
-
+See
+.BR lvmthin (7)
+for a description of the "pool metadata spare" LV.
+The same concept is used for cache pools.
-.SS Convert existing LVs to cache types
+.SS dm-cache metadata formats
\&
-When an existing origin LV is converted to a cache LV, the specified cache
-pool may be a normal LV, rather than a cache pool LV. In this case, lvm
-will first convert the normal LV to a cache pool LV. A pool metadata LV
-may optionally be specified.
-
-.B lvcreate -n OriginLV -L LargeSize VG
-.br
-.B lvcreate -n CacheDataLV -L CacheSize VG
-.br
-.B lvconvert --type cache --cachepool VG/CataDataLV VG/OriginLV
+There are two disk formats for dm-cache metadata. The metadata format can
+be specified with --cachemetadataformat when caching is started, and
+cannot be changed. Format \fB2\fP has better performance; it is more
+compact, and stores dirty bits in a separate btree, which improves the
+speed of shutting down the cache. With \fBauto\fP, lvm selects the best
+option provided by the current dm-cache kernel module.
-This is equivalent to:
-
-.B lvcreate -n OriginLV -L LargeSize VG
-.br
-.B lvcreate -n CacheDataLV -L CacheSize VG
-.br
-.B lvconvert --type cache-pool VG/CacheDataLV
-.br
-.B lvconvert --type cache --cachepool VG/CachePoolLV VG/OriginLV
-
-
-.SS Cache metadata formats
+.SS mirrored cache device
\&
-There are two disk formats for cache metadata. The metadata format can be
-specified when a cache pool is created, and cannot be changed.
-Format \fB2\fP has better performance; it is more compact, and stores
-dirty bits in a separate btree, which improves the speed of shutting down
-the cache.
-With \fBauto\fP, lvm selects the best option provided by the current
-dm-cache kernel target.
-
-.B lvconvert --type cache-pool --cachemetadataformat auto|1|2
-.RS
-.B VG/CacheDataLV
-.RE
+The fast LV holding the cache can be created as a raid1 mirror so that it
+can tolerate a device failure. (When using dm-cache with separate data
+and metadata LVs, each of the sub-LVs can use raid1.)
+.nf
+$ lvcreate -n main -L Size vg /dev/slow
+$ lvcreate --type raid1 -m 1 -n fast -L Size vg /dev/fast1 /dev/fast2
+$ lvconvert --type cache --cachepool fast vg/main
+.fi
.SH SEE ALSO
.BR lvm.conf (5),
5 years, 5 months
master - tests: specify m1 for raid1 in cache-single-types
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2f02e8d33ae908b1db5...
Commit: 2f02e8d33ae908b1db523fac1690a4c9246daee2
Parent: 73132bc25414e8eb0a0c85708478b4dd797ce746
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Nov 8 14:08:41 2018 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Thu Nov 8 14:12:42 2018 -0600
tests: specify m1 for raid1 in cache-single-types
---
test/shell/cache-single-types.sh | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/test/shell/cache-single-types.sh b/test/shell/cache-single-types.sh
index 1804e85..e7c58e2 100644
--- a/test/shell/cache-single-types.sh
+++ b/test/shell/cache-single-types.sh
@@ -30,14 +30,12 @@ aux prepare_devs 4 64
vgcreate $SHARED $vg "$dev1" "$dev2" "$dev3" "$dev4"
-lvcreate --type raid1 -n $lv1 -l 8 -an $vg "$dev1" "$dev2"
+lvcreate --type raid1 -m 1 -n $lv1 -l 8 $vg "$dev1" "$dev2"
-lvcreate --type raid1 -n $lv2 -l 4 -an $vg "$dev3" "$dev4"
+lvcreate --type raid1 -m 1 -n $lv2 -l 4 $vg "$dev3" "$dev4"
# test1: create fs on LV before cache is attached
-lvchange -ay $vg/$lv1
-
mkfs.xfs -f -s size=4096 "$DM_DEV_DIR/$vg/$lv1"
mount "$DM_DEV_DIR/$vg/$lv1" "$mount_dir"
5 years, 5 months
master - tests: futher test tunning
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=73132bc25414e8eb0a0...
Commit: 73132bc25414e8eb0a0c85708478b4dd797ce746
Parent: 025332edc2c608e5892af373ebb764ac8ec5d8be
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Nov 8 17:19:39 2018 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Nov 8 17:19:39 2018 +0100
tests: futher test tunning
---
test/shell/cache-single-options.sh | 2 +-
test/shell/cache-single-thin.sh | 1 +
test/shell/cache-single-types.sh | 1 +
3 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/test/shell/cache-single-options.sh b/test/shell/cache-single-options.sh
index d9e7e01..d33bc2e 100644
--- a/test/shell/cache-single-options.sh
+++ b/test/shell/cache-single-options.sh
@@ -16,7 +16,7 @@ SKIP_WITH_LVMPOLLD=1
. lib/inittest
-aux have_cache 1 3 0 || skip
+aux have_cache 1 10 0 || skip
which mkfs.xfs || skip
mount_dir="mnt"
diff --git a/test/shell/cache-single-thin.sh b/test/shell/cache-single-thin.sh
index 0a94326..33097ca 100644
--- a/test/shell/cache-single-thin.sh
+++ b/test/shell/cache-single-thin.sh
@@ -17,6 +17,7 @@ SKIP_WITH_LVMPOLLD=1
. lib/inittest
aux have_cache 1 3 0 || skip
+aux have_thin 1 0 0 || skip
aux prepare_devs 5 80
diff --git a/test/shell/cache-single-types.sh b/test/shell/cache-single-types.sh
index d3bd5eb..1804e85 100644
--- a/test/shell/cache-single-types.sh
+++ b/test/shell/cache-single-types.sh
@@ -17,6 +17,7 @@ SKIP_WITH_LVMPOLLD=1
. lib/inittest
aux have_cache 1 3 0 || skip
+aux have_raid 1 3 5 || skip
which mkfs.xfs || skip
mount_dir="mnt"
5 years, 5 months
master - tests: add lvchange cachemode passthrough in cache-single-options
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=025332edc2c608e5892...
Commit: 025332edc2c608e5892af373ebb764ac8ec5d8be
Parent: 8794fb71dbc3db8bebf133e6048bcd6ffdad7568
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Nov 8 10:08:38 2018 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Thu Nov 8 10:08:38 2018 -0600
tests: add lvchange cachemode passthrough in cache-single-options
---
test/shell/cache-single-options.sh | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/test/shell/cache-single-options.sh b/test/shell/cache-single-options.sh
index 62cfeaf..d9e7e01 100644
--- a/test/shell/cache-single-options.sh
+++ b/test/shell/cache-single-options.sh
@@ -236,6 +236,10 @@ lvchange --cachemode writethrough $vg/$lv1
check lv_field $vg/$lv1 cachemode "writethrough"
+lvchange --cachemode passthrough $vg/$lv1
+
+check lv_field $vg/$lv1 cachemode "passthrough"
+
lvchange -an $vg/$lv1
lvchange --cachepolicy mq --cachesettings 'migration_threshold=100' $vg/$lv1
5 years, 5 months
master - tests: enable cachepolicy cleaner in cache-single-options
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8794fb71dbc3db8bebf...
Commit: 8794fb71dbc3db8bebf133e6048bcd6ffdad7568
Parent: e1e33e75e7e1c1907017aa151be7253f63075f34
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Nov 8 09:43:23 2018 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Thu Nov 8 09:43:23 2018 -0600
tests: enable cachepolicy cleaner in cache-single-options
---
test/shell/cache-single-options.sh | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/test/shell/cache-single-options.sh b/test/shell/cache-single-options.sh
index 00c1b1d..62cfeaf 100644
--- a/test/shell/cache-single-options.sh
+++ b/test/shell/cache-single-options.sh
@@ -186,11 +186,10 @@ check lv_field $vg/$lv1 cachepolicy "smq"
mkfs_mount_umount $lv1
-# FIXME: lvchange_cachepolicy sets wrong lv
-#lvchange --cachepolicy cleaner $vg/$lv1
-#lvchange -ay $vg/$lv1
-#check lv_field $vg/$lv1 cachepolicy "cleaner"
-#lvchange -an $vg/$lv1
+lvchange --cachepolicy cleaner $vg/$lv1
+lvchange -ay $vg/$lv1
+check lv_field $vg/$lv1 cachepolicy "cleaner"
+lvchange -an $vg/$lv1
lvconvert --splitcache $vg/$lv1
check lv_field $vg/$lv1 segtype linear
5 years, 5 months
master - tests: enable writeback in cache-single-options
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e1e33e75e7e1c190701...
Commit: e1e33e75e7e1c1907017aa151be7253f63075f34
Parent: 8c5fbd5fac7de820f7b4106a070b993a1565c112
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Nov 8 09:40:41 2018 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Thu Nov 8 09:40:41 2018 -0600
tests: enable writeback in cache-single-options
---
test/shell/cache-single-options.sh | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/test/shell/cache-single-options.sh b/test/shell/cache-single-options.sh
index 4eb4d1c..00c1b1d 100644
--- a/test/shell/cache-single-options.sh
+++ b/test/shell/cache-single-options.sh
@@ -164,16 +164,16 @@ mount_umount $lv1
#mount_umount $lv1
-#lvconvert -y --type cache --cachepool $lv2 --cachemode writeback $vg/$lv1
+lvconvert -y --type cache --cachepool $lv2 --cachemode writeback $vg/$lv1
-#check lv_field $vg/$lv1 cachemode "writeback"
+check lv_field $vg/$lv1 cachemode "writeback"
-#mkfs_mount_umount $lv1
+mkfs_mount_umount $lv1
-#lvconvert --splitcache $vg/$lv1
-#check lv_field $vg/$lv1 segtype linear
-#check lv_field $vg/$lv2 segtype linear
-#mount_umount $lv1
+lvconvert --splitcache $vg/$lv1
+check lv_field $vg/$lv1 segtype linear
+check lv_field $vg/$lv2 segtype linear
+mount_umount $lv1
#
5 years, 5 months
master - tests: fix dd option in cache-single-options
by David Teigland
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8c5fbd5fac7de820f7b...
Commit: 8c5fbd5fac7de820f7b4106a070b993a1565c112
Parent: d4de3cfa4dd16512ac68f637ed7f484b7461edb9
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Nov 8 09:33:09 2018 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Thu Nov 8 09:33:09 2018 -0600
tests: fix dd option in cache-single-options
---
test/shell/cache-single-options.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/test/shell/cache-single-options.sh b/test/shell/cache-single-options.sh
index 38d5a4a..4eb4d1c 100644
--- a/test/shell/cache-single-options.sh
+++ b/test/shell/cache-single-options.sh
@@ -58,7 +58,7 @@ mount_umount()
mount "$DM_DEV_DIR/$vg/$lvt" "$mount_dir"
diff pattern1 "$mount_dir/pattern1"
- dd if="$mount_dir/zeros2M" of=/dev/null bs=1M count=2 conv=fdatasync
+ dd if="$mount_dir/zeros2M" of=/dev/null bs=1M count=2
umount "$mount_dir"
lvchange -an $vg/$lvt
5 years, 5 months
master - tests: updates
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d4de3cfa4dd16512ac6...
Commit: d4de3cfa4dd16512ac68f637ed7f484b7461edb9
Parent: f86f01a3a15115d0ad808a14a1ca5665451cce1a
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Nov 8 10:21:13 2018 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Nov 8 12:22:18 2018 +0100
tests: updates
---
test/shell/cache-single-options.sh | 27 +++++++++---------
test/shell/cache-single-thin.sh | 4 ++-
test/shell/cache-single-types.sh | 37 +++++++++++++------------
test/shell/cache-single-usage.sh | 53 ++++++++++++++++++-----------------
test/shell/writecache.sh | 8 +++--
5 files changed, 68 insertions(+), 61 deletions(-)
diff --git a/test/shell/cache-single-options.sh b/test/shell/cache-single-options.sh
index f8dde12..38d5a4a 100644
--- a/test/shell/cache-single-options.sh
+++ b/test/shell/cache-single-options.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (C) 2017 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2018 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
@@ -16,12 +16,14 @@ SKIP_WITH_LVMPOLLD=1
. lib/inittest
+aux have_cache 1 3 0 || skip
+which mkfs.xfs || skip
+
mount_dir="mnt"
-mkdir -p $mount_dir
+mkdir -p "$mount_dir"
# generate random data
-dmesg > pattern1
-ps aux >> pattern1
+dd if=/dev/urandom of=pattern1 bs=512K count=1
aux prepare_devs 5 64
@@ -40,10 +42,10 @@ mkfs_mount_umount()
lvchange -ay $vg/$lvt
mkfs.xfs -f -s size=4096 "$DM_DEV_DIR/$vg/$lvt"
- mount "$DM_DEV_DIR/$vg/$lvt" $mount_dir
- cp pattern1 $mount_dir/pattern1
- dd if=/dev/zero of=$mount_dir/zeros2M bs=1M count=2 oflag=sync
- umount $mount_dir
+ mount "$DM_DEV_DIR/$vg/$lvt" "$mount_dir"
+ cp pattern1 "$mount_dir/pattern1"
+ dd if=/dev/zero of="$mount_dir/zeros2M" bs=1M count=2 conv=fdatasync
+ umount "$mount_dir"
lvchange -an $vg/$lvt
}
@@ -54,10 +56,10 @@ mount_umount()
lvchange -ay $vg/$lvt
- mount "$DM_DEV_DIR/$vg/$lvt" $mount_dir
- diff pattern1 $mount_dir/pattern1
- dd if=$mount_dir/zeros2M of=/dev/null bs=1M count=2
- umount $mount_dir
+ mount "$DM_DEV_DIR/$vg/$lvt" "$mount_dir"
+ diff pattern1 "$mount_dir/pattern1"
+ dd if="$mount_dir/zeros2M" of=/dev/null bs=1M count=2 conv=fdatasync
+ umount "$mount_dir"
lvchange -an $vg/$lvt
}
@@ -266,4 +268,3 @@ check lv_field $vg/$lv3 segtype cache-pool
vgremove -ff $vg
-
diff --git a/test/shell/cache-single-thin.sh b/test/shell/cache-single-thin.sh
index 25c232f..0a94326 100644
--- a/test/shell/cache-single-thin.sh
+++ b/test/shell/cache-single-thin.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (C) 2017 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2018 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
@@ -16,6 +16,8 @@ SKIP_WITH_LVMPOLLD=1
. lib/inittest
+aux have_cache 1 3 0 || skip
+
aux prepare_devs 5 80
vgcreate $SHARED $vg "$dev1" "$dev2" "$dev3" "$dev4" "$dev5"
diff --git a/test/shell/cache-single-types.sh b/test/shell/cache-single-types.sh
index 472970a..d3bd5eb 100644
--- a/test/shell/cache-single-types.sh
+++ b/test/shell/cache-single-types.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (C) 2017 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2018 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
@@ -16,12 +16,14 @@ SKIP_WITH_LVMPOLLD=1
. lib/inittest
+aux have_cache 1 3 0 || skip
+which mkfs.xfs || skip
+
mount_dir="mnt"
-mkdir -p $mount_dir
+mkdir -p "$mount_dir"
# generate random data
-dmesg > pattern1
-ps aux >> pattern1
+dd if=/dev/urandom of=pattern1 bs=512K count=1
aux prepare_devs 4 64
@@ -37,11 +39,11 @@ lvchange -ay $vg/$lv1
mkfs.xfs -f -s size=4096 "$DM_DEV_DIR/$vg/$lv1"
-mount "$DM_DEV_DIR/$vg/$lv1" $mount_dir
+mount "$DM_DEV_DIR/$vg/$lv1" "$mount_dir"
-cp pattern1 $mount_dir/pattern1
+cp pattern1 "$mount_dir/pattern1"
-umount $mount_dir
+umount "$mount_dir"
lvchange -an $vg/$lv1
lvconvert -y --type cache --cachepool $lv2 $vg/$lv1
@@ -53,15 +55,15 @@ grep raid1 out
lvchange -ay $vg/$lv1
-mount "$DM_DEV_DIR/$vg/$lv1" $mount_dir
+mount "$DM_DEV_DIR/$vg/$lv1" "$mount_dir"
-diff pattern1 $mount_dir/pattern1
+diff pattern1 "$mount_dir/pattern1"
-cp pattern1 $mount_dir/pattern1b
+cp pattern1 "$mount_dir/pattern1b"
-ls -l $mount_dir
+ls -l "$mount_dir"
-umount $mount_dir
+umount "$mount_dir"
lvchange -an $vg/$lv1
@@ -73,16 +75,15 @@ check lv_field $vg/$lv2 segtype raid1
lvchange -ay $vg/$lv1
lvchange -ay $vg/$lv2
-mount "$DM_DEV_DIR/$vg/$lv1" $mount_dir
+mount "$DM_DEV_DIR/$vg/$lv1" "$mount_dir"
-ls -l $mount_dir
+ls -l "$mount_dir"
-diff pattern1 $mount_dir/pattern1
-diff pattern1 $mount_dir/pattern1b
+diff pattern1 "$mount_dir/pattern1"
+diff pattern1 "$mount_dir/pattern1b"
-umount $mount_dir
+umount "$mount_dir"
lvchange -an $vg/$lv1
lvchange -an $vg/$lv2
vgremove -ff $vg
-
diff --git a/test/shell/cache-single-usage.sh b/test/shell/cache-single-usage.sh
index 9636932..63be718 100644
--- a/test/shell/cache-single-usage.sh
+++ b/test/shell/cache-single-usage.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (C) 2017 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2018 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
@@ -16,12 +16,14 @@ SKIP_WITH_LVMPOLLD=1
. lib/inittest
+aux have_cache 1 3 0 || skip
+which mkfs.xfs || skip
+
mount_dir="mnt"
-mkdir -p $mount_dir
+mkdir -p "$mount_dir"
# generate random data
-dmesg > pattern1
-ps aux >> pattern1
+dd if=/dev/urandom of=pattern1 bs=512K count=1
aux prepare_devs 2 64
@@ -39,11 +41,11 @@ lvchange -ay $vg/$lv1
mkfs.xfs -f -s size=4096 "$DM_DEV_DIR/$vg/$lv1"
-mount "$DM_DEV_DIR/$vg/$lv1" $mount_dir
+mount "$DM_DEV_DIR/$vg/$lv1" "$mount_dir"
-cp pattern1 $mount_dir/pattern1
+cp pattern1 "$mount_dir/pattern1"
-umount $mount_dir
+umount "$mount_dir"
lvchange -an $vg/$lv1
lvconvert -y --type cache --cachepool $lv2 $vg/$lv1
@@ -55,15 +57,15 @@ grep linear out
lvchange -ay $vg/$lv1
-mount "$DM_DEV_DIR/$vg/$lv1" $mount_dir
+mount "$DM_DEV_DIR/$vg/$lv1" "$mount_dir"
-diff pattern1 $mount_dir/pattern1
+diff pattern1 "$mount_dir/pattern1"
-cp pattern1 $mount_dir/pattern1b
+cp pattern1 "$mount_dir/pattern1b"
-ls -l $mount_dir
+ls -l "$mount_dir"
-umount $mount_dir
+umount "$mount_dir"
lvchange -an $vg/$lv1
@@ -75,14 +77,14 @@ check lv_field $vg/$lv2 segtype linear
lvchange -ay $vg/$lv1
lvchange -ay $vg/$lv2
-mount "$DM_DEV_DIR/$vg/$lv1" $mount_dir
+mount "$DM_DEV_DIR/$vg/$lv1" "$mount_dir"
-ls -l $mount_dir
+ls -l "$mount_dir"
-diff pattern1 $mount_dir/pattern1
-diff pattern1 $mount_dir/pattern1b
+diff pattern1 "$mount_dir/pattern1"
+diff pattern1 "$mount_dir/pattern1b"
-umount $mount_dir
+umount "$mount_dir"
lvchange -an $vg/$lv1
lvchange -an $vg/$lv2
@@ -99,12 +101,12 @@ lvchange -ay $vg/$lv1
mkfs.xfs -f -s size=4096 "$DM_DEV_DIR/$vg/$lv1"
-mount "$DM_DEV_DIR/$vg/$lv1" $mount_dir
+mount "$DM_DEV_DIR/$vg/$lv1" "$mount_dir"
-cp pattern1 $mount_dir/pattern1
-ls -l $mount_dir
+cp pattern1 "$mount_dir/pattern1"
+ls -l "$mount_dir"
-umount $mount_dir
+umount "$mount_dir"
lvchange -an $vg/$lv1
lvconvert --splitcache $vg/$lv1
@@ -115,15 +117,14 @@ check lv_field $vg/$lv2 segtype linear
lvchange -ay $vg/$lv1
lvchange -ay $vg/$lv2
-mount "$DM_DEV_DIR/$vg/$lv1" $mount_dir
+mount "$DM_DEV_DIR/$vg/$lv1" "$mount_dir"
-ls -l $mount_dir
+ls -l "$mount_dir"
-diff pattern1 $mount_dir/pattern1
+diff pattern1 "$mount_dir/pattern1"
-umount $mount_dir
+umount "$mount_dir"
lvchange -an $vg/$lv1
lvchange -an $vg/$lv2
vgremove -ff $vg
-
diff --git a/test/shell/writecache.sh b/test/shell/writecache.sh
index 19cc93b..ce77cfe 100644
--- a/test/shell/writecache.sh
+++ b/test/shell/writecache.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (C) 2017 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2018 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
@@ -16,12 +16,14 @@ SKIP_WITH_LVMPOLLD=1
. lib/inittest
+aux have_writecache 1 0 0 || skip
+which mkfs.xfs || skip
+
mount_dir="mnt"
mkdir -p $mount_dir
# generate random data
-dmesg > pattern1
-ps aux >> pattern1
+dd if=/dev/urandom of=pattern1 bs=512K count=1
aux prepare_devs 2 64
5 years, 5 months
master - tests: keep results configurable
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f86f01a3a15115d0ad8...
Commit: f86f01a3a15115d0ad808a14a1ca5665451cce1a
Parent: 3a557dcfbf42b9124ab17ba3dcd71b417aee9be1
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Nov 8 10:01:21 2018 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Nov 8 12:22:18 2018 +0100
tests: keep results configurable
---
test/Makefile.in | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/test/Makefile.in b/test/Makefile.in
index bb736a6..f8571b7 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -137,33 +137,33 @@ check_local: .tests-stamp
ifeq ("@BUILD_LVMPOLLD@", "yes")
check_lvmpolld: .tests-stamp
VERBOSE=$(VERBOSE) ./lib/runner \
- --testdir . --outdir results \
+ --testdir . --outdir $(LVM_TEST_RESULTS) \
--flavours ndev-lvmpolld --only $(T) --skip $(S)
check_all_lvmpolld: .tests-stamp
VERBOSE=$(VERBOSE) ./lib/runner \
- --testdir . --outdir results \
+ --testdir . --outdir $(LVM_TEST_RESULTS) \
--flavours ndev-lvmpolld --only $(T) --skip $(S)
endif
ifeq ("@BUILD_LVMLOCKD@", "yes")
check_lvmlockd_sanlock: .tests-stamp
VERBOSE=$(VERBOSE) ./lib/runner \
- --testdir . --outdir results \
+ --testdir . --outdir $(LVM_TEST_RESULTS) \
--flavours udev-lvmlockd-sanlock --only shell/aa-lvmlockd-sanlock-prepare.sh,$(T),shell/zz-lvmlockd-sanlock-remove.sh --skip $(S)
endif
ifeq ("@BUILD_LVMLOCKD@", "yes")
check_lvmlockd_dlm: .tests-stamp
VERBOSE=$(VERBOSE) ./lib/runner \
- --testdir . --outdir results \
+ --testdir . --outdir $(LVM_TEST_RESULTS) \
--flavours udev-lvmlockd-dlm --only shell/aa-lvmlockd-dlm-prepare.sh,$(T),shell/zz-lvmlockd-dlm-remove.sh --skip $(S)
endif
ifeq ("@BUILD_LVMLOCKD@", "yes")
check_lvmlockd_test: .tests-stamp
VERBOSE=$(VERBOSE) ./lib/runner \
- --testdir . --outdir results \
+ --testdir . --outdir $(LVM_TEST_RESULTS) \
--flavours udev-lvmlockd-test --only $(T) --skip $(S)
endif
5 years, 5 months
master - configure: update
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3a557dcfbf42b9124ab...
Commit: 3a557dcfbf42b9124ab17ba3dcd71b417aee9be1
Parent: 6cee8f1b063dcf5d809e14de38ba489ce5b8f562
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Nov 8 12:22:07 2018 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Thu Nov 8 12:22:07 2018 +0100
configure: update
---
configure | 27 +++++++++++++++++++++++++++
include/configure.h.in | 3 +++
2 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/configure b/configure
index d8f7384..496741f 100755
--- a/configure
+++ b/configure
@@ -915,6 +915,7 @@ with_cache_restore
enable_cache_check_needs_check
with_vdo
with_vdo_format
+with_writecache
enable_readline
enable_realtime
enable_ocf
@@ -1708,6 +1709,7 @@ Optional Packages:
cache_restore tool: [autodetect]
--with-vdo=TYPE vdo support: internal/none [internal]
--with-vdo-format=PATH vdoformat tool: [autodetect]
+ --with-writecache=TYPE writecache support: internal/none [internal]
--with-ocfdir=DIR install OCF files in
[PREFIX/lib/ocf/resource.d/lvm2]
--with-default-pid-dir=PID_DIR
@@ -9706,6 +9708,31 @@ _ACEOF
#AC_MSG_RESULT($VDO_LIB)
################################################################################
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include writecache" >&5
+$as_echo_n "checking whether to include writecache... " >&6; }
+
+# Check whether --with-writecache was given.
+if test "${with_writecache+set}" = set; then :
+ withval=$with_writecache; WRITECACHE=$withval
+else
+ WRITECACHE="none"
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WRITECACHE" >&5
+$as_echo "$WRITECACHE" >&6; }
+
+case "$WRITECACHE" in
+ none) ;;
+ internal)
+
+$as_echo "#define WRITECACHE_INTERNAL 1" >>confdefs.h
+
+ ;;
+ *) as_fn_error $? "--with-writecache parameter invalid" "$LINENO" 5 ;;
+esac
+
+################################################################################
# Check whether --enable-readline was given.
if test "${enable_readline+set}" = set; then :
enableval=$enable_readline; READLINE=$enableval
diff --git a/include/configure.h.in b/include/configure.h.in
index 3721844..19c1922 100644
--- a/include/configure.h.in
+++ b/include/configure.h.in
@@ -669,6 +669,9 @@
/* Define to 1 to include built-in support for vdo. */
#undef VDO_INTERNAL
+/* Define to 1 to include built-in support for writecache. */
+#undef WRITECACHE_INTERNAL
+
/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
<pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
#define below would cause a syntax error. */
5 years, 5 months