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

Timestamp:

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

Author:

Miroslav Cimerman <mc@…>

Children:

586b39d

Parents:

65706f1

Message:

hr: util: hotspare and volume change state functions

File:

• uspace/srv/bd/hr/raid1.c (modified) (11 diffs)

uspace/srv/bd/hr/raid1.c

@@ -147 +147 @@
 
         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++;
 
@@ -158 +159 @@
                 fid_t fib = fibril_create(hr_raid1_rebuild, vol);
                 if (fib == 0)
-                        return EINVAL;
+                        return ENOMEM;
                 fibril_start(fib);
                 fibril_detach(fib);
@@ -219 +220 @@
             vol->status == HR_VOL_REBUILD)
                 return EOK;
-        return EINVAL;
+        return EIO;
 }
 
@@ -232 +233 @@
 
         if (healthy == 0) {
-                if (old_state != HR_VOL_FAULTY) {
-                        HR_WARN("RAID 1 needs at least 1 extent to be"
-                            "ONLINE, marking \"%s\" (%lu) volume 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;
         } else if (healthy < vol->extent_no) {
                 if (old_state != HR_VOL_DEGRADED &&
                     old_state != HR_VOL_REBUILD) {
-                        HR_WARN("RAID 1 array \"%s\" (%lu) has some "
-                            "unusable extent(s), marking volume 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_raid1_rebuild,
                                     vol);
-                                if (fib == 0) {
-                                        return EINVAL;
-                                }
+                                if (fib == 0)
+                                        return ENOMEM;
                                 fibril_start(fib);
                                 fibril_detach(fib);
@@ -258 +253 @@
                 return EOK;
         } else {
-                if (old_state != HR_VOL_ONLINE) {
-                        HR_WARN("RAID 1 array \"%s\" (%lu) has all extents "
-                            "active, marking volume 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;
         }
@@ -297 +288 @@
 
         rc = hr_raid1_check_vol_status(vol);
-        if (rc != EOK) {
-                fibril_mutex_unlock(&vol->lock);
-                return EIO;
-        }
+        if (rc != EOK)
+                goto end;
 
         size_t successful = 0;
@@ -352 +341 @@
         default:
                 rc = EINVAL;
+                goto end;
         }
 
@@ -359 +349 @@
                 rc = EIO;
 
+end:
         (void)hr_raid1_update_vol_status(vol);
         fibril_mutex_unlock(&vol->lock);
@@ -400 +391 @@
         }
 
+        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_raid1_rebuild(): invalid hotspare state \"%s\", "
+                    "aborting rebuild\n", hr_get_ext_status_msg(hs_state));
+                rc = EINVAL;
+                goto end;
+        }
+
+        HR_DEBUG("hr_raid1_rebuild(): swapping in hotspare\n");
+
         block_fini(vol->extents[bad].svc_id);
 
-        size_t hotspare_idx = vol->hotspare_no - 1;
-
-        vol->rebuild_blk = 0;
         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_raid1_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_raid1_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_raid1_rebuild(): initing (%lu) failed, "
-                    "aborting rebuild\n", hotspare->svc_id);
+                    "aborting rebuild\n", rebuild_ext->svc_id);
                 goto end;
         }
+
+        HR_DEBUG("hr_raid1_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);
 
         size_t left = vol->data_blkno;
@@ -435 +434 @@
         hr_extent_t *ext;
 
+        vol->rebuild_blk = 0;
+
         size_t cnt;
         uint64_t ba = 0;
         hr_add_ba_offset(vol, &ba);
+
         while (left != 0) {
                 vol->rebuild_blk = ba;
@@ -462 +464 @@
                 }
 
-                rc = block_write_direct(hotspare->svc_id, ba, cnt, buf);
+                rc = block_write_direct(rebuild_ext->svc_id, ba, cnt, buf);
                 if (rc != EOK) {
                         hr_raid1_handle_extent_error(vol, bad, rc);