From owner-svn-src-projects@FreeBSD.ORG Sun Feb 6 10:21:33 2011 Return-Path: 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 D7539106564A; Sun, 6 Feb 2011 10:21:33 +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 AB1A98FC0C; Sun, 6 Feb 2011 10:21:33 +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 p16ALXj0060002; Sun, 6 Feb 2011 10:21:33 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p16ALXhr059999; Sun, 6 Feb 2011 10:21:33 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201102061021.p16ALXhr059999@svn.freebsd.org> From: Alexander Motin Date: Sun, 6 Feb 2011 10:21:33 +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: r218367 - 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 10:21:33 -0000 Author: mav Date: Sun Feb 6 10:21:33 2011 New Revision: 218367 URL: http://svn.freebsd.org/changeset/base/218367 Log: Log subdisks as "vol:pos-disk". New first part could be event more important then the second. Modified: projects/graid/head/sys/geom/raid/g_raid.c projects/graid/head/sys/geom/raid/tr_raid1.c Modified: projects/graid/head/sys/geom/raid/g_raid.c ============================================================================== --- projects/graid/head/sys/geom/raid/g_raid.c Sun Feb 6 09:49:55 2011 (r218366) +++ projects/graid/head/sys/geom/raid/g_raid.c Sun Feb 6 10:21:33 2011 (r218367) @@ -332,15 +332,6 @@ g_raid_get_diskname(struct g_raid_disk * return (disk->d_consumer->provider->name); } -static const char * -g_raid_get_subdiskname(struct g_raid_subdisk *subdisk) -{ - - if (subdisk->sd_disk == NULL) - return ("[unknown]"); - return (g_raid_get_diskname(subdisk->sd_disk)); -} - void g_raid_report_disk_state(struct g_raid_disk *disk) { @@ -392,8 +383,9 @@ void g_raid_change_subdisk_state(struct g_raid_subdisk *sd, int state) { - G_RAID_DEBUG(1, "Subdisk %s state changed from %s to %s.", - g_raid_get_subdiskname(sd), + G_RAID_DEBUG(1, "Subdisk %s:%d-%s state changed from %s to %s.", + sd->sd_volume->v_name, sd->sd_pos, + sd->sd_disk ? g_raid_get_diskname(sd->sd_disk) : "[none]", g_raid_subdisk_state2str(sd->sd_state), g_raid_subdisk_state2str(state)); sd->sd_state = state; @@ -1408,9 +1400,10 @@ g_raid_update_subdisk(struct g_raid_subd vol = sd->sd_volume; sx_assert(&sc->sc_lock, SX_XLOCKED); - G_RAID_DEBUG(3, "Event %s for subdisk %s.", + G_RAID_DEBUG(2, "Event %s for subdisk %s:%d-%s.", g_raid_subdisk_event2str(event), - g_raid_get_subdiskname(sd)); + vol->v_name, sd->sd_pos, + sd->sd_disk ? g_raid_get_diskname(sd->sd_disk) : "[none]"); if (vol->v_tr) G_RAID_TR_EVENT(vol->v_tr, sd, event); Modified: projects/graid/head/sys/geom/raid/tr_raid1.c ============================================================================== --- projects/graid/head/sys/geom/raid/tr_raid1.c Sun Feb 6 09:49:55 2011 (r218366) +++ projects/graid/head/sys/geom/raid/tr_raid1.c Sun Feb 6 10:21:33 2011 (r218367) @@ -195,8 +195,8 @@ g_raid_tr_update_state_raid1(struct g_ra if (bestsd->sd_state >= G_RAID_SUBDISK_S_UNINITIALIZED) { /* We found reasonable candidate. */ G_RAID_DEBUG(1, - "Promote subdisk %d from %s to ACTIVE.", - bestsd->sd_pos, + "Promote subdisk %s:%d from %s to ACTIVE.", + vol->v_name, bestsd->sd_pos, g_raid_subdisk_state2str(bestsd->sd_state)); g_raid_change_subdisk_state(bestsd, G_RAID_SUBDISK_S_ACTIVE);