diff options
| author | Xin LI <delphij@FreeBSD.org> | 2014-07-01 08:36:56 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2014-07-01 08:36:56 +0000 |
| commit | be78a8db9712f5cb10c54820d15a17f128deaf88 (patch) | |
| tree | 4a0310b51c1b9c138bac735451cb5affe3e69f45 /cddl | |
| parent | 3a0f8ff95eb49f524bfef6efc8c9ef832b0e29fe (diff) | |
| parent | 7c5f50e13fe7b13a1278c45bc65547689bc4adae (diff) | |
| download | src-be78a8db9712f5cb10c54820d15a17f128deaf88.tar.gz src-be78a8db9712f5cb10c54820d15a17f128deaf88.zip | |
MFV r267570:
4756 metaslab_group_preload() could deadlock
illumos/illumos-gate@30beaff42d8240ebf5386e8b7a14e3d137a1631f
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=268086
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/ztest/ztest.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/cmd/ztest/ztest.c b/cddl/contrib/opensolaris/cmd/ztest/ztest.c index c0ece98482e9..8f5d7ced955d 100644 --- a/cddl/contrib/opensolaris/cmd/ztest/ztest.c +++ b/cddl/contrib/opensolaris/cmd/ztest/ztest.c @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. @@ -187,6 +187,7 @@ static const ztest_shared_opts_t ztest_opts_defaults = { extern uint64_t metaslab_gang_bang; extern uint64_t metaslab_df_alloc_threshold; extern uint64_t zfs_deadman_synctime_ms; +extern int metaslab_preload_limit; static ztest_shared_opts_t *ztest_shared_opts; static ztest_shared_opts_t ztest_opts; @@ -5596,6 +5597,7 @@ ztest_run(ztest_shared_t *zs) kernel_init(FREAD | FWRITE); VERIFY0(spa_open(ztest_opts.zo_pool, &spa, FTAG)); spa->spa_debug = B_TRUE; + metaslab_preload_limit = ztest_random(20) + 1; ztest_spa = spa; VERIFY0(dmu_objset_own(ztest_opts.zo_pool, |