zfs fixes and default tank is on ssd now

bundles/gitea/metadata.py

@@ -55,6 +55,13 @@ defaults = {
             'home': '/home/git',
         },
     },
+    'zfs': {
+        'datasets': {
+            'tank/gitea': {
+                'mountpoint': '/var/lib/gitea',
+            },
+        },
+    },
 }
 
 
@@ -97,24 +104,6 @@ def conf(metadata):
     }
 
 
-@metadata_reactor.provides(
-    'zfs/datasets',
-)
-def zfs(metadata):
-    if not node.has_bundle('zfs'):
-        return {}
-
-    return {
-        'zfs': {
-            'datasets': {
-                f"{metadata.get('zfs/storage_classes/ssd')}/gitea": {
-                    'mountpoint': '/var/lib/gitea',
-                },
-            },
-        },
-    }
-
-
 @metadata_reactor.provides(
     'nginx/vhosts',
 )

bundles/influxdb2/items.py

@@ -5,7 +5,7 @@ directories['/var/lib/influxdb'] = {
     'owner': 'influxdb',
     'group': 'influxdb',
     'needs': [
-        f"zfs_dataset:{node.metadata.get('zfs/storage_classes/ssd')}/influxdb",
+        'zfs_dataset:tank/influxdb',
     ],
 }
 

bundles/influxdb2/metadata.py

@@ -52,7 +52,7 @@ def zfs(metadata):
     return {
         'zfs': {
             'datasets': {
-                f"{metadata.get('zfs/storage_classes/ssd')}/influxdb": {
+                'tank/influxdb': {
                     'mountpoint': '/var/lib/influxdb',
                     'recordsize': '8192',
                     'atime': 'off',

bundles/nextcloud/metadata.py

@@ -98,17 +98,25 @@ defaults = {
             'user': 'www-data',
         },
     },
-    'zfs': {
+}
-        'datasets': {
+
-            'tank/nextcloud': {
+
-                'mountpoint': '/var/lib/nextcloud',
+@metadata_reactor.provides(
-                'needed_by': [
+    'zfs/datasets',
-                    'bundle:nextcloud',
+)
-                ],
+def zfs(metadata):
+    return {
+        'zfs': {
+            'datasets': {
+                f"{metadata.get('zfs/storage_classes/hdd')}/nextcloud": {
+                    'mountpoint': '/var/lib/nextcloud',
+                    'needed_by': [
+                        'bundle:nextcloud',
+                    ],
+                },
             },
         },
-    },
+    }
-}
 
 
 @metadata_reactor.provides(

bundles/postgresql/items.py

@@ -9,7 +9,7 @@ directories = {
         'group': 'postgres',
         'needs': [
             'pkg_apt:postgresql',
-            f"zfs_dataset:{node.metadata.get('zfs/storage_classes/ssd')}/postgresql",
+            'zfs_dataset:tank/postgresql',
         ],
         'needed_by': [
             'svc_systemd:postgresql',

bundles/postgresql/metadata.py

@@ -64,7 +64,7 @@ def zfs(metadata):
     return {
         'zfs': {
             'datasets': {
-                f"{metadata.get('zfs/storage_classes/ssd')}/postgresql": {
+                'tank/postgresql': {
                     'mountpoint': '/var/lib/postgresql',
                     'recordsize': '8192',
                     'atime': 'off',

bundles/samba/items.py

@@ -51,7 +51,7 @@ for name, conf in node.metadata.get('samba/shares').items():
         'owner': name,
         'group': name,
         'needs': [
-            f'zfs_dataset:tank/samba/{name}',
+            f"zfs_dataset:{node.metadata.get('zfs/storage_classes/hdd')}/samba/{name}",
         ],
     }
 

bundles/samba/metadata.py

@@ -15,13 +15,6 @@ defaults = {
     'samba': {
         'shares': {},
     },
-    'zfs': {
-        'datasets': {
-            'tank/samba': {
-                'mountpoint': '/var/lib/samba',
-            },
-        },
-    },
 }
 
 
@@ -32,10 +25,15 @@ def zfs(metadata):
     return {
         'zfs': {
             'datasets': {
-                f'tank/samba/{name}': {
+                f"{metadata.get('zfs/storage_classes/hdd')}/samba": {
-                    'mountpoint': f'/var/lib/samba/usershares/{name}',
+                    'mountpoint': '/var/lib/samba',
-                }
+                },
-                    for name in metadata.get('samba/shares')
+                **{
+                    f"{metadata.get('zfs/storage_classes/hdd')}/samba/{name}": {
+                        'mountpoint': f'/var/lib/samba/usershares/{name}',
+                    }
+                        for name in metadata.get('samba/shares')
+                },
             },
         },
     }

bundles/zfs/README.md

@@ -0,0 +1,2 @@
+zpool iostat -v
+zdb -Lbbbs tank

bundles/zfs/metadata.py

@@ -61,7 +61,7 @@ defaults = {
         'pools': {},
         'kernel_params': {},
         'storage_classes': {
-            'ssd': 'tank',
+            'hdd': 'tank',
         },
         'auto_snapshots': {
             'hourly': 24,

nodes/home.server.py

@@ -168,27 +168,35 @@
         'zfs': {
             'zfs_arc_max_percent': 80,
             'storage_classes': {
-                'ssd': 'ssd',
+                'hdd': 'hdd',
             },
             'pools': {
                 'tank': {
+                    'type': 'mirror',
+                    'devices': [
+                        '/dev/disk/by-id/nvme-SAMSUNG_MZVL22T0HBLB-00B00_S677NF0RA01551-part1',
+                        '/dev/disk/by-id/nvme-SAMSUNG_MZVL22T0HBLB-00B00_S677NF0RA01566-part1',
+                    ],
+                },
+                'hdd': {
                     'type': 'mirror',
                     'devices': [
                         '/dev/disk/by-partlabel/zfs-data-1',
                         '/dev/disk/by-partlabel/zfs-data-2',
                     ],
                 },
-                'ssd': {
+            },
-                    'devices': [
-                        '/dev/disk/by-id/nvme-SAMSUNG_MZVL22T0HBLB-00B00_S677NF0RA01551-part3',
-                    ],
-                },
-                },
             'datasets': {
-                'ssd/nextcloud-appdata': {
+                'tank/nextcloud-appdata': {
                     'mountpoint': '/var/lib/nextcloud/appdata_oci6dw1woodz',
                     'backup': False,
-                }
+                },
+                'hdd/nextcloud/ckn': {
+                    'mountpoint': '/var/lib/nextcloud/ckn/files',
+                },
+                'hdd/nextcloud/ckn-privat': {
+                    'mountpoint': '/var/lib/nextcloud/ckn-privat/files',
+                },
             },
         },
     },