Incremental mode: remove safety verification
v3 cover Incremental mode: remove safety verification
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(-)
Signature · 1 line
2.26.2
PATCH v3 1/3 Manage: do not check array state when drive is removed
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.
--- Manage.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Manage.c +1 -2
@@ -1322,8 +1322,7 @@ bool is_remove_safe(mdu_array_info_t *array, const int fd, char *devname, constsysfs_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;
Signature · 1 line
2.26.2
PATCH v3 2/3 incremental, manage: do not verify if remove is safe
In reply to Kinga TanskaFunction 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.
--- Incremental.c | 2 +- Manage.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-)
Incremental.c +1 -1
@@ -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 ) {
Manage.c +4 -3
@@ -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))) {
Signature · 1 line
2.26.2
PATCH v3 3/3 manage: move comment with function description
In reply to Kinga TanskaMove the function description from the function body to outside to obey kernel coding style.
--- Manage.c | 72 ++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 28 deletions(-)
Manage.c +44 -28
@@ -1328,38 +1328,54 @@ bool is_remove_safe(mdu_array_info_t *array, const int fd, char *devname, constreturn 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;
Signature · 1 line
2.26.2
Quoted 10 lines · Kinga Tanska
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
Quoted 7 lines
Incremental.c | 2 +- Manage.c | 82 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 50 insertions(+), 34 deletions(-)--
2.26.2
Quoted 4 lines · Kinga Tanska
Changes in incremental mode. Removing verification if remove is safe, when this mode is triggered. Also moving commit description to obey kernel coding style.
Quoted 9 lines
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 descriptionIncremental.c | 2 +- Manage.c | 82 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 50 insertions(+), 34 deletions(-)
Applied 1+2, 3 fails to apply for me.
Thanks,
Jes