d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 'rebuild' command (we ignore retaste event now, so don't relay on it).

Browse Source
This commit is contained in:
pjd 2005-01-03 19:42:37 +00:00
parent ae4b449ab4
commit fcf90f45eb
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/geom/mirror/g_mirror.c
View File

@ -2320,7 +2320,7 @@ g_mirror_update_disk(struct g_mirror_disk *disk, u_int state)
}
#undef DISK_STATE_CHANGED
static int
int
g_mirror_read_metadata(struct g_consumer *cp, struct g_mirror_metadata *md)
{
struct g_provider *pp;
@ -2434,7 +2434,7 @@ g_mirror_check_metadata(struct g_mirror_softc *sc, struct g_provider *pp,
return (0);
}
static int
int
g_mirror_add_disk(struct g_mirror_softc *sc, struct g_provider *pp,
struct g_mirror_metadata *md)
{

3
sys/geom/mirror/g_mirror.h
View File

@ -202,6 +202,9 @@ u_int g_mirror_ndisks(struct g_mirror_softc *sc, int state);
int g_mirror_destroy(struct g_mirror_softc *sc, boolean_t force);
int g_mirror_event_send(void *arg, int state, int flags);
struct g_mirror_metadata;
int g_mirror_add_disk(struct g_mirror_softc *sc, struct g_provider *pp,
struct g_mirror_metadata *md);
int g_mirror_read_metadata(struct g_consumer *cp, struct g_mirror_metadata *md);
void g_mirror_fill_metadata(struct g_mirror_softc *sc,
struct g_mirror_disk *disk, struct g_mirror_metadata *md);
void g_mirror_update_metadata(struct g_mirror_disk *disk);

27
sys/geom/mirror/g_mirror_ctl.c
View File

@ -198,11 +198,13 @@ g_mirror_ctl_configure(struct gctl_req *req, struct g_class *mp)
static void
g_mirror_ctl_rebuild(struct gctl_req *req, struct g_class *mp)
{
struct g_mirror_metadata md;
struct g_mirror_softc *sc;
struct g_mirror_disk *disk;
struct g_provider *pp;
const char *name;
char param[16];
int *nargs;
int error, *nargs;
u_int i;
g_topology_assert();
@ -250,16 +252,28 @@ g_mirror_ctl_rebuild(struct gctl_req *req, struct g_class *mp)
return;
}
/*
* Do rebuild by resetting syncid and disconnecting disk.
* It'll be retasted, connected to the mirror and
* synchronized.
* Do rebuild by resetting syncid, disconnecting the disk and
* connecting it again.
*/
disk->d_sync.ds_syncid = 0;
if ((sc->sc_flags & G_MIRROR_DEVICE_FLAG_NOAUTOSYNC) != 0)
disk->d_flags |= G_MIRROR_DISK_FLAG_FORCE_SYNC;
g_mirror_update_metadata(disk);
pp = disk->d_consumer->provider;
error = g_mirror_read_metadata(disk->d_consumer, &md);
g_mirror_event_send(disk, G_MIRROR_DISK_STATE_DISCONNECTED,
G_MIRROR_EVENT_WAIT);
if (error != 0) {
gctl_error(req, "Cannot read metadata from %s.",
pp->name);
continue;
}
error = g_mirror_add_disk(sc, pp, &md);
if (error != 0) {
gctl_error(req, "Cannot reconnect component %s.",
pp->name);
continue;
}
}
}
@ -519,11 +533,6 @@ g_mirror_ctl_deactivate(struct gctl_req *req, struct g_class *mp)
gctl_error(req, "No such provider: %s.", name);
continue;
}
/*
* Do rebuild by resetting syncid and disconnecting disk.
* It'll be retasted, connected to the mirror and
* synchronized.
*/
disk->d_flags |= G_MIRROR_DISK_FLAG_INACTIVE;
disk->d_flags &= ~G_MIRROR_DISK_FLAG_FORCE_SYNC;
g_mirror_update_metadata(disk);