Skip to content
Permalink
Browse files

6880 zdb incorrectly reports feature count mismatch when feature is d…

…isabled

Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Prakash Surya <prakash.surya@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
  • Loading branch information...
ahrens committed Apr 20, 2016
1 parent 88a9160 commit c5d1600c3eb0a58e493be9019c5fb8eaec72cb81
@@ -3046,7 +3046,8 @@ dump_zpool(spa_t *spa)
uint64_t refcount;

if (!(spa_feature_table[f].fi_flags &
ZFEATURE_FLAG_PER_DATASET)) {
ZFEATURE_FLAG_PER_DATASET) ||
!spa_feature_is_enabled(spa, f)) {
ASSERT0(dataset_feature_count[f]);
continue;
}
@@ -404,6 +404,7 @@ file path=opt/zfs-tests/tests/functional/clean_mirror/default.cfg mode=0555
file path=opt/zfs-tests/tests/functional/clean_mirror/setup mode=0555
file path=opt/zfs-tests/tests/functional/cli_root/cli_common.kshlib mode=0555
file path=opt/zfs-tests/tests/functional/cli_root/zdb/zdb_001_neg mode=0555
file path=opt/zfs-tests/tests/functional/cli_root/zdb/zdb_002_pos mode=0555
file path=opt/zfs-tests/tests/functional/cli_root/zfs/cleanup mode=0555
file path=opt/zfs-tests/tests/functional/cli_root/zfs/setup mode=0555
file path=opt/zfs-tests/tests/functional/cli_root/zfs/zfs_001_neg mode=0555
@@ -92,7 +92,7 @@ tests = [ 'clean_mirror_001_pos', 'clean_mirror_002_pos',
'clean_mirror_003_pos', 'clean_mirror_004_pos']

[/opt/zfs-tests/tests/functional/cli_root/zdb]
tests = ['zdb_001_neg']
tests = ['zdb_001_neg', 'zdb_002_pos']
pre =
post =

@@ -92,7 +92,7 @@ tests = [ 'clean_mirror_001_pos', 'clean_mirror_002_pos',
'clean_mirror_003_pos', 'clean_mirror_004_pos']

[/opt/zfs-tests/tests/functional/cli_root/zdb]
tests = ['zdb_001_neg']
tests = ['zdb_001_neg', 'zdb_002_pos']
pre =
post =

@@ -92,7 +92,7 @@ tests = [ 'clean_mirror_001_pos', 'clean_mirror_002_pos',
'clean_mirror_003_pos', 'clean_mirror_004_pos']

[/opt/zfs-tests/tests/functional/cli_root/zdb]
tests = ['zdb_001_neg']
tests = ['zdb_001_neg', 'zdb_002_pos']
pre =
post =

@@ -10,15 +10,16 @@
#

#
# Copyright (c) 2012 by Delphix. All rights reserved.
# Copyright (c) 2015 by Delphix. All rights reserved.
#

include $(SRC)/Makefile.master

ROOTOPTPKG = $(ROOT)/opt/zfs-tests
TESTDIR = $(ROOTOPTPKG)/tests/functional/cli_root/zdb

PROGS = zdb_001_neg
PROGS = zdb_001_neg \
zdb_002_pos

CMDS = $(PROGS:%=$(TESTDIR)/%)
$(CMDS) := FILEMODE = 0555
@@ -0,0 +1,51 @@
#!/bin/ksh

#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#

#
# Copyright (c) 2015 by Delphix. All rights reserved.
#

. $STF_SUITE/include/libtest.shlib

#
# Description:
# zdb will accurately count the feature refcount for pools with and without
# features enabled.
#
# Strategy:
# 1. Create a pool, and collect zdb output for the pool.
# 2. Verify there are no 'feature refcount mismatch' messages.
# 3. Repeat for a pool with features disabled.
#

log_assert "Verify zdb accurately counts feature refcounts."
log_onexit cleanup

typeset errstr="feature refcount mismatch"
typeset tmpfile="/var/tmp/zdb-feature-mismatch"
function cleanup
{
datasetexists $TESTPOOL && destroy_pool $TESTPOOL
grep "$errstr" $tmpfile
rm -f $tmpfile
}

for opt in '' -d; do
log_must zpool create -f $opt $TESTPOOL ${DISKS%% *}
log_must eval "zdb $TESTPOOL >$tmpfile"
grep -q "$errstr" $tmpfile && \
log_fail "Found feature refcount mismatches in zdb output."
destroy_pool $TESTPOOL
done

log_pass "zdb accurately counts feature refcounts."

0 comments on commit c5d1600

Please sign in to comment.
You can’t perform that action at this time.