From owner-svn-src-projects@FreeBSD.ORG Wed Jan 26 21:22:07 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 1FBE0106564A;
Wed, 26 Jan 2011 21:22:07 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id E94F08FC14;
Wed, 26 Jan 2011 21:22:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0QLM6wl090585;
Wed, 26 Jan 2011 21:22:06 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0QLM6rq090583;
Wed, 26 Jan 2011 21:22:06 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201101262122.p0QLM6rq090583@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 26 Jan 2011 21:22:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r217912 - projects/graid/head/sys/geom/raid
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Jan 2011 21:22:07 -0000
Author: imp
Date: Wed Jan 26 21:22:06 2011
New Revision: 217912
URL: http://svn.freebsd.org/changeset/base/217912
Log:
Guard against the case where we don't have an extra disk to rebuild.
Modified:
projects/graid/head/sys/geom/raid/tr_raid1.c
Modified: projects/graid/head/sys/geom/raid/tr_raid1.c
==============================================================================
--- projects/graid/head/sys/geom/raid/tr_raid1.c Wed Jan 26 21:14:20 2011 (r217911)
+++ projects/graid/head/sys/geom/raid/tr_raid1.c Wed Jan 26 21:22:06 2011 (r217912)
@@ -66,12 +66,12 @@ struct g_raid_tr_raid1_object {
struct g_raid_tr_object trso_base;
int trso_starting;
int trso_stopped;
- int trso_type; /* From here down */
- int trso_recover_slabs; /* might need to be more */
+ int trso_type;
+ int trso_recover_slabs; /* might need to be more */
int trso_fair_io;
- struct g_raid_subdisk *trso_good_sd; /* specific rather than per tr */
- struct g_raid_subdisk *trso_failed_sd; /* like per volume */
- void *trso_buffer; /* Buffer space */
+ struct g_raid_subdisk *trso_good_sd; /* specific rather than per tr */
+ struct g_raid_subdisk *trso_failed_sd;/* like per volume */
+ void *trso_buffer; /* Buffer space */
};
static g_raid_tr_taste_t g_raid_tr_taste_raid1;
@@ -153,6 +153,8 @@ g_raid_tr_raid1_idle_rebuild(struct g_ra
struct g_raid_tr_raid1_object *trs;
trs = (struct g_raid_tr_raid1_object *)argp;
+ if (trs->trso_good_sd == NULL || trs->trso_failed_sd == NULL)
+ return;
g_raid_event_send(trs->trso_failed_sd, G_RAID_SUBDISK_E_TR_REBUILD_SOME,
G_RAID_EVENT_SUBDISK);
}
@@ -223,6 +225,12 @@ g_raid_tr_raid1_rebuild_start(struct g_r
}
trs->trso_good_sd = g_raid_tr_raid1_find_good_drive(vol);
trs->trso_failed_sd = g_raid_tr_raid1_find_failed_drive(vol);
+ if (trs->trso_good_sd == NULL || trs->trso_failed_sd == NULL) {
+ G_RAID_DEBUG(1, "No failed disk to rebuild. night night.");
+ return;
+ }
+ G_RAID_DEBUG(2, "Kicking off a rebuild...");
+ trs->trso_type = TR_RAID1_REBUILD;
trs->trso_failed_sd->sd_rebuild_pos = 0;
trs->trso_buffer = malloc(SD_REBUILD_SLAB, M_TR_raid1, M_WAITOK);
/* XXX what else do I need to setup the first time? */