Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move_spare function modified and moved to Manage.c 

It will also be needed for Incremental.

Signed-off-by: Anna Czarnowska <anna.czarnowska@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
Anna Czarnowska 2011-01-05 14:34:32 +11:00 committed by NeilBrown
parent 326727d9c9
commit d52bb542d4
3 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Manage.c
View File

@ -1096,4 +1096,48 @@ int Update_subarray(char *dev, char *subarray, char *update, struct mddev_ident
return rv;
}
/* Move spare from one array to another
* If adding to destination array fails
* add back to original array
* Returns 1 on success, 0 on failure */
int move_spare(char *from_devname, char *to_devname, dev_t devid)
{
struct mddev_dev devlist;
char devname[20];
/* try to remove and add */
int fd1 = open(to_devname, O_RDONLY);
int fd2 = open(from_devname, O_RDONLY);
if (fd1 < 0 || fd2 < 0) {
if (fd1>=0) close(fd1);
if (fd2>=0) close(fd2);
return 0;
}
devlist.next = NULL;
devlist.used = 0;
devlist.re_add = 0;
devlist.writemostly = 0;
devlist.devname = devname;
sprintf(devname, "%d:%d", major(devid), minor(devid));
devlist.disposition = 'r';
if (Manage_subdevs(from_devname, fd2, &devlist, -1, 0, NULL) == 0) {
devlist.disposition = 'a';
if (Manage_subdevs(to_devname, fd1, &devlist, -1, 0, NULL) == 0) {
/* make sure manager is aware of changes */
ping_manager(to_devname);
ping_manager(from_devname);
close(fd1);
close(fd2);
return 1;
}
else Manage_subdevs(from_devname, fd2, &devlist, -1, 0, NULL);
}
close(fd1);
close(fd2);
return 0;
}
#endif

51
Monitor.c
View File

@ -722,51 +722,6 @@ unsigned long long min_spare_size_required(struct state *st)
return rv;
}
static int move_spare(struct state *from, struct state *to,
dev_t devid,
struct alert_info *info)
{
struct mddev_dev devlist;
char devname[20];
/* try to remove and add */
int fd1 = open(to->devname, O_RDONLY);
int fd2 = open(from->devname, O_RDONLY);
if (fd1 < 0 || fd2 < 0) {
if (fd1>=0) close(fd1);
if (fd2>=0) close(fd2);
return 0;
}
devlist.next = NULL;
devlist.used = 0;
devlist.re_add = 0;
devlist.writemostly = 0;
devlist.devname = devname;
sprintf(devname, "%d:%d", major(devid), minor(devid));
devlist.disposition = 'r';
if (Manage_subdevs(from->devname, fd2, &devlist, -1, 0, NULL) == 0) {
devlist.disposition = 'a';
if (Manage_subdevs(to->devname, fd1, &devlist, -1, 0, NULL) == 0) {
alert("MoveSpare", to->devname, from->devname, info);
/* make sure we will see newly added spare before next
* time through loop
*/
ping_manager(to->devname);
ping_manager(from->devname);
close(fd1);
close(fd2);
return 1;
}
else Manage_subdevs(from->devname, fd2, &devlist, -1, 0, NULL);
}
close(fd1);
close(fd2);
return 0;
}
static int check_donor(struct state *from, struct state *to)
{
struct state *sub;
@ -912,8 +867,10 @@ static void try_spare_migration(struct state *statelist, struct alert_info *info
devid = choose_spare(from, to, domlist,
min_size);
if (devid > 0
&& move_spare(from, to, devid, info))
break;
&& move_spare(from->devname, to->devname, devid)) {
alert("MoveSpare", to->devname, from->devname, info);
break;
}
}
domain_free(domlist);
}

1
mdadm.h
View File

@ -1100,6 +1100,7 @@ extern struct mdinfo *container_choose_spares(struct supertype *st,
struct domainlist *domlist,
char *spare_group,
const char *metadata, int get_one);
extern int move_spare(char *from_devname, char *to_devname, dev_t devid);
extern int add_disk(int mdfd, struct supertype *st,
struct mdinfo *sra, struct mdinfo *info);
extern int remove_disk(int mdfd, struct supertype *st,