Merge branch 'main' into dev-hutch

Author: Hutch-45D

ceph-osd-rocksdb-resharding-reef.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+#rocksdb-resharding
+
+ceph osd set noout
+
+for i in $(ceph osd ls-tree $(hostname -s)); do
+    echo "Resharding OSD $i"
+    OSD_DIR="/var/lib/ceph/osd/ceph-$i";
+    if [ ! -d "$OSD_DIR" ]; then
+        echo "$OSD_DIR does not exist on $(hostname -s), skipping"
+        continue
+    fi
+    echo "$OSD_DIR exists on $(hostname -s), running reshard"
+    set -x
+    systemctl stop ceph-osd@$i
+    ceph-bluestore-tool --path $OSD_DIR fsck
+    ceph-bluestore-tool --path $OSD_DIR --sharding="m(3) p(3,0-12) O(3,0-13)=block_cache={type=binned_lru} L=min_write_buffer_number_to_merge=32 P=min_write_buffer_number_to_merge=32" reshard
+    ceph-bluestore-tool --path $OSD_DIR show-sharding
+    ceph-bluestore-tool --path $OSD_DIR fsck
+    systemctl start ceph-osd@$i
+    set +x
+done
+ceph osd unset noout

rbd_info.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# Define formatting for the table
+printf "%-35s %-22s %-22s %-22s\n" "IMAGE NAME" "CREATED" "ACCESSED (Meta)" "MODIFIED (Meta)"
+printf "%-35s %-22s %-22s %-22s\n" "----------" "-------" "---------------" "---------------"
+
+# 1. Find all enabled RBD storages from Proxmox config
+pvesm status -content images | awk '$2=="rbd" {print $1}' | while read STOREID; do
+
+    # Get the actual Ceph pool name for this storage
+    POOL=$(grep -A5 "rbd: $STOREID" /etc/pve/storage.cfg | grep "pool" | awk '{print $2}')
+    
+    # Fallback if pool detection fails (default is often 'rbd')
+    if [ -z "$POOL" ]; then POOL="rbd"; fi
+
+    # 2. List all images in the pool
+    rbd -p "$POOL" --namespace pve ls | while read IMAGE; do
+        
+        # 3. Get Info from RBD
+        # We capture the whole output to a variable to avoid calling rbd info 3 times
+        INFO=$(rbd info "$POOL/$IMAGE" --namespace pve 2>/dev/null)
+        
+        # Extract timestamps
+        c_time=$(echo "$INFO" | grep "create_timestamp" | awk -F': ' '{print $2}')
+        a_time=$(echo "$INFO" | grep "access_timestamp" | awk -F': ' '{print $2}')
+        m_time=$(echo "$INFO" | grep "modify_timestamp" | awk -F': ' '{print $2}')
+
+        # Handle empty results (older Ceph versions might not show all 3)
+        if [ -z "$c_time" ]; then c_time="-"; fi
+        if [ -z "$a_time" ]; then a_time="-"; fi
+        if [ -z "$m_time" ]; then m_time="-"; fi
+
+        # Print row
+        printf "%-35s %-22s %-22s %-22s\n" "${IMAGE:0:34}" "$c_time" "$a_time" "$m_time"
+
+    done
+done

rocky9-preconfig.sh

@@ -149,9 +149,9 @@ install_zfs() {
     # Enable the zfs repo if not already
     dnf config-manager --set-enabled zfs
 
-    echo "Installing dependencies: dkms, kernel headers, ZFS"
+    echo "Installing dependencies: dkms, kernel headers, ZFS, ZFS-dkms"
     dnf install -y epel-release
-    dnf install -y dkms gcc make perl kernel-devel kernel-headers zfs
+    dnf install -y dkms gcc make perl kernel-devel kernel-headers zfs zfs-dkms
     res=$?
     if [[ $res != 0 ]]; then 
         echo "ZFS and dependencies install failed"
@@ -195,7 +195,7 @@ houston_configuration() {
     crb enable
     dnf install -y \
         cockpit cockpit-benchmark cockpit-navigator cockpit-file-sharing \
-        cockpit-45drives-hardware cockpit-identities cockpit-bridge cockpit-storaged cockpit-scheduler cockpit-zfs zfs zfs-dkms nano tuned 
+        cockpit-45drives-hardware cockpit-identities cockpit-bridge cockpit-storaged cockpit-scheduler cockpit-zfs nano tuned
     res=$?
     if [[ $res != 0 ]]; then
         echo "Error Installing Cockpit"