>From 8bb25810edded4aa047c246b3e241cc1cb43f0d3 Mon Sep 17 00:00:00 2001
From: Anna Czarnowska <anna.czarnowska@xxxxxxxxx>
Date: Fri, 23 Jul 2010 22:45:20 +0200
Subject: [PATCH 21/35] Monitor: removed spare-group based spare sharing code
This will conflict with spare sharing based on domains
Signed-off-by: Anna Czarnowska <anna.czarnowska@xxxxxxxxx>
---
Monitor.c | 71 -------------------------------------------------------------
1 files changed, 0 insertions(+), 71 deletions(-)
diff --git a/Monitor.c b/Monitor.c
index c8bc9dd..5a2cae1 100644
--- a/Monitor.c
+++ b/Monitor.c
@@ -74,11 +74,6 @@ int Monitor(mddev_dev_t devlist,
* DeviceDisappeared
* Couldn't access a device which was previously visible
*
- * if we detect an array with active<raid and spare==0
- * we look at other arrays that have same spare-group
- * If we find one with active==raid and spare>0,
- * and if we can get_disk_info and find a name
- * Then we hot-remove and hot-add to the other array
*
* If devlist is NULL, then we can monitor everything because --scan
* was given. We get an initial list from config file and add anything
@@ -90,7 +85,6 @@ int Monitor(mddev_dev_t devlist,
int devnum; /* to sync with mdstat info */
long utime;
int err;
- char *spare_group;
int active, working, failed, spare, raid;
int expected_spares;
int devstate[MaxDisks];
@@ -173,10 +167,6 @@ int Monitor(mddev_dev_t devlist,
st->devnum = INT_MAX;
st->percent = -2;
st->expected_spares = mdlist->spare_disks;
- if (mdlist->spare_group)
- st->spare_group = strdup(mdlist->spare_group);
- else
- st->spare_group = NULL;
statelist = st;
}
} else {
@@ -193,11 +183,8 @@ int Monitor(mddev_dev_t devlist,
st->devnum = INT_MAX;
st->percent = -2;
st->expected_spares = -1;
- st->spare_group = NULL;
if (mdlist) {
st->expected_spares = mdlist->spare_disks;
- if (mdlist->spare_group)
- st->spare_group = strdup(mdlist->spare_group);
}
statelist = st;
}
@@ -439,7 +426,6 @@ int Monitor(mddev_dev_t devlist,
st->err = 1;
st->devnum = mse->devnum;
st->percent = -2;
- st->spare_group = NULL;
st->expected_spares = -1;
statelist = st;
if (test)
@@ -448,64 +434,7 @@ int Monitor(mddev_dev_t devlist,
new_found = 1;
}
}
- /* If an array has active < raid && spare == 0 && spare_group != NULL
- * Look for another array with spare > 0 and active == raid and same spare_group
- * if found, choose a device and hotremove/hotadd
- */
- for (st = statelist; st; st=st->next)
- if (st->active < st->raid &&
- st->spare == 0 &&
- st->spare_group != NULL) {
- struct state *st2;
- for (st2=statelist ; st2 ; st2=st2->next)
- if (st2 != st &&
- st2->spare > 0 &&
- st2->active == st2->raid &&
- st2->spare_group != NULL &&
- strcmp(st->spare_group, st2->spare_group) == 0) {
- /* try to remove and add */
- int fd1 = open(st->devname, O_RDONLY);
- int fd2 = open(st2->devname, O_RDONLY);
- int dev = -1;
- int d;
- if (fd1 < 0 || fd2 < 0) {
- if (fd1>=0) close(fd1);
- if (fd2>=0) close(fd2);
- continue;
- }
- for (d=st2->raid; d < MaxDisks; d++) {
- if (st2->devid[d] > 0 &&
- st2->devstate[d] == 0) {
- dev = st2->devid[d];
- break;
- }
- }
- if (dev > 0) {
- struct mddev_dev_s devlist;
- char devname[20];
- devlist.next = NULL;
- devlist.used = 0;
- devlist.re_add = 0;
- devlist.writemostly = 0;
- devlist.devname = devname;
- sprintf(devname, "%d:%d", major(dev), minor(dev));
-
- devlist.disposition = 'r';
- if (Manage_subdevs(st2->devname, fd2, &devlist, -1) == 0) {
- devlist.disposition = 'a';
- if (Manage_subdevs(st->devname, fd1, &devlist, -1) == 0) {
- alert("MoveSpare", st->devname, st2->devname, mailaddr, mailfrom, alert_cmd, dosyslog);
- close(fd1);
- close(fd2);
- break;
- }
- else Manage_subdevs(st2->devname, fd2, &devlist, -1);
- }
- }
- close(fd1);
- close(fd2);
- }
- }
+
if (!new_found) {
if (oneshot)
break;
--
1.6.4.2
---------------------------------------------------------------------
Intel Technology Poland sp. z o.o.
z siedziba w Gdansku
ul. Slowackiego 173
80-298 Gdansk
Sad Rejonowy Gdansk Polnoc w Gdansku,
VII Wydzial Gospodarczy Krajowego Rejestru Sadowego,
numer KRS 101882
NIP 957-07-52-316
Kapital zakladowy 200.000 zl
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
--
To unsubscribe from this list: send the line "unsubscribe linux-raid" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
