Date: Sun, 6 Feb 2011 10:21:33 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r218367 - projects/graid/head/sys/geom/raid Message-ID: <201102061021.p16ALXhr059999@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102061021.p16ALXhr059999>