aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/ztest
diff options
context:
space:
mode:
authorSerapheim Dimitropoulos <[email protected]>2019-07-18 13:02:33 -0700
committerBrian Behlendorf <[email protected]>2019-07-18 13:02:33 -0700
commit43a8536260e76dab4a615164f9e6d6397c6b7778 (patch)
treeb5a8ab080464448090b92fc3b1eb1b86ce092366 /cmd/ztest
parent1c44a5c97fabc669885df84c3e9b6b5e16f0cd35 (diff)
Race condition between spa async threads and export
In the past we've seen multiple race conditions that have to do with open-context threads async threads and concurrent calls to spa_export()/spa_destroy() (including the one referenced in issue #9015). This patch ensures that only one thread can execute the main body of spa_export_common() at a time, with subsequent threads returning with a new error code created just for this situation, eliminating this way any race condition bugs introduced by concurrent calls to this function. Reviewed by: Matt Ahrens <[email protected]> Reviewed by: Brian Behlendorf <[email protected]> Signed-off-by: Serapheim Dimitropoulos <[email protected]> Closes #9015 Closes #9044
Diffstat (limited to 'cmd/ztest')
-rw-r--r--cmd/ztest/ztest.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
index 3b1be5d40..01421e85b 100644
--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@ -2719,8 +2719,24 @@ ztest_spa_create_destroy(ztest_ds_t *zd, uint64_t id)
VERIFY3U(EEXIST, ==,
spa_create(zo->zo_pool, nvroot, NULL, NULL, NULL));
nvlist_free(nvroot);
+
+ /*
+ * We open a reference to the spa and then we try to export it
+ * expecting one of the following errors:
+ *
+ * EBUSY
+ * Because of the reference we just opened.
+ *
+ * ZFS_ERR_EXPORT_IN_PROGRESS
+ * For the case that there is another ztest thread doing
+ * an export concurrently.
+ */
VERIFY3U(0, ==, spa_open(zo->zo_pool, &spa, FTAG));
- VERIFY3U(EBUSY, ==, spa_destroy(zo->zo_pool));
+ int error = spa_destroy(zo->zo_pool);
+ if (error != EBUSY && error != ZFS_ERR_EXPORT_IN_PROGRESS) {
+ fatal(0, "spa_destroy(%s) returned unexpected value %d",
+ spa->spa_name, error);
+ }
spa_close(spa, FTAG);
(void) pthread_rwlock_unlock(&ztest_name_lock);