Changeset e0695ce in mainline for uspace/srv/bd/hr/raid5.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/raid5.c (modified) (8 diffs)

uspace/srv/bd/hr/raid5.c

@@ -150 +150 @@
 
         vol->meta_ops->inc_counter(vol);
-        (void)vol->meta_ops->save(vol, WITH_STATE_CALLBACK);
+        vol->meta_ops->save(vol, WITH_STATE_CALLBACK);
 
         hr_raid5_vol_state_eval_forced(vol);
@@ -610 +610 @@
 
         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);
@@ -625 +627 @@
 
                 if (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_raid5_rebuild,
                                     vol);
@@ -720 +722 @@
 
         uint64_t max_blks = DATA_XFER_LIMIT / vol->bsize;
-        uint64_t left = vol->data_blkno / (vol->extent_no - 1);
+        uint64_t left =
+            vol->data_blkno / (vol->extent_no - 1) - vol->rebuild_blk;
         buf = hr_malloc_waitok(max_blks * vol->bsize);
         xorbuf = hr_malloc_waitok(max_blks * vol->bsize);
@@ -726 +729 @@
         uint64_t strip_size = vol->strip_size / vol->bsize; /* in blocks */
 
-        uint64_t ba = 0, cnt;
+        size_t cnt;
+        uint64_t ba = vol->rebuild_blk;
         hr_add_data_offset(vol, &ba);
 
@@ -747 +751 @@
             false);
 
+        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) {
@@ -810 +818 @@
                 }
 
+                if (written * vol->bsize > HR_REBUILD_SAVE_BYTES) {
+                        vol->meta_ops->save(vol, WITH_STATE_CALLBACK);
+                        written = 0;
+                }
+
                 hr_range_lock_release(rl);
                 hr_reset_stripe(stripe);
 
+                written += cnt;
                 ba += cnt;
                 left -= cnt;
+                old_percent = percent;
 
                 /*
@@ -829 +844 @@
         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);