Skip to contentSkip to conversation

Add more info to --detail

PATCH New David Greaves 1 participant 1 message Jun 4, 2004 MD RAID

lore
Share & tools
lore

David Greaves

author
#0 lore raw

PATCH 1/1 Add more info to --detail

Hello Neil

I've modded mdadm's ouptut (see below for example)

* adds a blank line after 'Raid Devices' disks to visually show those in the array and those not (sounds trivial but actually helped me understand the output a lot better)
* parses /proc/mdstat and indicates which disk is rebuilding

It would be nicer if the GET_DISK_INFO ioctl could return more info into but I have no real idea how to approach this. What are the issues about adding to the ioctl interface? (just been looking through md.c to find out what info is there though... and there's a lot to tell userland)

Anyway sample output:

/dev/md0:

       Version : 00.90.01

Creation Time : Fri Jun 4 13:03:09 2004
Raid Level : raid5
Array Size : 2939520 (2.80 GiB 3.01 GB)
Device Size : 979840 (956.88 MiB 1003.36 MB)
Raid Devices : 4
Total Devices : 5
Preferred Minor : 0
Persistence : Superblock is persistent

Update Time : Fri Jun 4 15:44:47 2004
State : clean, degraded, recovering
Active Devices : 3
Working Devices : 4
Failed Devices : 1
Spare Devices : 1

Layout : left-symmetric
Chunk Size : 128K

Rebuild Status : 2% complete

Number Major Minor RaidDevice State

      0       8        1        0      active sync   /dev/sda1
      1       8       17        1      active sync   /dev/sdb1
      2       0        0       -1      removed
      3       8        2        3      active sync   /dev/sda2
      4       8       34        2      rebuilding spare   /dev/sdc2
      5       8       33       -1      faulty   /dev/sdc1
          UUID : f06ab9bd:c29b9f86:12b668e4:84c7333b
        Events : 0.6390

Here's the patch, I'm no C expert so you'll want to double check :) (I'd appreciate any feedback too)

David

Detail.c +19 -5
diff -u mdadm-1.6.0-orig/Detail.c mdadm-1.6.0-dg/Detail.c
@@ -47,6 +47,8 @@
 	char *devices = NULL;
 	int spares = 0;
 	struct stat stb;
+	struct mdstat_ent *ms;
+	struct mdstat_ent *e;
 
 	mdp_super_t super;
 	int have_super = 0;

@@ -85,13 +87,12 @@
 	rv = 0;
 	/* Ok, we have some info to print... */
 	c = map_num(pers, array.level);
+	ms = mdstat_read(0);
 	if (brief) 
 		printf("ARRAY %s level=%s num-devices=%d", dev, c?c:"-unknown-",array.raid_disks );
 	else {
 		unsigned long array_size;
 		unsigned long long larray_size;
-		struct mdstat_ent *ms = mdstat_read(0);
-		struct mdstat_ent *e;
 		int devnum = array.md_minor;
 		if (MAJOR(stb.st_rdev) != MD_MAJOR)
 			devnum = -1 - devnum;

@@ -109,7 +110,7 @@
 				larray_size <<= 9;
 			}
 		
-		else larray_size = 0;
+			else larray_size = 0;
 
 		printf("%s:\n", dev);
 		printf("        Version : %02d.%02d.%02d\n",

@@ -158,12 +159,12 @@
 
 		if (e && e->percent >= 0)
 			printf(" Rebuild Status : %d%% complete\n\n", e->percent);
-		free_mdstat(ms);
 
 		printf("    Number   Major   Minor   RaidDevice State\n");
 	}
 	for (d= 0; d<MD_SB_DISKS; d++) {
 		mdu_disk_info_t disk;
+		struct mdstat_ent_devinfo *msdi;
 		char *dv;
 		disk.number = d;
 		if (ioctl(fd, GET_DISK_INFO, &disk) < 0) {

@@ -177,13 +178,24 @@
 		    disk.minor == 0)
 			continue;
 		if (!brief) {
+			if (disk.number == array.raid_disks) printf("\n");
 			printf("   %5d   %5d    %5d    %5d     ", 
 			       disk.number, disk.major, disk.minor, disk.raid_disk);
 			if (disk.state & (1<<MD_DISK_FAULTY)) printf(" faulty");
 			if (disk.state & (1<<MD_DISK_ACTIVE)) printf(" active");
 			if (disk.state & (1<<MD_DISK_SYNC)) printf(" sync");
 			if (disk.state & (1<<MD_DISK_REMOVED)) printf(" removed");
-			if (disk.state == 0) { printf(" spare"); spares++; }
+			/*			if (disk.state == 0) { printf(" spare"); spares++; } */
+			if (disk.state == 0) {
+				spares++;
+				if (e && e->percent >= 0)
+					/* a disk is rebuilding */
+					/* look through mdstat response and see if it's me*/
+					for (msdi=ms->devinfo;msdi;msdi=msdi->next)
+						if (msdi->arr_pos == disk.number)
+							printf(" rebuilding");
+				printf(" spare");
+			}
 		}
 		if (test && d < array.raid_disks && disk.state & (1<<MD_DISK_FAULTY)) {
 			if ((rv & 1) && (array.level ==4 || array.level == 5))

@@ -214,6 +226,8 @@
 		}
 		if (!brief) printf("\n");
 	}
+	free_mdstat(ms);
+
 	if (spares && brief) printf(" spares=%d", spares);
 	if (have_super) {
 		if (brief) printf(" UUID=");
md_p.h +1 -1
diff -u mdadm-1.6.0-orig/md_p.h mdadm-1.6.0-dg/md_p.h
@@ -77,7 +77,7 @@
 #define MD_DISK_FAULTY		0 /* disk is faulty / operational */
 #define MD_DISK_ACTIVE		1 /* disk is running or spare disk */
 #define MD_DISK_SYNC		2 /* disk is in sync with the raid set */
-#define MD_DISK_REMOVED		3 /* disk is in sync with the raid set */
+#define MD_DISK_REMOVED		3 /* disk is out / in the raid set */
 
 typedef struct mdp_device_descriptor_s {
 	__u32 number;		/* 0 Device number in the entire set	      */
mdadm.h +7 -0
diff -u mdadm-1.6.0-orig/mdadm.h mdadm-1.6.0-dg/mdadm.h
@@ -129,8 +129,15 @@
 } mapping_t;
 
 
+struct mdstat_ent_devinfo {
+	char		*name;   /* eg hdd, sda1 */
+	int		arr_pos; /* 0->arr_disks means active, higher is spare */
+	struct mdstat_ent_devinfo *next;
+};
+
 struct mdstat_ent {
 	char		*dev;
+	struct mdstat_ent_devinfo *devinfo;
 	int		devnum;
 	int		active;
 	char		*level;
mdstat.c +41 -4

77 lines not on this page · raw message