Record skipped MMP writes in multihost_history
Once per pass through the MMP thread's loop, the vdev tree is walked to find a suitable leaf to write the next MMP block to. If no such leaf is found, the thread sleeps for a while and resumes at the top of the loop. Add an entry to multihost_history when no leaf can be found, and record the reason in the error column. The error code for such entries is a bitfield, displayed in hex: 0x1 At least one vdev (interior or leaf) was not writeable. 0x2 At least one writeable leaf vdev was found, but it had a pending MMP write. timestamp = the time in seconds since the epoch when no leaf could be found originally. duration = the time (in ns) during which no MMP block was written for this reason. This does not include the preceeding inter-write period nor the following inter-write period. vdev_guid = the number of sequential cycles of the MMP thread looop when this occurred. Sample output, truncated to fit: For records of skipped MMP writes the right-most column, vdev_path, is reported as "-". id txg timestamp error duration mmp_delay vdev_guid ... 936 11 1520036441 0 146264 891422313 1740883117838 ... 937 11 1520036441 0 163956 888356657 7320395061548 ... 938 11 1520036442 0 130690 885314969 7320395061548 ... 939 11 1520036442 0 2001068577 882296582 1740883117838 ... 940 11 1520036443 0 161806 882296582 7320395061548 ... 941 11 1520036443 0x2 0 998020546 1 ... 942 11 1520036444 0 136585 998020546 7320395061548 ... 943 11 1520036444 0x2 0 998020257 1 ... 944 11 1520036445 5 2002662964 994160219 1740883117838 ... 945 11 1520036445 0x2 998073118 994160219 3 ... 946 11 1520036447 0 247136 994160219 7320395061548 ... Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Olaf Faaland <faaland1@llnl.gov> Closes #7212
This commit is contained in:
Olaf Faaland
Brian Behlendorf
parent
14c240cede
commit
d2160d0538
|
|
@ -43,6 +43,7 @@ typedef struct mmp_thread {
|
|||
uberblock_t mmp_ub; /* last ub written by sync */
|
||||
zio_t *mmp_zio_root; /* root of mmp write zios */
|
||||
uint64_t mmp_kstat_id; /* unique id for next MMP write kstat */
|
||||
int mmp_skip_error; /* reason for last skipped write */
|
||||
} mmp_thread_t;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -887,10 +887,12 @@ extern txg_stat_t *spa_txg_history_init_io(spa_t *, uint64_t,
|
|||
struct dsl_pool *);
|
||||
extern void spa_txg_history_fini_io(spa_t *, txg_stat_t *);
|
||||
extern void spa_tx_assign_add_nsecs(spa_t *spa, uint64_t nsecs);
|
||||
extern int spa_mmp_history_set_skip(spa_t *spa, uint64_t mmp_kstat_id);
|
||||
extern int spa_mmp_history_set(spa_t *spa, uint64_t mmp_kstat_id, int io_error,
|
||||
hrtime_t duration);
|
||||
extern void spa_mmp_history_add(uint64_t txg, uint64_t timestamp,
|
||||
uint64_t mmp_delay, vdev_t *vd, int label, uint64_t mmp_kstat_id);
|
||||
extern void *spa_mmp_history_add(spa_t *spa, uint64_t txg, uint64_t timestamp,
|
||||
uint64_t mmp_delay, vdev_t *vd, int label, uint64_t mmp_kstat_id,
|
||||
int error);
|
||||
|
||||
/* Pool configuration locks */
|
||||
extern int spa_config_tryenter(spa_t *spa, int locks, void *tag, krw_t rw);
|
||||
|
|
|
|||
114
module/zfs/mmp.c
114
module/zfs/mmp.c
|
|
@ -200,28 +200,33 @@ mmp_thread_stop(spa_t *spa)
|
|||
mmp->mmp_thread_exiting = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Choose a leaf vdev to write an MMP block to. It must not have an
|
||||
* outstanding mmp write (if so then there is a problem, and a new write will
|
||||
* also block). If there is no usable leaf in this subtree return NULL,
|
||||
* otherwise return a pointer to the leaf.
|
||||
*
|
||||
* When walking the subtree, a random child is chosen as the starting point so
|
||||
* that when the tree is healthy, the leaf chosen will be random with even
|
||||
* distribution. If there are unhealthy vdevs in the tree, the distribution
|
||||
* will be really poor only if a large proportion of the vdevs are unhealthy,
|
||||
* in which case there are other more pressing problems.
|
||||
*/
|
||||
typedef enum mmp_vdev_state_flag {
|
||||
MMP_FAIL_NOT_WRITABLE = (1 << 0),
|
||||
MMP_FAIL_WRITE_PENDING = (1 << 1),
|
||||
} mmp_vdev_state_flag_t;
|
||||
|
||||
static vdev_t *
|
||||
mmp_random_leaf(vdev_t *vd)
|
||||
mmp_random_leaf_impl(vdev_t *vd, int *fail_mask)
|
||||
{
|
||||
int child_idx;
|
||||
|
||||
if (!vdev_writeable(vd))
|
||||
if (!vdev_writeable(vd)) {
|
||||
*fail_mask |= MMP_FAIL_NOT_WRITABLE;
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
if (vd->vdev_ops->vdev_op_leaf)
|
||||
return (vd->vdev_mmp_pending == 0 ? vd : NULL);
|
||||
if (vd->vdev_ops->vdev_op_leaf) {
|
||||
vdev_t *ret;
|
||||
|
||||
if (vd->vdev_mmp_pending != 0) {
|
||||
*fail_mask |= MMP_FAIL_WRITE_PENDING;
|
||||
ret = NULL;
|
||||
} else {
|
||||
ret = vd;
|
||||
}
|
||||
|
||||
return (ret);
|
||||
}
|
||||
|
||||
child_idx = spa_get_random(vd->vdev_children);
|
||||
for (int offset = vd->vdev_children; offset > 0; offset--) {
|
||||
|
|
@ -229,7 +234,7 @@ mmp_random_leaf(vdev_t *vd)
|
|||
vdev_t *child = vd->vdev_child[(child_idx + offset) %
|
||||
vd->vdev_children];
|
||||
|
||||
leaf = mmp_random_leaf(child);
|
||||
leaf = mmp_random_leaf_impl(child, fail_mask);
|
||||
if (leaf)
|
||||
return (leaf);
|
||||
}
|
||||
|
|
@ -237,6 +242,44 @@ mmp_random_leaf(vdev_t *vd)
|
|||
return (NULL);
|
||||
}
|
||||
|
||||
/*
|
||||
* Find a leaf vdev to write an MMP block to. It must not have an outstanding
|
||||
* mmp write (if so a new write will also likely block). If there is no usable
|
||||
* leaf in the tree rooted at in_vd, a nonzero error value is returned, and
|
||||
* *out_vd is unchanged.
|
||||
*
|
||||
* The error value returned is a bit field.
|
||||
*
|
||||
* MMP_FAIL_WRITE_PENDING
|
||||
* If set, one or more leaf vdevs are writeable, but have an MMP write which has
|
||||
* not yet completed.
|
||||
*
|
||||
* MMP_FAIL_NOT_WRITABLE
|
||||
* If set, one or more vdevs are not writeable. The children of those vdevs
|
||||
* were not examined.
|
||||
*
|
||||
* Assuming in_vd points to a tree, a random subtree will be chosen to start.
|
||||
* That subtree, and successive ones, will be walked until a usable leaf has
|
||||
* been found, or all subtrees have been examined (except that the children of
|
||||
* un-writeable vdevs are not examined).
|
||||
*
|
||||
* If the leaf vdevs in the tree are healthy, the distribution of returned leaf
|
||||
* vdevs will be even. If there are unhealthy leaves, the following leaves
|
||||
* (child_index % index_children) will be chosen more often.
|
||||
*/
|
||||
|
||||
static int
|
||||
mmp_random_leaf(vdev_t *in_vd, vdev_t **out_vd)
|
||||
{
|
||||
int error_mask = 0;
|
||||
vdev_t *vd = mmp_random_leaf_impl(in_vd, &error_mask);
|
||||
|
||||
if (error_mask == 0)
|
||||
*out_vd = vd;
|
||||
|
||||
return (error_mask);
|
||||
}
|
||||
|
||||
static void
|
||||
mmp_write_done(zio_t *zio)
|
||||
{
|
||||
|
|
@ -319,8 +362,8 @@ mmp_write_uberblock(spa_t *spa)
|
|||
int flags = ZIO_FLAG_CONFIG_WRITER | ZIO_FLAG_CANFAIL;
|
||||
mmp_thread_t *mmp = &spa->spa_mmp;
|
||||
uberblock_t *ub;
|
||||
vdev_t *vd;
|
||||
int label;
|
||||
vdev_t *vd = NULL;
|
||||
int label, error;
|
||||
uint64_t offset;
|
||||
|
||||
hrtime_t lock_acquire_time = gethrtime();
|
||||
|
|
@ -330,13 +373,33 @@ mmp_write_uberblock(spa_t *spa)
|
|||
zfs_dbgmsg("SCL_STATE acquisition took %llu ns\n",
|
||||
(u_longlong_t)lock_acquire_time);
|
||||
|
||||
vd = mmp_random_leaf(spa->spa_root_vdev);
|
||||
if (vd == NULL) {
|
||||
error = mmp_random_leaf(spa->spa_root_vdev, &vd);
|
||||
|
||||
mutex_enter(&mmp->mmp_io_lock);
|
||||
|
||||
/*
|
||||
* spa_mmp_history has two types of entries:
|
||||
* Issued MMP write: records time issued, error status, etc.
|
||||
* Skipped MMP write: an MMP write could not be issued because no
|
||||
* suitable leaf vdev was available. See comment above struct
|
||||
* spa_mmp_history for details.
|
||||
*/
|
||||
|
||||
if (error) {
|
||||
if (mmp->mmp_skip_error == error) {
|
||||
spa_mmp_history_set_skip(spa, mmp->mmp_kstat_id - 1);
|
||||
} else {
|
||||
mmp->mmp_skip_error = error;
|
||||
spa_mmp_history_add(spa, mmp->mmp_ub.ub_txg,
|
||||
gethrestime_sec(), mmp->mmp_delay, NULL, 0,
|
||||
mmp->mmp_kstat_id++, error);
|
||||
}
|
||||
mutex_exit(&mmp->mmp_io_lock);
|
||||
spa_config_exit(spa, SCL_STATE, FTAG);
|
||||
return;
|
||||
}
|
||||
|
||||
mutex_enter(&mmp->mmp_io_lock);
|
||||
mmp->mmp_skip_error = 0;
|
||||
|
||||
if (mmp->mmp_zio_root == NULL)
|
||||
mmp->mmp_zio_root = zio_root(spa, NULL, NULL,
|
||||
|
|
@ -347,13 +410,14 @@ mmp_write_uberblock(spa_t *spa)
|
|||
ub->ub_mmp_magic = MMP_MAGIC;
|
||||
ub->ub_mmp_delay = mmp->mmp_delay;
|
||||
vd->vdev_mmp_pending = gethrtime();
|
||||
vd->vdev_mmp_kstat_id = mmp->mmp_kstat_id++;
|
||||
vd->vdev_mmp_kstat_id = mmp->mmp_kstat_id;
|
||||
|
||||
zio_t *zio = zio_null(mmp->mmp_zio_root, spa, NULL, NULL, NULL, flags);
|
||||
abd_t *ub_abd = abd_alloc_for_io(VDEV_UBERBLOCK_SIZE(vd), B_TRUE);
|
||||
abd_zero(ub_abd, VDEV_UBERBLOCK_SIZE(vd));
|
||||
abd_copy_from_buf(ub_abd, ub, sizeof (uberblock_t));
|
||||
|
||||
mmp->mmp_kstat_id++;
|
||||
mutex_exit(&mmp->mmp_io_lock);
|
||||
|
||||
offset = VDEV_UBERBLOCK_OFFSET(vd, VDEV_UBERBLOCK_COUNT(vd) -
|
||||
|
|
@ -364,8 +428,8 @@ mmp_write_uberblock(spa_t *spa)
|
|||
VDEV_UBERBLOCK_SIZE(vd), mmp_write_done, mmp,
|
||||
flags | ZIO_FLAG_DONT_PROPAGATE);
|
||||
|
||||
spa_mmp_history_add(ub->ub_txg, ub->ub_timestamp, ub->ub_mmp_delay, vd,
|
||||
label, vd->vdev_mmp_kstat_id);
|
||||
(void) spa_mmp_history_add(spa, ub->ub_txg, ub->ub_timestamp,
|
||||
ub->ub_mmp_delay, vd, label, vd->vdev_mmp_kstat_id, 0);
|
||||
|
||||
zio_nowait(zio);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -718,18 +718,28 @@ spa_io_history_destroy(spa_t *spa)
|
|||
*/
|
||||
|
||||
/*
|
||||
* MMP statistics - Information exported regarding each MMP update
|
||||
* MMP statistics - Information exported regarding attempted MMP writes
|
||||
* For MMP writes issued, fields used as per comments below.
|
||||
* For MMP writes skipped, an entry represents a span of time when
|
||||
* writes were skipped for same reason (error from mmp_random_leaf).
|
||||
* Differences are:
|
||||
* timestamp time first write skipped, if >1 skipped in a row
|
||||
* mmp_delay delay value at timestamp
|
||||
* vdev_guid number of writes skipped
|
||||
* io_error one of enum mmp_error
|
||||
* duration time span (ns) of skipped writes
|
||||
*/
|
||||
|
||||
typedef struct spa_mmp_history {
|
||||
uint64_t mmp_kstat_id; /* unique # for updates */
|
||||
uint64_t txg; /* txg of last sync */
|
||||
uint64_t timestamp; /* UTC time of of last sync */
|
||||
uint64_t mmp_delay; /* nanosec since last MMP write */
|
||||
uint64_t timestamp; /* UTC time MMP write issued */
|
||||
uint64_t mmp_delay; /* mmp_thread.mmp_delay at timestamp */
|
||||
uint64_t vdev_guid; /* unique ID of leaf vdev */
|
||||
char *vdev_path;
|
||||
uint64_t vdev_label; /* vdev label */
|
||||
int vdev_label; /* vdev label */
|
||||
int io_error; /* error status of MMP write */
|
||||
hrtime_t error_start; /* hrtime of start of error period */
|
||||
hrtime_t duration; /* time from submission to completion */
|
||||
list_node_t smh_link;
|
||||
} spa_mmp_history_t;
|
||||
|
|
@ -747,9 +757,12 @@ static int
|
|||
spa_mmp_history_data(char *buf, size_t size, void *data)
|
||||
{
|
||||
spa_mmp_history_t *smh = (spa_mmp_history_t *)data;
|
||||
char skip_fmt[] = "%-10llu %-10llu %10llu %#6llx %10lld %12llu %-24llu "
|
||||
"%-10lld %s\n";
|
||||
char write_fmt[] = "%-10llu %-10llu %10llu %6lld %10lld %12llu %-24llu "
|
||||
"%-10lld %s\n";
|
||||
|
||||
(void) snprintf(buf, size, "%-10llu %-10llu %-10llu %-6lld %-10lld "
|
||||
"%-12llu %-24llu %-10llu %s\n",
|
||||
(void) snprintf(buf, size, (smh->error_start ? skip_fmt : write_fmt),
|
||||
(u_longlong_t)smh->mmp_kstat_id, (u_longlong_t)smh->txg,
|
||||
(u_longlong_t)smh->timestamp, (longlong_t)smh->io_error,
|
||||
(longlong_t)smh->duration, (u_longlong_t)smh->mmp_delay,
|
||||
|
|
@ -869,8 +882,42 @@ spa_mmp_history_destroy(spa_t *spa)
|
|||
mutex_destroy(&ssh->lock);
|
||||
}
|
||||
|
||||
/*
|
||||
* Set duration in existing "skip" record to how long we have waited for a leaf
|
||||
* vdev to become available.
|
||||
*
|
||||
* Important that we start search at the head of the list where new
|
||||
* records are inserted, so this is normally an O(1) operation.
|
||||
*/
|
||||
int
|
||||
spa_mmp_history_set_skip(spa_t *spa, uint64_t mmp_kstat_id)
|
||||
{
|
||||
spa_stats_history_t *ssh = &spa->spa_stats.mmp_history;
|
||||
spa_mmp_history_t *smh;
|
||||
int error = ENOENT;
|
||||
|
||||
if (zfs_multihost_history == 0 && ssh->size == 0)
|
||||
return (0);
|
||||
|
||||
mutex_enter(&ssh->lock);
|
||||
for (smh = list_head(&ssh->list); smh != NULL;
|
||||
smh = list_next(&ssh->list, smh)) {
|
||||
if (smh->mmp_kstat_id == mmp_kstat_id) {
|
||||
ASSERT3U(smh->io_error, !=, 0);
|
||||
smh->duration = gethrtime() - smh->error_start;
|
||||
smh->vdev_guid++;
|
||||
error = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
mutex_exit(&ssh->lock);
|
||||
|
||||
return (error);
|
||||
}
|
||||
|
||||
/*
|
||||
* Set MMP write duration and error status in existing record.
|
||||
* See comment re: search order above spa_mmp_history_set_skip().
|
||||
*/
|
||||
int
|
||||
spa_mmp_history_set(spa_t *spa, uint64_t mmp_kstat_id, int io_error,
|
||||
|
|
@ -887,6 +934,7 @@ spa_mmp_history_set(spa_t *spa, uint64_t mmp_kstat_id, int io_error,
|
|||
for (smh = list_head(&ssh->list); smh != NULL;
|
||||
smh = list_next(&ssh->list, smh)) {
|
||||
if (smh->mmp_kstat_id == mmp_kstat_id) {
|
||||
ASSERT(smh->io_error == 0);
|
||||
smh->io_error = io_error;
|
||||
smh->duration = duration;
|
||||
error = 0;
|
||||
|
|
@ -899,29 +947,39 @@ spa_mmp_history_set(spa_t *spa, uint64_t mmp_kstat_id, int io_error,
|
|||
}
|
||||
|
||||
/*
|
||||
* Add a new MMP write to historical record.
|
||||
* Add a new MMP historical record.
|
||||
* error == 0 : a write was issued.
|
||||
* error != 0 : a write was not issued because no leaves were found.
|
||||
*/
|
||||
void
|
||||
spa_mmp_history_add(uint64_t txg, uint64_t timestamp, uint64_t mmp_delay,
|
||||
vdev_t *vd, int label, uint64_t mmp_kstat_id)
|
||||
void *
|
||||
spa_mmp_history_add(spa_t *spa, uint64_t txg, uint64_t timestamp,
|
||||
uint64_t mmp_delay, vdev_t *vd, int label, uint64_t mmp_kstat_id,
|
||||
int error)
|
||||
{
|
||||
spa_t *spa = vd->vdev_spa;
|
||||
spa_stats_history_t *ssh = &spa->spa_stats.mmp_history;
|
||||
spa_mmp_history_t *smh, *rm;
|
||||
|
||||
if (zfs_multihost_history == 0 && ssh->size == 0)
|
||||
return;
|
||||
return (NULL);
|
||||
|
||||
smh = kmem_zalloc(sizeof (spa_mmp_history_t), KM_SLEEP);
|
||||
smh->txg = txg;
|
||||
smh->timestamp = timestamp;
|
||||
smh->mmp_delay = mmp_delay;
|
||||
if (vd) {
|
||||
smh->vdev_guid = vd->vdev_guid;
|
||||
if (vd->vdev_path)
|
||||
smh->vdev_path = strdup(vd->vdev_path);
|
||||
}
|
||||
smh->vdev_label = label;
|
||||
smh->mmp_kstat_id = mmp_kstat_id;
|
||||
|
||||
if (error) {
|
||||
smh->io_error = error;
|
||||
smh->error_start = gethrtime();
|
||||
smh->vdev_guid = 1;
|
||||
}
|
||||
|
||||
mutex_enter(&ssh->lock);
|
||||
|
||||
list_insert_head(&ssh->list, smh);
|
||||
|
|
@ -936,6 +994,7 @@ spa_mmp_history_add(uint64_t txg, uint64_t timestamp, uint64_t mmp_delay,
|
|||
}
|
||||
|
||||
mutex_exit(&ssh->lock);
|
||||
return ((void *)smh);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -574,7 +574,7 @@ tags = ['functional', 'mmap']
|
|||
[tests/functional/mmp]
|
||||
tests = ['mmp_on_thread', 'mmp_on_uberblocks', 'mmp_on_off', 'mmp_interval',
|
||||
'mmp_active_import', 'mmp_inactive_import', 'mmp_exported_import',
|
||||
'mmp_write_uberblocks', 'mmp_reset_interval']
|
||||
'mmp_write_uberblocks', 'mmp_reset_interval', 'multihost_history']
|
||||
tags = ['functional', 'mmp']
|
||||
|
||||
[tests/functional/mount]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/mmp
|
||||
dist_pkgdata_SCRIPTS = \
|
||||
multihost_history.ksh \
|
||||
mmp_on_thread.ksh \
|
||||
mmp_on_uberblocks.ksh \
|
||||
mmp_on_off.ksh \
|
||||
|
|
|
|||
|
|
@ -93,11 +93,10 @@ function mmp_clear_hostid
|
|||
rm -f $HOSTID_FILE
|
||||
}
|
||||
|
||||
function mmp_pool_create # pool dir
|
||||
function mmp_pool_create_simple # pool dir
|
||||
{
|
||||
typeset pool=${1:-$MMP_POOL}
|
||||
typeset dir=${2:-$MMP_DIR}
|
||||
typeset opts="-VVVVV -T120 -M -k0 -f $dir -E -p $pool"
|
||||
|
||||
log_must mkdir -p $dir
|
||||
log_must rm -f $dir/*
|
||||
|
|
@ -108,6 +107,16 @@ function mmp_pool_create # pool dir
|
|||
log_must zpool create -f -o cachefile=$MMP_CACHE $pool \
|
||||
mirror $dir/vdev1 $dir/vdev2
|
||||
log_must zpool set multihost=on $pool
|
||||
}
|
||||
|
||||
function mmp_pool_create # pool dir
|
||||
{
|
||||
typeset pool=${1:-$MMP_POOL}
|
||||
typeset dir=${2:-$MMP_DIR}
|
||||
typeset opts="-VVVVV -T120 -M -k0 -f $dir -E -p $pool"
|
||||
|
||||
mmp_pool_create_simple $pool $dir
|
||||
|
||||
log_must mv $MMP_CACHE ${MMP_CACHE}.stale
|
||||
log_must zpool export $pool
|
||||
log_must mmp_clear_hostid
|
||||
|
|
@ -192,12 +201,22 @@ function clear_mmp_history
|
|||
log_must set_tunable64 zfs_multihost_history $MMP_HISTORY
|
||||
}
|
||||
|
||||
function count_uberblocks # pool duration
|
||||
function count_skipped_mmp_writes # pool duration
|
||||
{
|
||||
typeset pool=$1
|
||||
typeset -i duration=$2
|
||||
typeset hist_path="/proc/spl/kstat/zfs/$pool/multihost"
|
||||
|
||||
sleep $duration
|
||||
echo $(cat "$hist_path" | sed '1,2d' | wc -l)
|
||||
awk 'BEGIN {count=0}; $NF == "-" {count++}; END {print count};' "$hist_path"
|
||||
}
|
||||
|
||||
function count_mmp_writes # pool duration
|
||||
{
|
||||
typeset pool=$1
|
||||
typeset -i duration=$2
|
||||
typeset hist_path="/proc/spl/kstat/zfs/$pool/multihost"
|
||||
|
||||
sleep $duration
|
||||
awk 'BEGIN {count=0}; $NF != "-" {count++}; END {print count};' "$hist_path"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ log_must mmp_set_hostid $HOSTID1
|
|||
default_setup_noexit "$DISKS"
|
||||
log_must zpool set multihost=on $TESTPOOL
|
||||
clear_mmp_history
|
||||
UBER_CHANGES=$(count_uberblocks $TESTPOOL 10)
|
||||
UBER_CHANGES=$(count_mmp_writes $TESTPOOL 10)
|
||||
|
||||
log_note "Uberblock changed $UBER_CHANGES times"
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ log_must zpool set multihost=on $TESTPOOL
|
|||
|
||||
clear_mmp_history
|
||||
log_must set_tunable64 zfs_multihost_interval $MMP_INTERVAL_DEFAULT
|
||||
uber_count=$(count_uberblocks $TESTPOOL 1)
|
||||
uber_count=$(count_mmp_writes $TESTPOOL 1)
|
||||
|
||||
if [ $uber_count -eq 0 ]; then
|
||||
log_fail "mmp writes did not start when zfs_multihost_interval reduced"
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ default_mirror_setup_noexit $DISKS
|
|||
log_must zpool set multihost=on $TESTPOOL
|
||||
log_must zinject -d ${DISK[0]} -e io -T write -f 50 $TESTPOOL -L uber
|
||||
clear_mmp_history
|
||||
uber_count=$(count_uberblocks $TESTPOOL 3)
|
||||
uber_count=$(count_mmp_writes $TESTPOOL 3)
|
||||
|
||||
if [ $uber_count -eq 0 ]; then
|
||||
log_fail "mmp writes did not occur when uberblock IO errors injected"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,67 @@
|
|||
#!/bin/ksh -p
|
||||
#
|
||||
# CDDL HEADER START
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
# CDDL HEADER END
|
||||
#
|
||||
|
||||
#
|
||||
# Copyright (c) 2017 by Lawrence Livermore National Security, LLC.
|
||||
#
|
||||
|
||||
# DESCRIPTION:
|
||||
# zfs_multihost_history should report both writes issued and gaps
|
||||
#
|
||||
# STRATEGY:
|
||||
# 1. Create a 2-vdev pool with mmp enabled
|
||||
# 2. Delay writes by 2*MMP_INTERVAL_DEFAULT
|
||||
# 3. Check multihost_history for both issued writes, and for gaps where
|
||||
# no write could be issued because all vdevs are busy
|
||||
#
|
||||
# During the first MMP_INTERVAL period 2 MMP writes will be issued - one to
|
||||
# each vdev. At the third scheduled attempt to write, at time t0+MMP_INTERVAL,
|
||||
# both vdevs will still have outstanding writes, so a skipped write entry will
|
||||
# be recorded in the multihost_history.
|
||||
|
||||
|
||||
. $STF_SUITE/include/libtest.shlib
|
||||
. $STF_SUITE/tests/functional/mmp/mmp.cfg
|
||||
. $STF_SUITE/tests/functional/mmp/mmp.kshlib
|
||||
|
||||
verify_runnable "both"
|
||||
|
||||
function cleanup
|
||||
{
|
||||
log_must zinject -c all
|
||||
mmp_pool_destroy $MMP_POOL $MMP_DIR
|
||||
log_must mmp_clear_hostid
|
||||
}
|
||||
|
||||
log_assert "zfs_multihost_history records writes and skipped writes"
|
||||
log_onexit cleanup
|
||||
|
||||
mmp_pool_create_simple $MMP_POOL $MMP_DIR
|
||||
log_must zinject -d $MMP_DIR/vdev1 -D$((2*MMP_INTERVAL_DEFAULT)):10 $MMP_POOL
|
||||
log_must zinject -d $MMP_DIR/vdev2 -D$((2*MMP_INTERVAL_DEFAULT)):10 $MMP_POOL
|
||||
|
||||
mmp_writes=$(count_mmp_writes $MMP_POOL $((MMP_INTERVAL_DEFAULT/1000)))
|
||||
mmp_skips=$(count_skipped_mmp_writes $MMP_POOL $((MMP_INTERVAL_DEFAULT/1000)))
|
||||
|
||||
if [ $mmp_writes -lt 1 ]; then
|
||||
log_fail "mmp writes entries missing when delays injected"
|
||||
fi
|
||||
|
||||
if [ $mmp_skips -lt 1 ]; then
|
||||
log_fail "mmp skipped write entries missing when delays injected"
|
||||
fi
|
||||
|
||||
log_pass "zfs_multihost_history records writes and skipped writes"
|
||||
Loading…
Reference in New Issue