Fix ztest vdev file paths.

[zfs.git] / cmd / ztest / ztest.c

diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
index 72d511b..4aca527 100644 (file)
--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@ -21,6 +21,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2011 by Delphix. All rights reserved.
+ * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  */
 
 /*
@@ -260,6 +261,7 @@ ztest_func_t ztest_vdev_LUN_growth;
 ztest_func_t ztest_vdev_add_remove;
 ztest_func_t ztest_vdev_aux_add_remove;
 ztest_func_t ztest_split_pool;
+ztest_func_t ztest_reguid;
 
 uint64_t zopt_always = 0ULL * NANOSEC;         /* all the time */
 uint64_t zopt_incessant = 1ULL * NANOSEC / 10; /* every 1/10 second */
@@ -290,6 +292,7 @@ ztest_info_t ztest_info[] = {
        { ztest_fault_inject,                   1,      &zopt_sometimes },
        { ztest_ddt_repair,                     1,      &zopt_sometimes },
        { ztest_dmu_snapshot_hold,              1,      &zopt_sometimes },
+       { ztest_reguid,                         1,      &zopt_sometimes },
        { ztest_spa_rename,                     1,      &zopt_rarely    },
        { ztest_scrub,                          1,      &zopt_rarely    },
        { ztest_dsl_dataset_promote_busy,       1,      &zopt_rarely    },
@@ -326,6 +329,7 @@ typedef struct ztest_shared {
        uint64_t        zs_vdev_aux;
        uint64_t        zs_alloc;
        uint64_t        zs_space;
+       uint64_t        zs_guid;
        kmutex_t        zs_vdev_lock;
        krwlock_t       zs_name_lock;
        ztest_info_t    zs_info[ZTEST_FUNCS];
@@ -2563,7 +2567,7 @@ ztest_vdev_attach_detach(ztest_ds_t *zd, uint64_t id)
                newvd_is_spare = B_TRUE;
                (void) strcpy(newpath, newvd->vdev_path);
        } else {
-               (void) snprintf(newpath, sizeof (newpath), ztest_dev_template,
+               (void) snprintf(newpath, MAXPATHLEN, ztest_dev_template,
                    zopt_dir, zopt_pool, top * leaves + leaf);
                if (ztest_random(2) == 0)
                        newpath[strlen(newpath) - 1] = 'b';
@@ -2919,7 +2923,8 @@ ztest_dataset_create(char *dsname)
        if (err || zilset < 80)
                return (err);
 
-       (void) printf("Setting dataset %s to sync always\n", dsname);
+       if (zopt_verbose >= 5)
+               (void) printf("Setting dataset %s to sync always\n", dsname);
        return (ztest_dsl_prop_set_uint64(dsname, ZFS_PROP_SYNC,
            ZFS_SYNC_ALWAYS, B_FALSE));
 }
@@ -4628,9 +4633,9 @@ ztest_fault_inject(ztest_ds_t *zd, uint64_t id)
                 * write failures and random online/offline activity on leaf 0,
                 * and we'll write random garbage to the randomly chosen leaf.
                 */
-               (void) snprintf(path0, sizeof (path0), ztest_dev_template,
+               (void) snprintf(path0, MAXPATHLEN, ztest_dev_template,
                    zopt_dir, zopt_pool, top * leaves + zs->zs_splits);
-               (void) snprintf(pathrand, sizeof (pathrand), ztest_dev_template,
+               (void) snprintf(pathrand, MAXPATHLEN, ztest_dev_template,
                    zopt_dir, zopt_pool, top * leaves + leaf);
 
                vd0 = vdev_lookup_by_path(spa->spa_root_vdev, path0);
@@ -4804,7 +4809,7 @@ ztest_ddt_repair(ztest_ds_t *zd, uint64_t id)
 
        object = od[0].od_object;
        blocksize = od[0].od_blocksize;
-       pattern = spa_guid(spa) ^ dmu_objset_fsid_guid(os);
+       pattern = zs->zs_guid ^ dmu_objset_fsid_guid(os);
 
        ASSERT(object != 0);
 
@@ -4877,6 +4882,31 @@ ztest_scrub(ztest_ds_t *zd, uint64_t id)
 }
 
 /*
+ * Change the guid for the pool.
+ */
+/* ARGSUSED */
+void
+ztest_reguid(ztest_ds_t *zd, uint64_t id)
+{
+       ztest_shared_t *zs = ztest_shared;
+       spa_t *spa = zs->zs_spa;
+       uint64_t orig, load;
+
+       orig = spa_guid(spa);
+       load = spa_load_guid(spa);
+       if (spa_change_guid(spa) != 0)
+               return;
+
+       if (zopt_verbose >= 3) {
+               (void) printf("Changed guid old %llu -> %llu\n",
+                   (u_longlong_t)orig, (u_longlong_t)spa_guid(spa));
+       }
+
+       VERIFY3U(orig, !=, spa_guid(spa));
+       VERIFY3U(load, ==, spa_load_guid(spa));
+}
+
+/*
  * Rename the pool to a different name and then rename it back.
  */
 /* ARGSUSED */
@@ -4969,7 +4999,7 @@ ztest_run_zdb(char *pool)
 
        fp = popen(zdb, "r");
 
-       while (fgets(zbuf, sizeof (zbuf), fp) != NULL)
+       while (fgets(zbuf, 1024, fp) != NULL)
                if (zopt_verbose >= 3)
                        (void) printf("%s", zbuf);
 
@@ -5307,6 +5337,7 @@ ztest_run(ztest_shared_t *zs)
 {
        kt_did_t *tid;
        spa_t *spa;
+       objset_t *os;
        kthread_t *resume_thread;
        uint64_t object;
        int error;
@@ -5340,6 +5371,10 @@ ztest_run(ztest_shared_t *zs)
        spa->spa_debug = B_TRUE;
        zs->zs_spa = spa;
 
+       VERIFY3U(0, ==, dmu_objset_hold(zs->zs_pool, FTAG, &os));
+       zs->zs_guid = dmu_objset_fsid_guid(os);
+       dmu_objset_rele(os, FTAG);
+
        spa->spa_dedup_ditto = 2 * ZIO_DEDUPDITTO_MIN;
 
        /*
@@ -5355,8 +5390,9 @@ ztest_run(ztest_shared_t *zs)
        /*
         * Create a thread to periodically resume suspended I/O.
         */
-       VERIFY3P((resume_thread = thread_create(NULL, 0, ztest_resume_thread,
-           spa, TS_RUN, NULL, 0, 0)), !=, NULL);
+       VERIFY3P((resume_thread = zk_thread_create(NULL, 0,
+           (thread_func_t)ztest_resume_thread, spa, TS_RUN, NULL, 0, 0,
+           PTHREAD_CREATE_JOINABLE)), !=, NULL);
 
        /*
         * Set a deadman alarm to abort() if we hang.
@@ -5402,8 +5438,10 @@ ztest_run(ztest_shared_t *zs)
                if (t < zopt_datasets && ztest_dataset_open(zs, t) != 0)
                        return;
 
-               VERIFY3P(thread = thread_create(NULL, 0, ztest_thread,
-                   (void *)(uintptr_t)t, TS_RUN, NULL, 0, 0), !=, NULL);
+               VERIFY3P(thread = zk_thread_create(NULL, 0,
+                   (thread_func_t)ztest_thread,
+                   (void *)(uintptr_t)t, TS_RUN, NULL, 0, 0,
+                   PTHREAD_CREATE_JOINABLE), !=, NULL);
                tid[t] = thread->t_tid;
        }