* [PATCH v3 0/3] Incremental mode: remove safety verification
@ 2022-12-27 5:50 Kinga Tanska
2022-12-27 5:50 ` [PATCH v3 1/3] Manage: do not check array state when drive is removed Kinga Tanska
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Kinga Tanska @ 2022-12-27 5:50 UTC (permalink / raw)
To: linux-raid; +Cc: jes, colyli, xni
Changes in incremental mode. Removing verification
if remove is safe, when this mode is triggered. Also
moving commit description to obey kernel coding style.
Kinga Tanska (3):
Manage: do not check array state when drive is removed
incremental, manage: do not verify if remove is safe
manage: move comment with function description
Incremental.c | 2 +-
Manage.c | 82 ++++++++++++++++++++++++++++++---------------------
2 files changed, 50 insertions(+), 34 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 1/3] Manage: do not check array state when drive is removed
2022-12-27 5:50 [PATCH v3 0/3] Incremental mode: remove safety verification Kinga Tanska
@ 2022-12-27 5:50 ` Kinga Tanska
2022-12-27 5:50 ` [PATCH v3 2/3] incremental, manage: do not verify if remove is safe Kinga Tanska
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Kinga Tanska @ 2022-12-27 5:50 UTC (permalink / raw)
To: linux-raid; +Cc: jes, colyli, xni
Array state doesn't need to be checked when drive is
removed, but until now clean state was required. Result
of the is_remove_safe() function will be independent
from array state.
Signed-off-by: Kinga Tanska <kinga.tanska@intel.com>
---
Manage.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Manage.c b/Manage.c
index b1d0e630..157a2b98 100644
--- a/Manage.c
+++ b/Manage.c
@@ -1322,8 +1322,7 @@ bool is_remove_safe(mdu_array_info_t *array, const int fd, char *devname, const
sysfs_free(mdi);
bool is_enough = enough(array->level, array->raid_disks,
- array->layout, (array->state & 1),
- avail);
+ array->layout, 1, avail);
free(avail);
return is_enough;
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 2/3] incremental, manage: do not verify if remove is safe
2022-12-27 5:50 [PATCH v3 0/3] Incremental mode: remove safety verification Kinga Tanska
2022-12-27 5:50 ` [PATCH v3 1/3] Manage: do not check array state when drive is removed Kinga Tanska
@ 2022-12-27 5:50 ` Kinga Tanska
2022-12-27 5:50 ` [PATCH v3 3/3] manage: move comment with function description Kinga Tanska
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Kinga Tanska @ 2022-12-27 5:50 UTC (permalink / raw)
To: linux-raid; +Cc: jes, colyli, xni
Function is_remove_safe() was introduced to verify if removing
member device won't cause failed state of the array. This
verification should be used only with set-faulty command. Add
special mode indicating that Incremental removal was executed.
If this mode is used do not execute is_remove_safe() routine.
Signed-off-by: Kinga Tanska <kinga.tanska@intel.com>
---
Incremental.c | 2 +-
Manage.c | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Incremental.c b/Incremental.c
index 5a5f4c4c..bccfdeb9 100644
--- a/Incremental.c
+++ b/Incremental.c
@@ -1744,7 +1744,7 @@ int IncrementalRemove(char *devname, char *id_path, int verbose)
memset(&devlist, 0, sizeof(devlist));
devlist.devname = devname;
- devlist.disposition = 'f';
+ devlist.disposition = 'I';
/* for a container, we must fail each member array */
if (ent->metadata_version &&
strncmp(ent->metadata_version, "external:", 9) == 0) {
diff --git a/Manage.c b/Manage.c
index 157a2b98..48b479a7 100644
--- a/Manage.c
+++ b/Manage.c
@@ -1495,8 +1495,9 @@ int Manage_subdevs(char *devname, int fd,
/* Assume this is a kernel-internal name like 'sda1' */
int found = 0;
char dname[55];
- if (dv->disposition != 'r' && dv->disposition != 'f') {
- pr_err("%s only meaningful with -r or -f, not -%c\n",
+ if (dv->disposition != 'r' && dv->disposition != 'f' &&
+ dv->disposition != 'I') {
+ pr_err("%s only meaningful with -r, -f or -I, not -%c\n",
dv->devname, dv->disposition);
goto abort;
}
@@ -1648,7 +1649,7 @@ int Manage_subdevs(char *devname, int fd,
close(sysfd);
goto abort;
}
-
+ case 'I': /* incremental fail */
if ((sysfd >= 0 && write(sysfd, "faulty", 6) != 6) ||
(sysfd < 0 && ioctl(fd, SET_DISK_FAULTY,
rdev))) {
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 3/3] manage: move comment with function description
2022-12-27 5:50 [PATCH v3 0/3] Incremental mode: remove safety verification Kinga Tanska
2022-12-27 5:50 ` [PATCH v3 1/3] Manage: do not check array state when drive is removed Kinga Tanska
2022-12-27 5:50 ` [PATCH v3 2/3] incremental, manage: do not verify if remove is safe Kinga Tanska
@ 2022-12-27 5:50 ` Kinga Tanska
2022-12-28 8:12 ` [PATCH v3 0/3] Incremental mode: remove safety verification Xiao Ni
2023-01-05 3:38 ` Jes Sorensen
4 siblings, 0 replies; 6+ messages in thread
From: Kinga Tanska @ 2022-12-27 5:50 UTC (permalink / raw)
To: linux-raid; +Cc: jes, colyli, xni
Move the function description from the function body to outside
to obey kernel coding style.
Signed-off-by: Kinga Tanska <kinga.tanska@intel.com>
Acked-by: Paul Menzel <pmenzel@molgen.mpg.de>
---
Manage.c | 72 ++++++++++++++++++++++++++++++++++----------------------
1 file changed, 44 insertions(+), 28 deletions(-)
diff --git a/Manage.c b/Manage.c
index 48b479a7..eee25fd8 100644
--- a/Manage.c
+++ b/Manage.c
@@ -1328,38 +1328,54 @@ bool is_remove_safe(mdu_array_info_t *array, const int fd, char *devname, const
return is_enough;
}
+/**
+ * Manage_subdevs() - Execute operation depending on devmode.
+ *
+ * @devname: name of the device.
+ * @fd: file descriptor.
+ * @devlist: list of sub-devices to manage.
+ * @verbose: verbose level.
+ * @test: test flag.
+ * @update: type of update.
+ * @force: force flag.
+ *
+ * This function executes operation defined by devmode
+ * for each dev from devlist.
+ * Devmode can be:
+ * 'a' - add the device
+ * 'S' - add the device as a spare - don't try re-add
+ * 'j' - add the device as a journal device
+ * 'A' - re-add the device
+ * 'r' - remove the device: HOT_REMOVE_DISK
+ * device can be 'faulty' or 'detached' in which case all
+ * matching devices are removed.
+ * 'f' - set the device faulty SET_DISK_FAULTY
+ * device can be 'detached' in which case any device that
+ * is inaccessible will be marked faulty.
+ * 'I' - remove device by using incremental fail
+ * which is executed when device is removed surprisingly.
+ * 'R' - mark this device as wanting replacement.
+ * 'W' - this device is added if necessary and activated as
+ * a replacement for a previous 'R' device.
+ * -----
+ * 'w' - 'W' will be changed to 'w' when it is paired with
+ * a 'R' device. If a 'W' is found while walking the list
+ * it must be unpaired, and is an error.
+ * 'M' - this is created by a 'missing' target. It is a slight
+ * variant on 'A'
+ * 'F' - Another variant of 'A', where the device was faulty
+ * so must be removed from the array first.
+ * 'c' - confirm the device as found (for clustered environments)
+ *
+ * For 'f' and 'r', the device can also be a kernel-internal
+ * name such as 'sdb'.
+ *
+ * Return: 0 on success, otherwise 1 or 2.
+ */
int Manage_subdevs(char *devname, int fd,
struct mddev_dev *devlist, int verbose, int test,
char *update, int force)
{
- /* Do something to each dev.
- * devmode can be
- * 'a' - add the device
- * 'S' - add the device as a spare - don't try re-add
- * 'j' - add the device as a journal device
- * 'A' - re-add the device
- * 'r' - remove the device: HOT_REMOVE_DISK
- * device can be 'faulty' or 'detached' in which case all
- * matching devices are removed.
- * 'f' - set the device faulty SET_DISK_FAULTY
- * device can be 'detached' in which case any device that
- * is inaccessible will be marked faulty.
- * 'R' - mark this device as wanting replacement.
- * 'W' - this device is added if necessary and activated as
- * a replacement for a previous 'R' device.
- * -----
- * 'w' - 'W' will be changed to 'w' when it is paired with
- * a 'R' device. If a 'W' is found while walking the list
- * it must be unpaired, and is an error.
- * 'M' - this is created by a 'missing' target. It is a slight
- * variant on 'A'
- * 'F' - Another variant of 'A', where the device was faulty
- * so must be removed from the array first.
- * 'c' - confirm the device as found (for clustered environments)
- *
- * For 'f' and 'r', the device can also be a kernel-internal
- * name such as 'sdb'.
- */
mdu_array_info_t array;
unsigned long long array_size;
struct mddev_dev *dv;
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3 0/3] Incremental mode: remove safety verification
2022-12-27 5:50 [PATCH v3 0/3] Incremental mode: remove safety verification Kinga Tanska
` (2 preceding siblings ...)
2022-12-27 5:50 ` [PATCH v3 3/3] manage: move comment with function description Kinga Tanska
@ 2022-12-28 8:12 ` Xiao Ni
2023-01-05 3:38 ` Jes Sorensen
4 siblings, 0 replies; 6+ messages in thread
From: Xiao Ni @ 2022-12-28 8:12 UTC (permalink / raw)
To: Kinga Tanska; +Cc: linux-raid, jes, colyli
On Tue, Dec 27, 2022 at 8:49 PM Kinga Tanska <kinga.tanska@intel.com> wrote:
>
> Changes in incremental mode. Removing verification
> if remove is safe, when this mode is triggered. Also
> moving commit description to obey kernel coding style.
>
> Kinga Tanska (3):
> Manage: do not check array state when drive is removed
> incremental, manage: do not verify if remove is safe
> manage: move comment with function description
>
> Incremental.c | 2 +-
> Manage.c | 82 ++++++++++++++++++++++++++++++---------------------
> 2 files changed, 50 insertions(+), 34 deletions(-)
>
> --
> 2.26.2
>
Acked-by: Xiao Ni <xni@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 0/3] Incremental mode: remove safety verification
2022-12-27 5:50 [PATCH v3 0/3] Incremental mode: remove safety verification Kinga Tanska
` (3 preceding siblings ...)
2022-12-28 8:12 ` [PATCH v3 0/3] Incremental mode: remove safety verification Xiao Ni
@ 2023-01-05 3:38 ` Jes Sorensen
4 siblings, 0 replies; 6+ messages in thread
From: Jes Sorensen @ 2023-01-05 3:38 UTC (permalink / raw)
To: Kinga Tanska, linux-raid; +Cc: colyli, xni
On 12/27/22 00:50, Kinga Tanska wrote:
> Changes in incremental mode. Removing verification
> if remove is safe, when this mode is triggered. Also
> moving commit description to obey kernel coding style.
>
> Kinga Tanska (3):
> Manage: do not check array state when drive is removed
> incremental, manage: do not verify if remove is safe
> manage: move comment with function description
>
> Incremental.c | 2 +-
> Manage.c | 82 ++++++++++++++++++++++++++++++---------------------
> 2 files changed, 50 insertions(+), 34 deletions(-)
>
Applied 1+2, 3 fails to apply for me.
Thanks,
Jes
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-01-05 3:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-27 5:50 [PATCH v3 0/3] Incremental mode: remove safety verification Kinga Tanska
2022-12-27 5:50 ` [PATCH v3 1/3] Manage: do not check array state when drive is removed Kinga Tanska
2022-12-27 5:50 ` [PATCH v3 2/3] incremental, manage: do not verify if remove is safe Kinga Tanska
2022-12-27 5:50 ` [PATCH v3 3/3] manage: move comment with function description Kinga Tanska
2022-12-28 8:12 ` [PATCH v3 0/3] Incremental mode: remove safety verification Xiao Ni
2023-01-05 3:38 ` Jes Sorensen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.