]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - Detail.c
Introduce pr_err for printing error messages.
[thirdparty/mdadm.git] / Detail.c
index fdfffb72ec0290e5ed5ada2380fc9310a7990f8c..f0215502e18c1451036acc3f51707dd3ec0feda5 100644 (file)
--- a/Detail.c
+++ b/Detail.c
@@ -27,7 +27,7 @@
 #include       "md_u.h"
 #include       <dirent.h>
 
-int Detail(char *dev, int brief, int export, int test, char *homehost)
+int Detail(char *dev, int brief, int export, int test, char *homehost, char *prefer)
 {
        /*
         * Print out details for an md array by using
@@ -49,46 +49,47 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
        int is_rebuilding = 0;
        int failed = 0;
        struct supertype *st;
+       char *subarray = NULL;
        int max_disks = MD_SB_DISKS; /* just a default */
-       struct mdinfo info;
+       struct mdinfo *info = NULL;
        struct mdinfo *sra;
        char *member = NULL;
        char *container = NULL;
 
        int rv = test ? 4 : 1;
        int avail_disks = 0;
-       char *avail;
+       char *avail = NULL;
 
        if (fd < 0) {
-               fprintf(stderr, Name ": cannot open %s: %s\n",
+               pr_err("cannot open %s: %s\n",
                        dev, strerror(errno));
                return rv;
        }
        vers = md_get_version(fd);
        if (vers < 0) {
-               fprintf(stderr, Name ": %s does not appear to be an md device\n",
+               pr_err("%s does not appear to be an md device\n",
                        dev);
                close(fd);
                return rv;
        }
        if (vers < 9000) {
-               fprintf(stderr, Name ": cannot get detail for md device %s: driver version too old.\n",
+               pr_err("cannot get detail for md device %s: driver version too old.\n",
                        dev);
                close(fd);
                return rv;
        }
        if (ioctl(fd, GET_ARRAY_INFO, &array)<0) {
                if (errno == ENODEV)
-                       fprintf(stderr, Name ": md device %s does not appear to be active.\n",
+                       pr_err("md device %s does not appear to be active.\n",
                                dev);
                else
-                       fprintf(stderr, Name ": cannot get array detail for %s: %s\n",
+                       pr_err("cannot get array detail for %s: %s\n",
                                dev, strerror(errno));
                close(fd);
                return rv;
        }
        sra = sysfs_read(fd, 0, GET_VERSION);
-       st = super_by_fd(fd);
+       st = super_by_fd(fd, &subarray);
 
        if (fstat(fd, &stb) != 0 && !S_ISBLK(stb.st_mode))
                stb.st_rdev = 0;
@@ -97,17 +98,14 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
        if (st)
                max_disks = st->max_devs;
 
-       if (sra && is_subarray(sra->text_version) &&
-               strchr(sra->text_version+1, '/')) {
+       if (subarray) {
                /* This is a subarray of some container.
                 * We want the name of the container, and the member
                 */
-               char *s = strchr(sra->text_version+1, '/');
-               int dn;
-               *s++ = '\0';
-               member = s;
-               dn = devname2devnum(sra->text_version+1);
-               container = map_dev(dev2major(dn), dev2minor(dn), 1);
+               int dn = st->container_dev;
+
+               member = subarray;
+               container = map_dev_preferred(dev2major(dn), dev2minor(dn), 1, prefer);
        }
 
        /* try to load a superblock */
@@ -143,25 +141,34 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
                close(fd2);
                if (err)
                        continue;
-               st->ss->getinfo_super(st, &info);
+               if (info)
+                       free(info);
+               if (subarray)
+                       info = st->ss->container_content(st, subarray);
+               else {
+                       info = malloc(sizeof(*info));
+                       st->ss->getinfo_super(st, info, NULL);
+               }
+               if (!info)
+                       continue;
 
                if (array.raid_disks != 0 && /* container */
-                   (info.array.ctime != array.ctime ||
-                    info.array.level != array.level)) {
+                   (info->array.ctime != array.ctime ||
+                    info->array.level != array.level)) {
                        st->ss->free_super(st);
                        continue;
                }
                /* some formats (imsm) have free-floating-spares
-                * with a uuid of uuid_match_any, they don't
+                * with a uuid of uuid_zero, they don't
                 * have very good info about the rest of the
                 * container, so keep searching when
                 * encountering such a device.  Otherwise, stop
                 * after the first successful call to
                 * ->load_super.
                 */
-               if (memcmp(uuid_match_any,
-                          info.uuid,
-                          sizeof(uuid_match_any)) == 0) {
+               if (memcmp(uuid_zero,
+                          info->uuid,
+                          sizeof(uuid_zero)) == 0) {
                        st->ss->free_super(st);
                        continue;
                }
@@ -191,13 +198,13 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
                                       array.major_version, array.minor_version);
                }
                
-               if (st && st->sb) {
+               if (st && st->sb && info) {
                        char nbuf[64];
                        struct map_ent *mp, *map = NULL;
 
-                       fname_from_uuid(st, &info, nbuf, ':');
+                       fname_from_uuid(st, info, nbuf, ':');
                        printf("MD_UUID=%s\n", nbuf+5);
-                       mp = map_by_uuid(&map, info.uuid);
+                       mp = map_by_uuid(&map, info->uuid);
                        if (mp && mp->path &&
                            strncmp(mp->path, "/dev/md/", 8) == 0)
                                printf("MD_DEVNAME=%s\n", mp->path+8);
@@ -232,7 +239,7 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
                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",
+                               pr_err("cannot get device detail for device %d: %s\n",
                                        d, strerror(errno));
                        continue;
                }
@@ -360,16 +367,18 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
                        if (avail_disks == array.raid_disks)
                                st = "";
                        else if (!enough(array.level, array.raid_disks,
-                                        array.layout, 1, avail, avail_disks))
+                                        array.layout, 1, avail))
                                st = ", FAILED";
                        else
                                st = ", degraded";
 
-                       printf("          State : %s%s%s%s\n",
-                              (array.state&(1<<MD_SB_CLEAN))?"clean":"active",
-                              st,
-                              (!e || e->percent < 0) ? "" : sync_action[e->resync],
-                              larray_size ? "": ", Not Started");
+                       printf("          State : %s%s%s%s%s%s \n",
+                              (array.state&(1<<MD_SB_CLEAN))?"clean":"active", st,
+                              (!e || (e->percent < 0 && e->percent != RESYNC_PENDING &&
+                              e->percent != RESYNC_DELAYED)) ? "" : sync_action[e->resync],
+                              larray_size ? "": ", Not Started",
+                              e->percent == RESYNC_DELAYED ? " (DELAYED)": "",
+                              e->percent == RESYNC_PENDING ? " (PENDING)": "");
                }
                if (array.raid_disks)
                        printf(" Active Devices : %d\n", array.active_disks);
@@ -409,51 +418,46 @@ int Detail(char *dev, int brief, int export, int test, char *homehost)
                }
 
                if (e && e->percent >= 0) {
-                       printf(" Re%s Status : %d%% complete\n",
-                              (st && st->sb && info.reshape_active)?
-                                 "shape":"build",
-                              e->percent);
+                       static char *sync_action[] = {"Rebuild", "Resync", "Reshape", "Check"};
+                       printf(" %7s Status : %d%% complete\n", sync_action[e->resync], e->percent);
                        is_rebuilding = 1;
                }
                free_mdstat(ms);
 
-               if (st->sb && 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,
-                              human_size((unsigned long long)info.reshape_progress<<9));
+                       printf("  Reshape pos'n : %llu%s\n", (unsigned long long) info->reshape_progress<<9,
+                              human_size((unsigned long long)info->reshape_progress<<9));
 #endif
-                       if (info.delta_disks > 0)
+                       if (info->delta_disks != 0)
                                printf("  Delta Devices : %d, (%d->%d)\n",
-                                      info.delta_disks, array.raid_disks - info.delta_disks, array.raid_disks);
-                       if (info.delta_disks < 0)
-                               printf("  Delta Devices : %d, (%d->%d)\n",
-                                      info.delta_disks, array.raid_disks, array.raid_disks + info.delta_disks);
-                       if (info.new_level != array.level) {
-                               char *c = map_num(pers, info.new_level);
+                                      info->delta_disks, array.raid_disks - info->delta_disks, array.raid_disks);
+                       if (info->new_level != array.level) {
+                               char *c = map_num(pers, info->new_level);
                                printf("      New Level : %s\n", c?c:"-unknown-");
                        }
-                       if (info.new_level != array.level ||
-                           info.new_layout != array.layout) {
-                               if (info.new_level == 5) {
-                                       char *c = map_num(r5layout, info.new_layout);
+                       if (info->new_level != array.level ||
+                           info->new_layout != array.layout) {
+                               if (info->new_level == 5) {
+                                       char *c = map_num(r5layout, info->new_layout);
                                        printf("     New Layout : %s\n",
                                               c?c:"-unknown-");
                                }
-                               if (info.new_level == 6) {
-                                       char *c = map_num(r6layout, info.new_layout);
+                               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) {
+                               if (info->new_level == 10) {
                                        printf("     New Layout : near=%d, %s=%d\n",
-                                              info.new_layout&255,
-                                              (info.new_layout&0x10000)?"offset":"far",
-                                              (info.new_layout>>8)&255);
+                                              info->new_layout&255,
+                                              (info->new_layout&0x10000)?"offset":"far",
+                                              (info->new_layout>>8)&255);
                                }
                        }
-                       if (info.new_chunk != array.chunk_size)
-                               printf("  New Chunksize : %dK\n", info.new_chunk/1024);
+                       if (info->new_chunk != array.chunk_size)
+                               printf("  New Chunksize : %dK\n", info->new_chunk/1024);
                        printf("\n");
                } else if (e && e->percent >= 0)
                        printf("\n");
@@ -482,13 +486,14 @@ This is pretty boring
                                if (load_sys(path, vbuf) < 0)
                                        continue;
                                if (strncmp(vbuf, "external:", 9) != 0 ||
-                                   !is_subarray(sra->sys_name+9) ||
+                                   !is_subarray(vbuf+9) ||
                                    strncmp(vbuf+10, sra->sys_name, nlen) != 0 ||
                                    vbuf[10+nlen] != '/')
                                        continue;
                                dn = devname2devnum(de->d_name);
-                               printf(" %s", map_dev(dev2major(dn),
-                                                     dev2minor(dn), 1));
+                               printf(" %s", map_dev_preferred(
+                                              dev2major(dn),
+                                              dev2minor(dn), 1, prefer));
                        }
                        if (dir)
                                closedir(dir);
@@ -500,6 +505,7 @@ This is pretty boring
                else
                        printf("    Number   Major   Minor   RaidDevice\n");
        }
+       free(info);
 
        for (d= 0; d < max_disks; d++) {
                char *dv;
@@ -527,7 +533,19 @@ This is pretty boring
                                        failed++;
                        }
                        if (disk.state & (1<<MD_DISK_ACTIVE)) printf(" active");
-                       if (disk.state & (1<<MD_DISK_SYNC)) printf(" sync");
+                       if (disk.state & (1<<MD_DISK_SYNC)) {
+                               printf(" sync");
+                               if (array.level == 10 && (array.layout & ~0x1FFFF) == 0) {
+                                       int nc = array.layout & 0xff;
+                                       int fc = (array.layout >> 8) & 0xff;
+                                       int copies = nc*fc;
+                                       if (array.raid_disks % copies == 0 && copies <= 26) {
+                                               /* We can divide the devices into 'sets' */
+                                               int set = disk.raid_disk % copies;
+                                               printf(" set-%c", set + 'A');
+                                       }
+                               }
+                       }
                        if (disk.state & (1<<MD_DISK_REMOVED)) printf(" removed");
                        if (disk.state & (1<<MD_DISK_WRITEMOSTLY)) printf(" writemostly");
                        if ((disk.state &
@@ -553,7 +571,7 @@ This is pretty boring
                if (test && d < array.raid_disks
                    && !(disk.state & (1<<MD_DISK_SYNC)))
                        rv |= 1;
-               if ((dv=map_dev(disk.major, disk.minor, 0))) {
+               if ((dv=map_dev_preferred(disk.major, disk.minor, 0, prefer))) {
                        if (brief) {
                                if (devices) {
                                        devices = realloc(devices,
@@ -575,12 +593,15 @@ This is pretty boring
        if (brief) printf("\n");
        if (test &&
            !enough(array.level, array.raid_disks, array.layout,
-                   1, avail, avail_disks))
+                   1, avail))
                rv = 2;
 
        free(disks);
 out:
        close(fd);
+       free(subarray);
+       free(avail);
+       sysfs_free(sra);
        return rv;
 }
 
@@ -596,11 +617,11 @@ int Detail_Platform(struct superswitch *ss, int scan, int verbose)
                err = ss->detail_platform(verbose, 0);
        else if (ss) {
                if (verbose)
-                       fprintf(stderr, Name ": %s metadata is platform independent\n",
+                       pr_err("%s metadata is platform independent\n",
                                ss->name ? : "[no name]");
        } else if (!scan) {
                if (verbose)
-                       fprintf(stderr, Name ": specify a metadata type or --scan\n");
+                       pr_err("specify a metadata type or --scan\n");
        }
 
        if (!scan)
@@ -612,11 +633,11 @@ int Detail_Platform(struct superswitch *ss, int scan, int verbose)
                if (meta == ss)
                        continue;
                if (verbose)
-                       fprintf(stderr, Name ": checking metadata %s\n",
+                       pr_err("checking metadata %s\n",
                                meta->name ? : "[no name]");
                if (!meta->detail_platform) {
                        if (verbose)
-                               fprintf(stderr, Name ": %s metadata is platform independent\n",
+                               pr_err("%s metadata is platform independent\n",
                                        meta->name ? : "[no name]");
                } else
                        err |= meta->detail_platform(verbose, 0);