diff options
| author | Brian Behlendorf <[email protected]> | 2017-09-08 15:07:00 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-09-08 15:07:00 -0700 |
| commit | 5c214ae318cbca37285ec38e6a2044a7002d31e9 (patch) | |
| tree | 199f8691dbb618a53d2761c568075660d4d7e3e5 /tests/zfs-tests/include | |
| parent | e0dd0a32a8c8db725be673153b09bee0ca9adcf2 (diff) | |
Fix volume WR_INDIRECT log replay
The portion of the zvol_replay_write() handler responsible for
replaying indirect log records for some reason never existed.
As a result indirect log records were not being correctly replayed.
This went largely unnoticed since the majority of zvol log records
were of the type WR_COPIED or WR_NEED_COPY prior to OpenZFS 7578.
This patch updates zvol_replay_write() to correctly handle these
log records and adds a new test case which verifies volume replay
to prevent any regression. The existing test case which verified
replay on filesystem was renamed slog_replay_fs.ksh for clarity.
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: loli10K <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #6603
Closes #6615
Diffstat (limited to 'tests/zfs-tests/include')
| -rw-r--r-- | tests/zfs-tests/include/commands.cfg | 1 | ||||
| -rw-r--r-- | tests/zfs-tests/include/libtest.shlib | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/zfs-tests/include/commands.cfg b/tests/zfs-tests/include/commands.cfg index e5ac7ef67..d9f36dda3 100644 --- a/tests/zfs-tests/include/commands.cfg +++ b/tests/zfs-tests/include/commands.cfg @@ -36,6 +36,7 @@ export SYSTEM_FILES='arp egrep exportfs expr + fallocate false fdisk file diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib index 4395d2868..3248ceb70 100644 --- a/tests/zfs-tests/include/libtest.shlib +++ b/tests/zfs-tests/include/libtest.shlib @@ -140,7 +140,7 @@ function ismounted [[ "$1" == "$dir" || "$1" == "$name" ]] && return 0 ;; - ext2) + ext*) out=$(df -t $fstype $1 2>/dev/null) return $? ;; |