From owner-svn-src-projects@FreeBSD.ORG  Fri Feb  4 15:47:14 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 DEE40106564A;
	Fri,  4 Feb 2011 15:47:14 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CE3BE8FC08;
	Fri,  4 Feb 2011 15:47:14 +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 p14FlEgs089373;
	Fri, 4 Feb 2011 15:47:14 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p14FlE3x089371;
	Fri, 4 Feb 2011 15:47:14 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201102041547.p14FlE3x089371@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 4 Feb 2011 15:47:14 +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: r218281 - 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 &quot; projects&quot;
	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: Fri, 04 Feb 2011 15:47:15 -0000

Author: mav
Date: Fri Feb  4 15:47:14 2011
New Revision: 218281
URL: http://svn.freebsd.org/changeset/base/218281

Log:
  When volume is not idle, use shorter rebuild requests and truncate size of
  requests that already running. This should be a compromise between faster
  rebuild and lower payload performance degradation. Not exactly solution I
  would like to see, but still better.

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	Fri Feb  4 15:45:48 2011	(r218280)
+++ projects/graid/head/sys/geom/raid/tr_raid1.c	Fri Feb  4 15:47:14 2011	(r218281)
@@ -68,7 +68,7 @@ SYSCTL_UINT(_kern_geom_raid_raid1, OID_A
     &g_raid1_rebuild_fair_io, RAID1_REBUILD_FAIR_IO,
     "Fraction of the I/O bandwidth to use when disk busy for rebuild.");
 
-#define RAID1_REBUILD_CLUSTER_IDLE 10
+#define RAID1_REBUILD_CLUSTER_IDLE 100
 static int g_raid1_rebuild_cluster_idle = RAID1_REBUILD_CLUSTER_IDLE;
 TUNABLE_INT("kern.geom.raid.raid1.rebuild_cluster_idle",
     &g_raid1_rebuild_slab);
@@ -578,6 +578,8 @@ g_raid_tr_iostart_raid1(struct g_raid_tr
 	    !(bp->bio_cflags & G_RAID_BIO_FLAG_SPECIAL)) {
 		if (--trs->trso_fair_io <= 0)
 			g_raid_tr_raid1_rebuild_some(tr, trs->trso_failed_sd);
+		/* Make this new or running now round short. */
+		trs->trso_recover_slabs = 0;
 	}
 	switch (bp->bio_cmd) {
 	case BIO_READ: