From owner-svn-src-projects@FreeBSD.ORG  Mon Feb  7 15:47:44 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 461AD106566B;
	Mon,  7 Feb 2011 15:47:44 +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 35DB68FC13;
	Mon,  7 Feb 2011 15:47:44 +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 p17Fli7r014183;
	Mon, 7 Feb 2011 15:47:44 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p17FliMZ014181;
	Mon, 7 Feb 2011 15:47:44 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201102071547.p17FliMZ014181@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 7 Feb 2011 15:47:44 +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: r218405 - 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: Mon, 07 Feb 2011 15:47:44 -0000

Author: mav
Date: Mon Feb  7 15:47:43 2011
New Revision: 218405
URL: http://svn.freebsd.org/changeset/base/218405

Log:
  Measure rebuild_meta_update in rebuild slabs, not in clusters of slabs.
  It is more stable and predictable unit.

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	Mon Feb  7 15:30:11 2011	(r218404)
+++ projects/graid/head/sys/geom/raid/tr_raid1.c	Mon Feb  7 15:47:43 2011	(r218405)
@@ -76,7 +76,7 @@ SYSCTL_UINT(_kern_geom_raid_raid1, OID_A
     &g_raid1_rebuild_cluster_idle, RAID1_REBUILD_CLUSTER_IDLE,
     "Number of slabs to do each time we trigger a rebuild cycle");
 
-#define RAID1_REBUILD_META_UPDATE 500 /* update meta data every 5 GB or so */
+#define RAID1_REBUILD_META_UPDATE 1024 /* update meta data every 1GB or so */
 static int g_raid1_rebuild_meta_update = RAID1_REBUILD_META_UPDATE;
 TUNABLE_INT("kern.geom.raid.raid1.rebuild_meta_update",
     &g_raid1_rebuild_slab);
@@ -691,13 +691,13 @@ g_raid_tr_iodone_raid1(struct g_raid_tr_
 					return;
 				}
 
+				if (--trs->trso_meta_update <= 0) {
+					g_raid_write_metadata(vol->v_softc,
+					    vol, nsd, nsd->sd_disk);
+					trs->trso_meta_update =
+					    g_raid1_rebuild_meta_update;
+				}
 				if (--trs->trso_recover_slabs <= 0) {
-					if (--trs->trso_meta_update <= 0) {
-						g_raid_write_metadata(vol->v_softc,
-						    vol, nsd, nsd->sd_disk);
-						trs->trso_meta_update =
-						    g_raid1_rebuild_meta_update;
-					}
 					trs->trso_flags &= ~TR_RAID1_F_DOING_SOME;
 					return;
 				}