Changeset e0695ce in mainline for uspace/srv/bd/hr/util.c

Timestamp:

2025-06-23T16:50:43Z (9 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

6a8c1569

Parents:

f18e36e

git-author:

Miroslav Cimerman <mc@…> (2025-06-23 16:47:52)

git-committer:

Miroslav Cimerman <mc@…> (2025-06-23 16:50:43)

Message:

hr: save REBUILD position

File:

• uspace/srv/bd/hr/util.c (modified) (5 diffs)

uspace/srv/bd/hr/util.c

@@ -281 +281 @@
 
         /* save metadata, but we don't care about states anymore */
-        (void)vol->meta_ops->save(vol, NO_STATE_CALLBACK);
+        vol->meta_ops->save(vol, NO_STATE_CALLBACK);
 
         HR_NOTE("deactivating volume \"%s\"\n", vol->devname);
@@ -1117 +1117 @@
 {
         errno_t rc = EOK;
+        size_t bad = vol->extent_no;
 
         if (vol->level == HR_LVL_0)
@@ -1125 +1126 @@
         fibril_mutex_lock(&vol->hotspare_lock);
 
-        size_t bad = vol->extent_no;
+        if (vol->state != HR_VOL_DEGRADED) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        size_t rebuild = vol->extent_no;
         for (size_t i = 0; i < vol->extent_no; i++) {
-                if (vol->extents[i].state != HR_EXT_ONLINE) {
-                        bad = i;
+                if (vol->extents[i].state == HR_EXT_REBUILD) {
+                        rebuild = i;
                         break;
                 }
         }
 
-        if (bad == vol->extent_no)
-                rc = EINVAL;
-        else if (vol->state != HR_VOL_DEGRADED)
-                rc = EINVAL;
+        if (rebuild < vol->extent_no) {
+                bad = rebuild;
+                goto init_rebuild;
+        }
 
         size_t invalid = vol->extent_no;
@@ -1146 +1152 @@
         }
 
-        if (invalid < vol->extent_no)
+        if (invalid < vol->extent_no) {
                 bad = invalid;
-
-        if (bad != invalid && vol->hotspare_no == 0)
+                goto init_rebuild;
+        }
+
+        for (size_t i = 0; i < vol->extent_no; i++) {
+                if (vol->extents[i].state != HR_EXT_ONLINE) {
+                        bad = i;
+                        break;
+                }
+        }
+
+        if (bad == vol->extent_no || vol->hotspare_no == 0) {
                 rc = EINVAL;
-
-        if (rc != EOK)
-                goto error;
-
-        if (bad != invalid) {
-                size_t hotspare_idx = vol->hotspare_no - 1;
-
-                hr_ext_state_t hs_state = vol->hotspares[hotspare_idx].state;
-                if (hs_state != HR_EXT_HOTSPARE) {
-                        HR_ERROR("hr_raid1_rebuild(): invalid hotspare"
-                            "state \"%s\", aborting rebuild\n",
-                            hr_get_ext_state_str(hs_state));
-                        rc = EINVAL;
-                        goto error;
-                }
-
-                rc = hr_swap_hs(vol, bad, hotspare_idx);
-                if (rc != EOK) {
-                        HR_ERROR("hr_raid1_rebuild(): swapping "
-                            "hotspare failed, aborting rebuild\n");
-                        goto error;
-                }
+                goto error;
+        }
+
+        size_t hotspare_idx = vol->hotspare_no - 1;
+
+        hr_ext_state_t hs_state = vol->hotspares[hotspare_idx].state;
+        if (hs_state != HR_EXT_HOTSPARE) {
+                HR_ERROR("hr_raid1_rebuild(): invalid hotspare"
+                    "state \"%s\", aborting rebuild\n",
+                    hr_get_ext_state_str(hs_state));
+                rc = EINVAL;
+                goto error;
+        }
+
+        rc = hr_swap_hs(vol, bad, hotspare_idx);
+        if (rc != EOK) {
+                HR_ERROR("hr_raid1_rebuild(): swapping "
+                    "hotspare failed, aborting rebuild\n");
+                goto error;
         }
 
@@ -1180 +1192 @@
             "(%"  PRIun  ")\n", bad, rebuild_ext->svc_id);
 
-        atomic_store_explicit(&vol->rebuild_blk, 0, memory_order_relaxed);
-
+init_rebuild:
         hr_update_ext_state(vol, bad, HR_EXT_REBUILD);
         hr_update_vol_state(vol, HR_VOL_REBUILD);