Add missing migrations (etcd/crd) for ZFS rename

Author: rp-

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Add missing migrations (etcd/crd) for ZFS rename
 - Only satellite zfs migrate nodes that have a ZFS pool
 
 ## [1.31.0-rc.1] - 2025-03-19

controller/src/main/java/com/linbit/linstor/dbcp/migration/etcd/Migration_40_CreateSnapshotsFromZfsClones.java

@@ -0,0 +1,52 @@
+package com.linbit.linstor.dbcp.migration.etcd;
+
+import com.linbit.linstor.dbcp.migration.Migration_2024_11_21_CreateSnapshotsFromZfsClones;
+import com.linbit.linstor.storage.kinds.DeviceProviderKind;
+import com.linbit.linstor.transaction.EtcdTransaction;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+@EtcdMigration(
+    description = "Add property for satellites to mark CF_ snapshots for deletion",
+    version = 67
+)
+public class Migration_40_CreateSnapshotsFromZfsClones extends BaseEtcdMigration
+{
+    private static final String ETCD_CLM_NAME_PROP_VALUE = "/PROP_VALUE";
+
+    @Override
+    public void migrate(EtcdTransaction tx, final String prefix) throws Exception
+    {
+        final String prefixedDbTableStr = prefix + "NODE_STOR_POOL/";
+        final int prefixedTblKeyLen = prefixedDbTableStr.length();
+        TreeMap<String, String> allNodeStorPool = tx.get(prefix + "NODE_STOR_POOL", true);
+
+        Set<String> alreadySet = new HashSet<>();
+        for (Map.Entry<String, String> entry : allNodeStorPool.entrySet())
+        {
+            String value = entry.getValue();
+            if (entry.getKey().endsWith("DRIVER_NAME") && (value.equalsIgnoreCase(
+                DeviceProviderKind.ZFS_THIN.name()) || value.equalsIgnoreCase(DeviceProviderKind.ZFS.name())))
+            {
+                String combinedPkAndColumn = entry.getKey().substring(prefixedTblKeyLen);
+                String combinedPk = combinedPkAndColumn.substring(0, combinedPkAndColumn.lastIndexOf("/"));
+
+                String[] pks = combinedPk.split(":");
+                String nodeName = pks[0];
+
+                if (!alreadySet.contains(nodeName))
+                {
+                    String propInstance = String.format("/NODES/%s", nodeName);
+                    String propsPrefix = prefix + "PROPS_CONTAINERS/" + propInstance + ":";
+                    String key = propsPrefix + Migration_2024_11_21_CreateSnapshotsFromZfsClones.PROP_KEY_STLT_MIGRATION +
+                        ETCD_CLM_NAME_PROP_VALUE;
+                    tx.put(key, Migration_2024_11_21_CreateSnapshotsFromZfsClones.PROP_VALUE_STLT_MIGRATION);
+                    alreadySet.add(nodeName);
+                }
+            }
+        }
+    }
+}

controller/src/main/java/com/linbit/linstor/dbcp/migration/k8s/crd/Migration_27_v1_27_1_CreateSnapshotsFromZfsClones.java

@@ -0,0 +1,59 @@
+package com.linbit.linstor.dbcp.migration.k8s.crd;
+
+import com.linbit.linstor.ControllerK8sCrdDatabase;
+import com.linbit.linstor.dbcp.migration.Migration_2024_11_21_CreateSnapshotsFromZfsClones;
+import com.linbit.linstor.dbdrivers.k8s.crd.GenCrdV1_27_1;
+import com.linbit.linstor.dbdrivers.k8s.crd.GenCrdV1_27_1.NodeStorPool;
+import com.linbit.linstor.dbdrivers.k8s.crd.GenCrdV1_27_1.NodeStorPoolSpec;
+import com.linbit.linstor.storage.kinds.DeviceProviderKind;
+
+import static com.linbit.linstor.dbdrivers.k8s.crd.GenCrdV1_27_1.GeneratedDatabaseTables.NODE_STOR_POOL;
+import static com.linbit.linstor.dbdrivers.k8s.crd.GenCrdV1_27_1.GeneratedDatabaseTables.PROPS_CONTAINERS;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+@K8sCrdMigration(
+    description = "Add property for satellites to mark CF_ snapshots for deletion",
+    version = 27
+)
+public class Migration_27_v1_27_1_CreateSnapshotsFromZfsClones extends BaseK8sCrdMigration
+{
+    public Migration_27_v1_27_1_CreateSnapshotsFromZfsClones()
+    {
+        super(GenCrdV1_27_1.createMigrationContext());
+    }
+
+    @Override
+    public MigrationResult migrateImpl(ControllerK8sCrdDatabase k8sDbRef) throws Exception
+    {
+        Collection<NodeStorPool> crdList = txFrom.<NodeStorPool, NodeStorPoolSpec>getCrd(
+            NODE_STOR_POOL
+        ).values();
+
+        Set<String> alreadySet = new HashSet<>();
+        for (NodeStorPool nodeStorPoolCrd : crdList)
+        {
+            NodeStorPoolSpec nodeStorPoolSpec = nodeStorPoolCrd.getSpec();
+            if (nodeStorPoolSpec.driverName.equalsIgnoreCase(DeviceProviderKind.ZFS_THIN.name()) ||
+                nodeStorPoolSpec.driverName.equalsIgnoreCase(DeviceProviderKind.ZFS.name()))
+            {
+                if (!alreadySet.contains(nodeStorPoolSpec.nodeName))
+                {
+                    String propInstance = String.format("/NODES/%s", nodeStorPoolSpec.nodeName);
+                    txTo.create(PROPS_CONTAINERS,
+                        GenCrdV1_27_1.createPropsContainers(
+                            propInstance,
+                            Migration_2024_11_21_CreateSnapshotsFromZfsClones.PROP_KEY_STLT_MIGRATION,
+                            Migration_2024_11_21_CreateSnapshotsFromZfsClones.PROP_VALUE_STLT_MIGRATION
+                        )
+                    );
+                    alreadySet.add(nodeStorPoolSpec.nodeName);
+                }
+            }
+        }
+
+        return null;
+    }
+}