Changeset cf28ffd3 in mainline

Timestamp:

2024-10-28T22:19:45Z (8 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

1cfa162

Parents:

d84773a

Message:

hr: add option to silently fail an extent

Location:

uspace

Files:

• app/hrctl/hrctl.c (modified) (6 diffs)
• lib/device/include/hr.h (modified) (1 diff)
• lib/device/src/hr.c (modified) (2 diffs)
• srv/bd/hr/hr.c (modified) (2 diffs)

uspace/app/hrctl/hrctl.c

@@ -59 +59 @@
     "  -s, --status              display status of active arrays\n"
     "  -T, --stop                stop an active array\n"
+    "  -F, --fail-extent         fail an extent, use with -T and set it before\n"
     "  -c, --create=NAME         create new array\n"
     "  -a, --assemble=NAME       assemble an existing array\n"
@@ -88 +89 @@
         { "assemble-file", required_argument, 0, 'A' },
         { "stop", required_argument, 0, 'T' },
+        { "fail-extent", required_argument, 0, 'F' },
         { 0, 0, 0, 0 }
 };
@@ -220 +222 @@
         int retval, c;
         bool create, assemble;
+        long fail_extent = -1;
         hr_t *hr;
         hr_config_t *cfg;
@@ -241 +244 @@
 
         while (c != -1) {
-                c = getopt_long(argc, argv, "hsC:c:A:a:l:0145Ln:T:",
+                c = getopt_long(argc, argv, "hsC:c:A:a:l:0145Ln:T:F:",
                     long_options, NULL);
                 switch (c) {
@@ -286 +289 @@
                         break;
                 case 'T':
-                        rc = hr_stop(optarg);
+                        rc = hr_stop(optarg, fail_extent);
                         free(cfg);
                         if (rc != EOK) {
@@ -295 +298 @@
                         }
                         return 0;
+                case 'F':
+                        fail_extent = strtol(optarg, NULL, 10);
+                        break;
                 case 'l':
                         if (cfg->level != HR_LVL_UNKNOWN)

uspace/lib/device/include/hr.h

@@ -97 +97 @@
 
 extern errno_t hr_create(hr_t *, hr_config_t *, bool);
-extern errno_t hr_stop(const char *);
+extern errno_t hr_stop(const char *, long);
 extern errno_t hr_print_status(void);
 

uspace/lib/device/src/hr.c

@@ -169 +169 @@
 }
 
-errno_t hr_stop(const char *devname)
+errno_t hr_stop(const char *devname, long extent)
 {
         hr_t *hr;
@@ -189 +189 @@
                 goto error;
         }
-        rc = async_req_1_0(exch, HR_STOP, svc_id);
+        rc = async_req_2_0(exch, HR_STOP, svc_id, extent);
         async_exchange_end(exch);
 

uspace/srv/bd/hr/hr.c

@@ -255 +255 @@
         log_msg(LOG_DEFAULT, LVL_NOTE, "hr_stop_srv()");
 
-        errno_t rc;
+        errno_t rc = EOK;
         service_id_t svc_id;
+        long fail_extent;
         hr_volume_t *vol;
 
         svc_id = ipc_get_arg1(icall);
+        fail_extent = (long) ipc_get_arg2(icall);
 
         vol = hr_get_volume(svc_id);
@@ -267 +269 @@
         }
 
-        rc = hr_remove_volume(svc_id);
-        if (rc != EOK) {
-                async_answer_0(icall, rc);
-                return;
-        }
-
-        rc = loc_service_unregister(hr_srv, svc_id);
-
+        if (fail_extent == -1) {
+                rc = hr_remove_volume(svc_id);
+                if (rc != EOK) {
+                        async_answer_0(icall, rc);
+                        return;
+                }
+                rc = loc_service_unregister(hr_srv, svc_id);
+        } else {
+                /* fibril safe for now */
+                fibril_mutex_lock(&vol->lock);
+                hr_update_ext_status(vol, fail_extent, HR_EXT_FAILED);
+                fibril_mutex_unlock(&vol->lock);
+        }
         async_answer_0(icall, rc);
 }