Changeset a0c3080 in mainline for uspace/srv/bd/hr/raid5.c

Timestamp:

2024-11-28T17:09:52Z (7 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

586b39d

Parents:

65706f1

Message:

hr: util: hotspare and volume change state functions

File:

• uspace/srv/bd/hr/raid5.c (modified) (9 diffs)

uspace/srv/bd/hr/raid5.c

@@ -158 +158 @@
 
         vol->hotspares[vol->hotspare_no].svc_id = hotspare;
-        vol->hotspares[vol->hotspare_no].status = HR_EXT_HOTSPARE;
+        hr_update_hotspare_status(vol, vol->hotspare_no, HR_EXT_HOTSPARE);
+
         vol->hotspare_no++;
 
@@ -169 +170 @@
                 fid_t fib = fibril_create(hr_raid5_rebuild, vol);
                 if (fib == 0)
-                        return EINVAL;
+                        return ENOMEM;
                 fibril_start(fib);
                 fibril_detach(fib);
@@ -230 +231 @@
             vol->status == HR_VOL_REBUILD)
                 return EOK;
-        return EINVAL;
+        return EIO;
 }
 
@@ -255 +256 @@
         switch (bad) {
         case 0:
-                if (old_state != HR_VOL_ONLINE) {
-                        HR_WARN("RAID 5 has all extents online, "
-                            "marking \"%s\" (%lu) as ONLINE",
-                            vol->devname, vol->svc_id);
-                        vol->status = HR_VOL_ONLINE;
-                }
+                if (old_state != HR_VOL_ONLINE)
+                        hr_update_vol_status(vol, HR_VOL_ONLINE);
                 return EOK;
         case 1:
                 if (old_state != HR_VOL_DEGRADED &&
                     old_state != HR_VOL_REBUILD) {
-                        HR_WARN("RAID 5 array \"%s\" (%lu) has 1 extent "
-                            "inactive, marking as DEGRADED",
-                            vol->devname, vol->svc_id);
-                        vol->status = HR_VOL_DEGRADED;
+
+                        hr_update_vol_status(vol, HR_VOL_DEGRADED);
+
                         if (vol->hotspare_no > 0) {
                                 fid_t fib = fibril_create(hr_raid5_rebuild,
                                     vol);
-                                if (fib == 0) {
-                                        return EINVAL;
-                                }
+                                if (fib == 0)
+                                        return ENOMEM;
                                 fibril_start(fib);
                                 fibril_detach(fib);
@@ -281 +276 @@
                 return EOK;
         default:
-                if (old_state != HR_VOL_FAULTY) {
-                        HR_WARN("RAID 5 array \"%s\" (%lu) has more "
-                            "than one 1 extent inactive, marking as FAULTY",
-                            vol->devname, vol->svc_id);
-                        vol->status = HR_VOL_FAULTY;
-                }
-                return EINVAL;
+                if (old_state != HR_VOL_FAULTY)
+                        hr_update_vol_status(vol, HR_VOL_FAULTY);
+                return EIO;
         }
 }
@@ -560 +551 @@
 
         left = cnt;
+
         while (left != 0) {
                 phys_block = ext_stripe * strip_size + strip_off;
@@ -674 +666 @@
         }
 
+        size_t hotspare_idx = vol->hotspare_no - 1;
+
+        hr_ext_status_t hs_state = vol->hotspares[hotspare_idx].status;
+        if (hs_state != HR_EXT_HOTSPARE) {
+                HR_ERROR("hr_raid5_rebuild(): invalid hotspare state \"%s\", "
+                    "aborting rebuild\n", hr_get_ext_status_msg(hs_state));
+                rc = EINVAL;
+                goto end;
+        }
+
+        HR_DEBUG("hr_raid5_rebuild(): swapping in hotspare\n");
+
         block_fini(vol->extents[bad].svc_id);
 
-        size_t hotspare_idx = vol->hotspare_no - 1;
-
         vol->extents[bad].svc_id = vol->hotspares[hotspare_idx].svc_id;
-        hr_update_ext_status(vol, bad, HR_EXT_REBUILD);
+        hr_update_ext_status(vol, bad, HR_EXT_HOTSPARE);
 
         vol->hotspares[hotspare_idx].svc_id = 0;
-        vol->hotspares[hotspare_idx].status = HR_EXT_MISSING;
+        hr_update_hotspare_status(vol, hotspare_idx, HR_EXT_MISSING);
+
         vol->hotspare_no--;
 
-        HR_WARN("hr_raid5_rebuild(): changing volume \"%s\" (%lu) state "
-            "from %s to %s\n", vol->devname, vol->svc_id,
-            hr_get_vol_status_msg(vol->status),
-            hr_get_vol_status_msg(HR_VOL_REBUILD));
-        vol->status = HR_VOL_REBUILD;
-
-        hr_extent_t *hotspare = &vol->extents[bad];
-
-        HR_DEBUG("hr_raid5_rebuild(): initing (%lu)\n", hotspare->svc_id);
-
-        rc = block_init(hotspare->svc_id);
+        hr_extent_t *rebuild_ext = &vol->extents[bad];
+
+        rc = block_init(rebuild_ext->svc_id);
         if (rc != EOK) {
                 HR_ERROR("hr_raid5_rebuild(): initing (%lu) failed, "
-                    "aborting rebuild\n", hotspare->svc_id);
+                    "aborting rebuild\n", rebuild_ext->svc_id);
                 goto end;
         }
+
+        HR_DEBUG("hr_raid5_rebuild(): starting rebuild on (%lu)\n",
+            rebuild_ext->svc_id);
+
+        hr_update_ext_status(vol, bad, HR_EXT_REBUILD);
+        hr_update_vol_status(vol, HR_VOL_REBUILD);
 
         uint64_t max_blks = DATA_XFER_LIMIT / vol->bsize;
@@ -709 +710 @@
         uint64_t ba = 0, cnt;
         hr_add_ba_offset(vol, &ba);
+
         while (left != 0) {
                 cnt = min(left, max_blks);
@@ -741 +743 @@
                 }
 
-                rc = block_write_direct(hotspare->svc_id, ba, cnt, xorbuf);
+                rc = block_write_direct(rebuild_ext->svc_id, ba, cnt, xorbuf);
                 if (rc != EOK) {
                         hr_raid5_handle_extent_error(vol, bad, rc);