(no commit message)

[thirdparty/mdadm.git] / Detail.c

diff --git a/Detail.c b/Detail.c
index 001012a211cb38e85c8499222a0a0756f8f880ee..3d6b10fdb6a98e932e2636197d434ac004c73382 100644 (file)
--- a/Detail.c
+++ b/Detail.c
@@ -174,7 +174,7 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
                        if (sra && sra->array.major_version < 0)
                                printf("MD_METADATA=%s\n", sra->text_version);
                        else
-                               printf("MD_METADATA=%d.%02d\n",
+                               printf("MD_METADATA=%d.%d\n",
                                       array.major_version, array.minor_version);
                }
                
@@ -194,7 +194,12 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
                                st->ss->export_detail_super(st);
                } else {
                        struct map_ent *mp, *map = NULL;
+                       char nbuf[64];
                        mp = map_by_devnum(&map, fd2devnum(fd));
+                       if (mp) {
+                               __fname_from_uuid(mp->uuid, 0, nbuf, ':');
+                               printf("MD_UUID=%s\n", nbuf+5);
+                       }
                        if (mp && mp->path &&
                            strncmp(mp->path, "/dev/md/", 8) == 0)
                                printf("MD_DEVNAME=%s\n", mp->path+8);
@@ -202,16 +207,52 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
                goto out;
        }
 
+       disks = malloc(max_disks * sizeof(mdu_disk_info_t));
+       for (d=0; d<max_disks; d++) {
+               disks[d].state = (1<<MD_DISK_REMOVED);
+               disks[d].major = disks[d].minor = 0;
+               disks[d].number = disks[d].raid_disk = d;
+       }
+
+       next = array.raid_disks;
+       for (d=0; d < max_disks; d++) {
+               mdu_disk_info_t disk;
+               disk.number = d;
+               if (ioctl(fd, GET_DISK_INFO, &disk) < 0) {
+                       if (d < array.raid_disks)
+                               fprintf(stderr, Name ": cannot get device detail for device %d: %s\n",
+                                       d, strerror(errno));
+                       continue;
+               }
+               if (disk.major == 0 && disk.minor == 0)
+                       continue;
+               if (disk.raid_disk >= 0 && disk.raid_disk < array.raid_disks)
+                       disks[disk.raid_disk] = disk;
+               else if (next < max_disks)
+                       disks[next++] = disk;
+       }
+
+       avail = calloc(array.raid_disks, 1);
+
+       for (d= 0; d < array.raid_disks; d++) {
+               mdu_disk_info_t disk = disks[d];
+
+               if ((disk.state & (1<<MD_DISK_SYNC))) {
+                       avail_disks ++;
+                       avail[d] = 1;
+               }
+       }
+
        if (brief) {
                mdu_bitmap_file_t bmf;
                printf("ARRAY %s", dev);
                if (brief > 1) {
                        if (array.raid_disks)
-                               printf("level=%s num-devices=%d",
+                               printf(" level=%s num-devices=%d",
                                       c?c:"-unknown-",
                                       array.raid_disks );
                        else
-                               printf("level=container num-devices=%d",
+                               printf(" level=container num-devices=%d",
                                       array.nr_disks);
                }
                if (container) {
@@ -221,7 +262,7 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
                        if (sra && sra->array.major_version < 0)
                                printf(" metadata=%s", sra->text_version);
                        else
-                               printf(" metadata=%d.%02d",
+                               printf(" metadata=%d.%d",
                                       array.major_version, array.minor_version);
                }
 
@@ -254,7 +295,7 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
                if (sra && sra->array.major_version < 0)
                        printf("        Version : %s\n", sra->text_version);
                else
-                       printf("        Version : %d.%02d\n",
+                       printf("        Version : %d.%d\n",
                               array.major_version, array.minor_version);
                }
 
@@ -301,13 +342,23 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
                atime = array.utime;
                if (atime)
                        printf("    Update Time : %.24s\n", ctime(&atime));
-               if (array.raid_disks)
+               if (array.raid_disks) {
+                       char *st;
+                       if (avail_disks == array.raid_disks)
+                               st = "";
+                       else if (!enough(array.level, array.raid_disks,
+                                        array.layout, 1, avail, avail_disks))
+                               st = ", FAILED";
+                       else
+                               st = ", degraded";
+
                        printf("          State : %s%s%s%s\n",
                               (array.state&(1<<MD_SB_CLEAN))?"clean":"active",
-                              array.active_disks < array.raid_disks? ", degraded":"",
+                              st,
                               (!e || e->percent < 0) ? "" :
                               (e->resync) ? ", resyncing": ", recovering",
                               larray_size ? "": ", Not Started");
+               }
                if (array.raid_disks)
                        printf(" Active Devices : %d\n", array.active_disks);
                printf("Working Devices : %d\n", array.working_disks);
@@ -320,6 +371,10 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
                        c = map_num(r5layout, array.layout);
                        printf("         Layout : %s\n", c?c:"-unknown-");
                }
+               if (array.level == 6) {
+                       c = map_num(r6layout, array.layout);
+                       printf("         Layout : %s\n", c?c:"-unknown-");
+               }
                if (array.level == 10) {
                        printf("         Layout :");
                        print_r10_layout(array.layout);
@@ -373,6 +428,11 @@ This is pretty boring
                                        printf("     New Layout : %s\n",
                                               c?c:"-unknown-");
                                }
+                               if (info.new_level == 6) {
+                                       char *c = map_num(r6layout, info.new_layout);
+                                       printf("     New Layout : %s\n",
+                                              c?c:"-unknown-");
+                               }
                                if (info.new_level == 10) {
                                        printf("     New Layout : near=%d, %s=%d\n",
                                               info.new_layout&255,
@@ -428,32 +488,7 @@ This is pretty boring
                else
                        printf("    Number   Major   Minor   RaidDevice\n");
        }
-       disks = malloc(max_disks * sizeof(mdu_disk_info_t));
-       for (d=0; d<max_disks; d++) {
-               disks[d].state = (1<<MD_DISK_REMOVED);
-               disks[d].major = disks[d].minor = 0;
-               disks[d].number = disks[d].raid_disk = d;
-       }
 
-       next = array.raid_disks;
-       for (d=0; d < max_disks; d++) {
-               mdu_disk_info_t disk;
-               disk.number = d;
-               if (ioctl(fd, GET_DISK_INFO, &disk) < 0) {
-                       if (d < array.raid_disks)
-                               fprintf(stderr, Name ": cannot get device detail for device %d: %s\n",
-                                       d, strerror(errno));
-                       continue;
-               }
-               if (disk.major == 0 && disk.minor == 0)
-                       continue;
-               if (disk.raid_disk >= 0 && disk.raid_disk < array.raid_disks)
-                       disks[disk.raid_disk] = disk;
-               else if (next < max_disks)
-                       disks[next++] = disk;
-       }
-
-       avail = calloc(array.raid_disks, 1);
        for (d= 0; d < max_disks; d++) {
                char *dv;
                mdu_disk_info_t disk = disks[d];
@@ -506,11 +541,6 @@ This is pretty boring
                if (test && d < array.raid_disks
                    && !(disk.state & (1<<MD_DISK_SYNC)))
                        rv |= 1;
-               if (d < array.raid_disks
-                   && (disk.state & (1<<MD_DISK_SYNC))) {
-                       avail_disks ++;
-                       avail[d] = 1;
-               }
                if ((dv=map_dev(disk.major, disk.minor, 0))) {
                        if (brief) {
                                if (devices) {
@@ -536,6 +566,7 @@ This is pretty boring
                    1, avail, avail_disks))
                rv = 2;
 
+       free(disks);
 out:
        close(fd);
        return rv;