mdadm-1.5.0

[thirdparty/mdadm.git] / Detail.c

diff --git a/Detail.c b/Detail.c
index e675eda7cd35cedc6fdd1a41c2dd902d9c26a8cf..419c45cbdc6e1ec161742808e2c994452a9d6509 100644 (file)
--- a/Detail.c
+++ b/Detail.c
@@ -31,7 +31,7 @@
 #include       "md_p.h"
 #include       "md_u.h"
 
-int Detail(char *dev, int brief)
+int Detail(char *dev, int brief, int test)
 {
        /*
         * Print out details for an md array by using
@@ -44,27 +44,30 @@ int Detail(char *dev, int brief)
        int d;
        time_t atime;
        char *c;
+       char *devices = NULL;
+       int spares = 0;
 
        mdp_super_t super;
        int have_super = 0;
+       int rv = test ? 4 : 1;
 
        if (fd < 0) {
                fprintf(stderr, Name ": cannot open %s: %s\n",
                        dev, strerror(errno));
-               return 1;
+               return rv;
        }
        vers = md_get_version(fd);
        if (vers < 0) {
                fprintf(stderr, Name ": %s does not appear to be an md device\n",
                        dev);
                close(fd);
-               return 1;
+               return rv;
        }
        if (vers < 9000) {
                fprintf(stderr, Name ": cannot get detail for md device %s: driver version too old.\n",
                        dev);
                close(fd);
-               return 1;
+               return rv;
        }
        if (ioctl(fd, GET_ARRAY_INFO, &array)<0) {
                if (errno == ENODEV)
@@ -74,8 +77,9 @@ int Detail(char *dev, int brief)
                        fprintf(stderr, Name ": cannot get array detail for %s: %s\n",
                                dev, strerror(errno));
                close(fd);
-               return 1;
+               return rv;
        }
+       rv = 0;
        /* Ok, we have some info to print... */
        c = map_num(pers, array.level);
        if (brief) 
@@ -138,6 +142,17 @@ int Detail(char *dev, int brief)
                }
        
                printf("\n");
+               {
+                       struct mdstat_ent *ms = mdstat_read();
+                       struct mdstat_ent *e;
+                       for (e=ms; e; e=e->next)
+                               if (e->devnum == array.md_minor) {
+                                       if (e->percent >= 0)
+                                               printf(" Rebuild Status : %d%% complete\n\n", e->percent);
+                                       break;
+                               }
+                       free_mdstat(ms);
+               }
                printf("    Number   Major   Minor   RaidDevice State\n");
        }
        for (d= 0; d<MD_SB_DISKS; d++) {
@@ -161,9 +176,23 @@ int Detail(char *dev, int brief)
                        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 (test && d < array.raid_disks && disk.state & (1<<MD_DISK_FAULTY)) {
+                       if ((rv & 1) && (array.level ==4 || array.level == 5))
+                               rv |= 2;
+                       rv |= 1;
                }
                if ((dv=map_dev(disk.major, disk.minor))) {
-                       if (!brief) printf("   %s", dv);
+                       if (brief) {
+                               if (devices) {
+                                       devices = realloc(devices,
+                                                         strlen(devices)+1+strlen(dv)+1);
+                                       strcat(strcat(devices,","),dv);
+                               } else
+                                       devices = strdup(dv);
+                       } else
+                               printf("   %s", dv);
                        if (!have_super && (disk.state & (1<<MD_DISK_ACTIVE))) {
                                /* try to read the superblock from this device
                                 * to get more info
@@ -171,13 +200,14 @@ int Detail(char *dev, int brief)
                                int fd = open(dv, O_RDONLY);
                                if (fd >=0 &&
                                    load_super(fd, &super) ==0 &&
-                                   super.ctime == array.ctime &&
-                                   super.level == array.level)
+                                   (unsigned long)super.ctime == (unsigned long)array.ctime &&
+                                   (unsigned int)super.level == (unsigned int)array.level)
                                        have_super = 1;
                        }
                }
                if (!brief) printf("\n");
        }
+       if (spares && brief) printf(" spares=%d", spares);
        if (have_super) {
                if (brief) printf(" UUID=");
                else printf("           UUID : ");
@@ -189,6 +219,8 @@ int Detail(char *dev, int brief)
                if (!brief) 
                        printf("\n         Events : %d.%d\n", super.events_hi, super.events_lo);
        }
+       if (brief && devices) printf("\n   devices=%s", devices);
        if (brief) printf("\n");
-       return 0;
+       if (test && (rv&2)) rv &= ~1;
+       return rv;
 }