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

Timestamp:

2025-06-23T16:50:43Z (5 weeks 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/raid1.c (modified) (9 diffs)

uspace/srv/bd/hr/raid1.c

@@ -153 +153 @@
 
         vol->meta_ops->inc_counter(vol);
-        (void)vol->meta_ops->save(vol, WITH_STATE_CALLBACK);
+        vol->meta_ops->save(vol, WITH_STATE_CALLBACK);
 
         hr_raid1_vol_state_eval_forced(vol);
@@ -194 +194 @@
         size_t invalid_no = hr_count_extents(vol, HR_EXT_INVALID);
 
+        size_t rebuild_no = hr_count_extents(vol, HR_EXT_REBUILD);
+
         fibril_mutex_lock(&vol->hotspare_lock);
         size_t hs_no = vol->hotspare_no;
@@ -216 +218 @@
 
                 if (old_state != HR_VOL_REBUILD) {
-                        if (hs_no > 0 || invalid_no > 0) {
+                        if (hs_no > 0 || invalid_no > 0 || rebuild_no > 0) {
                                 fid_t fib = fibril_create(hr_raid1_rebuild,
                                     vol);
@@ -443 +445 @@
 }
 
-/*
- * Put the last HOTSPARE extent in place
- * of first that != ONLINE, and start the rebuild.
- */
 static errno_t hr_raid1_rebuild(void *arg)
 {
@@ -463 +461 @@
         rebuild_ext = &vol->extents[rebuild_idx];
 
-        size_t left = vol->data_blkno;
+        size_t left = vol->data_blkno - vol->rebuild_blk;
         size_t max_blks = DATA_XFER_LIMIT / vol->bsize;
         buf = hr_malloc_waitok(max_blks * vol->bsize);
 
         size_t cnt;
-        uint64_t ba = 0;
+        uint64_t ba = vol->rebuild_blk;
         hr_add_data_offset(vol, &ba);
 
@@ -487 +485 @@
         hr_range_lock_t *rl = NULL;
 
+        HR_NOTE("\"%s\": REBUILD started on extent no. %zu at block %lu.\n",
+            vol->devname, rebuild_idx, ba);
+
+        uint64_t written = 0;
         unsigned int percent, old_percent = 100;
         while (left != 0) {
@@ -517 +519 @@
                 }
 
+                if (written * vol->bsize > HR_REBUILD_SAVE_BYTES) {
+                        vol->meta_ops->save(vol, WITH_STATE_CALLBACK);
+                        written = 0;
+                }
+
                 hr_range_lock_release(rl);
 
+                written += cnt;
                 ba += cnt;
                 left -= cnt;
@@ -531 +539 @@
         hr_update_ext_state(vol, rebuild_idx, HR_EXT_ONLINE);
 
+        atomic_store_explicit(&vol->rebuild_blk, 0, memory_order_relaxed);
+
         hr_mark_vol_state_dirty(vol);
 
         fibril_rwlock_write_unlock(&vol->states_lock);
-
-        /* (void)vol->meta_ops->save(vol, WITH_STATE_CALLBACK); */
-
 end:
         fibril_rwlock_read_unlock(&vol->extents_lock);
@@ -542 +549 @@
         hr_raid1_vol_state_eval(vol);
 
-        if (buf != NULL)
-                free(buf);
+        free(buf);
 
         return rc;