Changeset e47a032 in mainline for uspace/srv/bd

Timestamp:

2024-10-28T20:02:39Z (15 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

9fc1d36d

Parents:

066fed9

Message:

hr: base for status handling

Location:

uspace/srv/bd/hr

Files:

• hr.c (modified) (2 diffs)
• superblock.c (modified) (3 diffs)
• util.c (modified) (5 diffs)
• util.h (modified) (1 diff)
• var.h (modified) (1 diff)

uspace/srv/bd/hr/hr.c

@@ -134 +134 @@
         }
 
+        /*
+         * If there was a missing device provided
+         * for creation of a new array, abort
+         */
+        if (!assemble) {
+                for (i = 0; i < cfg->dev_no; i++) {
+                        if (cfg->devs[i] == 0) {
+                                free(cfg);
+                                async_answer_0(icall, EINVAL);
+                                return;
+                        }
+                }
+        }
+
         new_volume = calloc(1, sizeof(hr_volume_t));
         if (new_volume == NULL) {
@@ -302 +316 @@
                 info.strip_size = volume->strip_size;
                 info.bsize = volume->bsize;
+                info.status = volume->status;
 
                 if (!async_data_read_receive(&call, &size)) {

uspace/srv/bd/hr/superblock.c

@@ -121 +121 @@
 }
 
-
 errno_t hr_fill_vol_from_meta(hr_volume_t *vol)
 {
@@ -134 +133 @@
 
         service_id_t cfg_svc_id_order[HR_MAXDEVS] = { 0 };
-        for (size_t i = 0; i < vol->dev_no; i++)
+        for (size_t i = 0; i < vol->dev_no; i++) {
                 cfg_svc_id_order[i] = vol->extents[i].svc_id;
-
-
-        uint32_t md_order[HR_MAXDEVS] = { 0 };
+                vol->extents[i].svc_id = 0;
+                vol->extents[i].status = HR_EXT_MISSING;
+        }
+
+        int32_t md_order[HR_MAXDEVS] = { 0 };
         for (size_t i = 0; i < vol->dev_no; i++) {
+                if (cfg_svc_id_order[i] == 0) {
+                        md_order[i] = -1;
+                        continue;
+                }
                 rc = read_metadata(cfg_svc_id_order[i], metadata);
                 if (rc != EOK)
@@ -149 +154 @@
         }
 
-        for (size_t i = 0; i < vol->dev_no; i++)
-                for (size_t j = 0; j < vol->dev_no; j++)
-                        if (i == md_order[j])
+        for (size_t i = 0; i < vol->dev_no; i++) {
+                for (size_t j = 0; j < vol->dev_no; j++) {
+                        if (i == (uint32_t) md_order[j]) {
                                 vol->extents[i].svc_id = cfg_svc_id_order[j];
+                                vol->extents[i].status = HR_EXT_ONLINE;
+                        }
+                }
+        }
 
         /*

uspace/srv/bd/hr/util.c

@@ -56 +56 @@
 
         for (i = 0; i < vol->dev_no; i++) {
+                if (vol->extents[i].svc_id == 0) {
+                        vol->extents[i].status = HR_EXT_MISSING;
+                        continue;
+                }
                 rc = block_init(vol->extents[i].svc_id);
+                vol->extents[i].status = HR_EXT_ONLINE;
                 log_msg(LOG_DEFAULT, LVL_DEBUG,
-                    "hr_init_devs(): initing (%" PRIun ")", vol->extents[i].svc_id);
+                    "hr_init_devs(): initing (%" PRIun ")",
+                    vol->extents[i].svc_id);
                 if (rc != EOK) {
                         log_msg(LOG_DEFAULT, LVL_ERROR,
@@ -77 +83 @@
 
         for (i = 0; i < vol->dev_no; i++)
-                block_fini(vol->extents[i].svc_id);
+                if (vol->extents[i].status != HR_EXT_MISSING)
+                        block_fini(vol->extents[i].svc_id);
 }
 
@@ -127 +134 @@
 
         errno_t rc;
-        size_t i, bsize, last_bsize;
-        uint64_t nblocks, last_nblocks;
+        size_t i, bsize;
+        uint64_t nblocks;
+        size_t last_bsize = 0;
+        uint64_t last_nblocks = 0;
         uint64_t total_blocks = 0;
 
         for (i = 0; i < vol->dev_no; i++) {
+                if (vol->extents[i].status == HR_EXT_MISSING)
+                        continue;
                 rc = block_get_nblocks(vol->extents[i].svc_id, &nblocks);
                 if (rc != EOK)
                         goto error;
-                if (i != 0 && nblocks != last_nblocks) {
+                if (last_nblocks != 0 && nblocks != last_nblocks) {
                         log_msg(LOG_DEFAULT, LVL_ERROR,
                             "number of blocks differs");
@@ -146 +157 @@
 
         for (i = 0; i < vol->dev_no; i++) {
+                if (vol->extents[i].status == HR_EXT_MISSING)
+                        continue;
                 rc = block_get_bsize(vol->extents[i].svc_id, &bsize);
                 if (rc != EOK)
                         goto error;
-                if (i != 0 && bsize != last_bsize) {
+                if (last_bsize != 0 && bsize != last_bsize) {
                         log_msg(LOG_DEFAULT, LVL_ERROR, "block sizes differ");
                         rc = EINVAL;
@@ -177 +190 @@
 }
 
+void hr_update_ext_status(hr_volume_t *vol, uint64_t extent, hr_ext_status_t s)
+{
+        log_msg(LOG_DEFAULT, LVL_WARN,
+            "vol %s, changing extent: %lu, to status: %s",
+            vol->devname, extent, hr_get_ext_status_msg(s));
+        vol->extents[extent].status = s;
+}
+
 /** @}
  */

uspace/srv/bd/hr/util.h

@@ -44 +44 @@
 extern void hr_fini_devs(hr_volume_t *);
 extern errno_t hr_register_volume(hr_volume_t *);
-errno_t hr_check_devs(hr_volume_t *, uint64_t *, size_t *);
-errno_t hr_check_ba_range(hr_volume_t *, size_t, uint64_t);
-void hr_add_ba_offset(hr_volume_t *, uint64_t *);
+extern errno_t hr_check_devs(hr_volume_t *, uint64_t *, size_t *);
+extern errno_t hr_check_ba_range(hr_volume_t *, size_t, uint64_t);
+extern void hr_add_ba_offset(hr_volume_t *, uint64_t *);
+extern void hr_update_ext_status(hr_volume_t *, uint64_t, hr_ext_status_t);
 
 #endif

uspace/srv/bd/hr/var.h

@@ -67 +67 @@
         size_t dev_no;
         hr_level_t level;
+        hr_vol_status_t status;
 } hr_volume_t;