Merge pull request #62448 from asomers/feature@

zpool.present: correctly handle "feature@" properties
saltstack · Oct 12, 2022 · a808930 · a808930
2 parents 7957dc1 + 7c80756
commit a808930
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/changelog/62390.fixed b/changelog/62390.fixed
@@ -0,0 +1 @@
+Fix the "zpool.present" state when enabling zpool features that are already active.
diff --git a/salt/states/zpool.py b/salt/states/zpool.py
@@ -319,7 +319,14 @@ def present(
                     continue
 
                 # compare current and wanted value
-                if properties_current[prop] != properties[prop]:
+                # Enabled "feature@" properties may report either "enabled" or
+                # "active", depending on whether they're currently in-use.
+                if prop.startswith("feature@") and properties_current[prop] == "active":
+                    effective_property = "enabled"
+                else:
+                    effective_property = properties_current[prop]
+
+                if effective_property != properties[prop]:
                     properties_update.append(prop)
 
         # update pool properties

diff --git a/tests/pytests/unit/states/test_zpool.py b/tests/pytests/unit/states/test_zpool.py
@@ -340,7 +340,7 @@ def test_present_update_success(utils_patch):
         "name": "myzpool",
         "result": True,
         "comment": "properties updated",
-        "changes": {"myzpool": {"autoexpand": False}},
+        "changes": {"myzpool": {"autoexpand": False, "feature@bookmarks": "enabled"}},
     }
 
     config = {
@@ -352,6 +352,8 @@ def test_present_update_success(utils_patch):
     ]
     properties = {
         "autoexpand": False,
+        "feature@hole_birth": "enabled",
+        "feature@bookmarks": "enabled",
     }
 
     mock_exists = MagicMock(return_value=True)
@@ -368,7 +370,7 @@ def test_present_update_success(utils_patch):
                 ("dedupditto", "0"),
                 ("dedupratio", "1.00x"),
                 ("autoexpand", True),
-                ("feature@bookmarks", "enabled"),
+                ("feature@bookmarks", "disabled"),
                 ("allocated", 115712),
                 ("guid", 1591906802560842214),
                 ("feature@large_blocks", "enabled"),
@@ -421,7 +423,7 @@ def test_present_update_success(utils_patch):
 
 def test_present_update_nochange_success(utils_patch):
     """
-    Test zpool present with non existing pool
+    Test zpool present with an up-to-date pool
     """
     config = {
         "import": False,
@@ -432,6 +434,8 @@ def test_present_update_nochange_success(utils_patch):
     ]
     properties = {
         "autoexpand": True,
+        "feature@hole_birth": "enabled",
+        "feature@bookmarks": "enabled",
     }
 
     mock_exists = MagicMock(return_value=True)