]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - Detail.c
Improve reporting of layout for raid10.
[thirdparty/mdadm.git] / Detail.c
index 42e990771a7d1f6ea1a0a1cedfa4714ad94b1545..25b91b1e256b5cdf94fe9ff3d69a052de024f6cb 100644 (file)
--- a/Detail.c
+++ b/Detail.c
 #include       "md_p.h"
 #include       "md_u.h"
 
-int Detail(char *dev, int brief, int test, char *homehost)
+int Detail(char *dev, int brief, int export, int test, char *homehost)
 {
        /*
         * Print out details for an md array by using
         * GET_ARRAY_INFO and GET_DISK_INFO ioctl calls
         */
 
-       int fd = open(dev, O_RDONLY, 0);
+       int fd = open(dev, O_RDONLY);
        int vers;
        mdu_array_info_t array;
        mdu_disk_info_t *disks;
@@ -55,9 +55,11 @@ int Detail(char *dev, int brief, int test, char *homehost)
        struct supertype *st = NULL;
        int max_disks = MD_SB_DISKS; /* just a default */
        struct mdinfo info;
+       struct mdinfo *sra;
 
-       void *super = NULL;
        int rv = test ? 4 : 1;
+       int avail_disks = 0;
+       char *avail;
 
        if (fd < 0) {
                fprintf(stderr, Name ": cannot open %s: %s\n",
@@ -87,7 +89,8 @@ int Detail(char *dev, int brief, int test, char *homehost)
                close(fd);
                return rv;
        }
-       st = super_by_version(array.major_version, array.minor_version);
+       sra = sysfs_read(fd, 0, GET_VERSION);
+       st = super_by_fd(fd);
 
        if (fstat(fd, &stb) != 0 && !S_ISBLK(stb.st_mode))
                stb.st_rdev = 0;
@@ -107,19 +110,18 @@ int Detail(char *dev, int brief, int test, char *homehost)
                    disk.minor == 0)
                        continue;
                if ((dv=map_dev(disk.major, disk.minor, 1))) {
-                       if (!super && (disk.state & (1<<MD_DISK_ACTIVE))) {
+                       if ((!st || !st->sb) &&
+                           (disk.state & (1<<MD_DISK_ACTIVE))) {
                                /* try to read the superblock from this device
                                 * to get more info
                                 */
                                int fd2 = dev_open(dv, O_RDONLY);
                                if (fd2 >=0 && st &&
-                                   st->ss->load_super(st, fd2, &super, NULL) == 0) {
-                                       st->ss->getinfo_super(&info, super);
+                                   st->ss->load_super(st, fd2, NULL) == 0) {
+                                       st->ss->getinfo_super(st, &info);
                                        if (info.array.ctime != array.ctime ||
-                                           info.array.level != array.level) {
-                                               free(super);
-                                               super = NULL;
-                                       }
+                                           info.array.level != array.level)
+                                               st->ss->free_super(st);
                                }
                                if (fd2 >= 0) close(fd2);
                        }
@@ -128,11 +130,41 @@ int Detail(char *dev, int brief, int test, char *homehost)
 
        /* Ok, we have some info to print... */
        c = map_num(pers, array.level);
-       if (brief) 
-               printf("ARRAY %s level=%s num-devices=%d", dev, c?c:"-unknown-",array.raid_disks );
-       else {
+
+       if (export) {
+               if (c)
+                       printf("MD_LEVEL=%s\n", c);
+               printf("MD_DEVICES=%d\n", array.raid_disks);
+               if (sra && sra->array.major_version < 0)
+                       printf("MD_METADATA=%s\n", sra->text_version);
+               else
+                       printf("MD_METADATA=%02d.%02d\n",
+                              array.major_version, array.minor_version);
+
+               if (st && st->sb)
+                       st->ss->export_detail_super(st);
+               goto out;
+       }
+
+       if (brief) {
+               mdu_bitmap_file_t bmf;
+               printf("ARRAY %s level=%s num-devices=%d", dev,
+                      c?c:"-unknown-",
+                      array.raid_disks );
+               if (sra && sra->array.major_version < 0)
+                       printf(" metadata=%s", sra->text_version);
+               else
+                       printf(" metadata=%02d.%02d",
+                              array.major_version, array.minor_version);
+
+               /* Only try GET_BITMAP_FILE for 0.90.01 and later */
+               if (vers >= 9001 &&
+                   ioctl(fd, GET_BITMAP_FILE, &bmf) == 0 &&
+                   bmf.pathname[0]) {
+                       printf(" bitmap=%s", bmf.pathname);
+               }
+       } else {
                mdu_bitmap_file_t bmf;
-               unsigned long array_size;
                unsigned long long larray_size;
                struct mdstat_ent *ms = mdstat_read(0, 0);
                struct mdstat_ent *e;
@@ -143,23 +175,20 @@ int Detail(char *dev, int brief, int test, char *homehost)
                for (e=ms; e; e=e->next)
                        if (e->devnum == devnum)
                                break;
-#ifdef BLKGETSIZE64
-               if (ioctl(fd, BLKGETSIZE64, &larray_size)==0)
-                       ;
-               else
-#endif
-                       if (ioctl(fd, BLKGETSIZE, &array_size)==0) {
-                               larray_size = array_size;
-                               larray_size <<= 9;
-                       }
-               
-               else larray_size = 0;
+               if (!get_dev_size(fd, NULL, &larray_size))
+                       larray_size = 0;
 
                printf("%s:\n", dev);
-               printf("        Version : %02d.%02d.%02d\n",
-                      array.major_version, array.minor_version, array.patch_version);
+
+               if (sra && sra->array.major_version < 0)
+                       printf("        Version : %s\n", sra->text_version);
+               else
+                       printf("        Version : %02d.%02d\n",
+                              array.major_version, array.minor_version);
+
                atime = array.ctime;
                printf("  Creation Time : %.24s\n", ctime(&atime));
+               if (array.raid_disks == 0) c = "container";
                printf("     Raid Level : %s\n", c?c:"-unknown-");
                if (larray_size)
                        printf("     Array Size : %llu%s\n", (larray_size>>10), human_size(larray_size));
@@ -170,7 +199,7 @@ int Detail(char *dev, int brief, int test, char *homehost)
                                if (dsize > 0)
                                        printf("  Used Dev Size : %llu%s\n",
                                               dsize,
-                                        human_size((long long)array.size<<10));
+                                        human_size((long long)dsize<<10));
                                else
                                        printf("  Used Dev Size : unknown\n");
                        } else
@@ -180,8 +209,9 @@ int Detail(char *dev, int brief, int test, char *homehost)
                printf("   Raid Devices : %d\n", array.raid_disks);
                printf("  Total Devices : %d\n", array.nr_disks);
                printf("Preferred Minor : %d\n", array.md_minor);
-               printf("    Persistence : Superblock is %spersistent\n",
-                      array.not_persistent?"not ":"");
+               if (sra == NULL || sra->array.major_version >= 0)
+                       printf("    Persistence : Superblock is %spersistent\n",
+                              array.not_persistent?"not ":"");
                printf("\n");
                /* Only try GET_BITMAP_FILE for 0.90.01 and later */
                if (vers >= 9001 &&
@@ -209,9 +239,9 @@ int Detail(char *dev, int brief, int test, char *homehost)
                        printf("         Layout : %s\n", c?c:"-unknown-");
                }
                if (array.level == 10) {
-                       printf("         Layout : near=%d, %s=%d\n",
-                              array.layout&255, (array.layout&0x10000)?"offset":"far",
-                              (array.layout>>8)&255);
+                       printf("         Layout :");
+                       print_r10_layout(array.layout);
+                       printf("\n");
                }
                switch (array.level) {
                case 0:
@@ -219,23 +249,26 @@ int Detail(char *dev, int brief, int test, char *homehost)
                case 5:
                case 10:
                case 6:
-                       printf("     Chunk Size : %dK\n\n", array.chunk_size/1024);
+                       if (array.chunk_size)
+                               printf("     Chunk Size : %dK\n\n",
+                                      array.chunk_size/1024);
                        break;
                case -1:
                        printf("       Rounding : %dK\n\n", array.chunk_size/1024);
                        break;
                default: break;
                }
-       
+
                if (e && e->percent >= 0) {
                        printf(" Re%s Status : %d%% complete\n",
-                              (super && info.reshape_active)? "shape":"build",
+                              (st && st->sb && info.reshape_active)?
+                                 "shape":"build",
                               e->percent);
                        is_rebuilding = 1;
                }
                free_mdstat(ms);
 
-               if (super && info.reshape_active) {
+               if (st->sb && info.reshape_active) {
 #if 0
 This is pretty boring
                        printf("  Reshape pos'n : %llu%s\n", (unsigned long long) info.reshape_progress<<9,
@@ -270,8 +303,8 @@ This is pretty boring
                        printf("\n");
                } else if (e && e->percent >= 0)
                        printf("\n");
-               if (super && st)
-                       st->ss->detail_super(super, homehost);
+               if (st && st->sb)
+                       st->ss->detail_super(st, homehost);
 
                printf("    Number   Major   Minor   RaidDevice State\n");
        }
@@ -294,12 +327,13 @@ This is pretty boring
                }
                if (disk.major == 0 && disk.minor == 0)
                        continue;
-               if (disk.raid_disk >= 0 && disk.raid_disk < array.raid_disks) 
+               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];
@@ -311,13 +345,13 @@ This is pretty boring
                if (!brief) {
                        if (d == array.raid_disks) printf("\n");
                        if (disk.raid_disk < 0)
-                               printf("   %5d   %5d    %5d        -     ", 
+                               printf("   %5d   %5d    %5d        -     ",
                                       disk.number, disk.major, disk.minor);
                        else
-                               printf("   %5d   %5d    %5d    %5d     ", 
+                               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_FAULTY)) {
+                               printf(" faulty");
                                if (disk.raid_disk < array.raid_disks &&
                                    disk.raid_disk >= 0)
                                        failed++;
@@ -346,10 +380,13 @@ This is pretty boring
                        }
                }
                if (disk.state == 0) spares++;
-               if (test && d < array.raid_disks && disk.state & (1<<MD_DISK_FAULTY)) {
-                       if ((rv & 1) && (array.level ==4 || array.level == 5))
-                               rv |= 2;
+               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) {
@@ -365,12 +402,18 @@ This is pretty boring
                if (!brief) printf("\n");
        }
        if (spares && brief) printf(" spares=%d", spares);
-       if (super && brief && st)
-               st->ss->brief_detail_super(super);
+       if (brief && st && st->sb)
+               st->ss->brief_detail_super(st);
+       st->ss->free_super(st);
 
        if (brief > 1 && devices) printf("\n   devices=%s", devices);
        if (brief) printf("\n");
-       if (test && (rv&2)) rv &= ~1;
+       if (test &&
+           !enough(array.level, array.raid_disks, array.layout,
+                   1, avail, avail_disks))
+               rv = 2;
+
+out:
        close(fd);
        return rv;
 }