Update cache file when setting compatibility property

Unlike most other properties the 'compatibility' property is stored
in the pool config object and not the DMU_OT_POOL_PROPS object.

This had the advantage that the compatibility information is available
without needing to fully import the pool (it can be read with zdb).
However, this means we need to make sure to update both the copy of
the config in the MOS and the cache file.  This wasn't being done.

This commit adds a call to spa_async_request() to ensure the copy of
the config in the cache file gets updated as well as the one stored
in the pool.  This same change is made for the 'comment' property
which suffers from the same inconsistency.

Reviewed-by: Sean Eric Fagan <sef@ixsystems.com>
Reviewed-by: Colm Buckley <colm@tuatha.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #12261
Closes #12276

diff --git a/module/zfs/spa.c b/module/zfs/spa.c
index 825e0f1cccabdc0251fa81517e9c54e903abc875..f6dce076d1361070ef805d4e64a26541c76034db 100644 (file)
--- a/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@ -8730,12 +8730,16 @@ spa_sync_props(void *arg, dmu_tx_t *tx)
                        spa->spa_comment = spa_strdup(strval);
                        /*
                         * We need to dirty the configuration on all the vdevs
-                        * so that their labels get updated.  It's unnecessary
-                        * to do this for pool creation since the vdev's
-                        * configuration has already been dirtied.
+                        * so that their labels get updated.  We also need to
+                        * update the cache file to keep it in sync with the
+                        * MOS version. It's unnecessary to do this for pool
+                        * creation since the vdev's configuration has already
+                        * been dirtied.
                         */
-                       if (tx->tx_txg != TXG_INITIAL)
+                       if (tx->tx_txg != TXG_INITIAL) {
                                vdev_config_dirty(spa->spa_root_vdev);
+                               spa_async_request(spa, SPA_ASYNC_CONFIG_UPDATE);
+                       }
                        spa_history_log_internal(spa, "set", tx,
                            "%s=%s", nvpair_name(elem), strval);
                        break;
@@ -8747,8 +8751,11 @@ spa_sync_props(void *arg, dmu_tx_t *tx)
                        /*
                         * Dirty the configuration on vdevs as above.
                         */
-                       if (tx->tx_txg != TXG_INITIAL)
+                       if (tx->tx_txg != TXG_INITIAL) {
                                vdev_config_dirty(spa->spa_root_vdev);
+                               spa_async_request(spa, SPA_ASYNC_CONFIG_UPDATE);
+                       }
+
                        spa_history_log_internal(spa, "set", tx,
                            "%s=%s", nvpair_name(elem), strval);
                        break;

diff --git a/tests/runfiles/common.run b/tests/runfiles/common.run
index e87c1cd641ff06dc48db2c69da2572dad9566bfe..996e5f615cd4db22440672fc18296b8a46b89cc2 100644 (file)
--- a/tests/runfiles/common.run
+++ b/tests/runfiles/common.run
@@ -351,7 +351,8 @@ tests = ['zpool_create_001_pos', 'zpool_create_002_pos',
     'zpool_create_features_003_pos', 'zpool_create_features_004_neg',
     'zpool_create_features_005_pos', 'zpool_create_features_006_pos',
     'zpool_create_features_007_pos', 'zpool_create_features_008_pos',
-    'create-o_ashift', 'zpool_create_tempname', 'zpool_create_dryrun_output']
+    'zpool_create_features_009_pos', 'create-o_ashift',
+    'zpool_create_tempname', 'zpool_create_dryrun_output']
 tags = ['functional', 'cli_root', 'zpool_create']
 
 [tests/functional/cli_root/zpool_destroy]

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile.am
index 5e9e83f0db910d2e3652eea1964099042e3af7fd..5ffaae5b152cf417896a60b7c8dcc1de933bad42 100644 (file)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile.am
@@ -39,6 +39,7 @@ dist_pkgdata_SCRIPTS = \
        zpool_create_features_006_pos.ksh \
        zpool_create_features_007_pos.ksh \
        zpool_create_features_008_pos.ksh \
+       zpool_create_features_009_pos.ksh \
        create-o_ashift.ksh \
        zpool_create_tempname.ksh \
        zpool_create_dryrun_output.ksh

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_009_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_009_pos.ksh
new file mode 100755 (executable)
index 0000000..052c18d
--- /dev/null
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_009_pos.ksh
@@ -0,0 +1,92 @@
+#!/bin/ksh -p
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2021 Lawrence Livermore National Security, LLC.
+#
+
+. $STF_SUITE/include/libtest.shlib
+
+#
+# DESCRIPTION:
+#      Verify '-o compatibility' property is updated in both the
+#      pool config MOS object and the cache file.
+#
+# STRATEGY:
+#      1. Create a pool with '-o compatibility=legacy', then verify
+#         the property exists in the MOS config and cache file.
+#      2. Create a pool, set the 'compatibility=off' property, then
+#         verify the property exists in the MOS config and cache file.
+#
+
+verify_runnable "global"
+
+function cleanup
+{
+       datasetexists $TESTPOOL && log_must zpool destroy $TESTPOOL
+       rm -f $CACHE_FILE
+}
+
+function check_config
+{
+       typeset propval=$1
+
+       poolval="$(zpool get -H -o value compatibility $TESTPOOL)"
+       if [ "$poolval" != "$propval" ]; then
+               log_fail "compatibility property set incorrectly $curval"
+       fi
+
+       if ! zdb -C -U $CACHE_FILE | grep "compatibility: '$propval'"; then
+               log_fail "compatibility property missing in cache file"
+       fi
+
+       if ! zdb -C -U $CACHE_FILE $TESTPOOL | grep "compatibility: '$propval'"; then
+               log_fail "compatibility property missing from MOS object"
+       fi
+}
+
+log_onexit cleanup
+
+log_assert "verify '-o compatibility' in MOS object and cache file"
+
+CACHE_FILE=$TEST_BASE_DIR/cachefile.$$
+
+# 1. Create a pool with '-o compatibility=legacy', then verify
+#    the property exists in the MOS config and cache file.
+log_must zpool create -f -o cachefile=$CACHE_FILE -o compatibility=legacy $TESTPOOL $DISKS
+log_must check_config legacy
+log_must zpool export -F $TESTPOOL
+log_must zpool import -c $CACHE_FILE $TESTPOOL
+log_must check_config legacy
+log_must zpool destroy -f $TESTPOOL
+
+# 2. Create a pool, set the 'compatibility=off' property, then
+#    verify the property exists in the MOS config and cache file.
+log_must zpool create -f -o cachefile=$CACHE_FILE $TESTPOOL $DISKS
+log_must zpool set compatibility=legacy $TESTPOOL
+log_must check_config legacy
+log_must zpool export -F $TESTPOOL
+log_must zpool import -c $CACHE_FILE $TESTPOOL
+log_must check_config legacy
+log_must zpool destroy -f $TESTPOOL
+
+log_pass "verify '-o compatibility' in MOS object and cache file"