Changeset 576 in MondoRescue for branches/2.0.8/mondo/mondo

Timestamp:

May 25, 2006, 2:00:37 PM (18 years ago)

Author:

bcornec

Message:

2.08 synced with stable as of r575
VERSION files updated

Location:

branches/2.0.8/mondo/mondo

Files:

• autorun (modified) (1 prop)
• common/libmondo-raid-EXT.h (modified) (1 diff)
• common/libmondo-raid.c (modified) (5 diffs)
• common/libmondo-raid.h (modified) (1 diff)
• common/libmondo-string-EXT.h (modified) (1 diff)
• common/libmondo-string.c (modified) (2 diffs)
• common/libmondo-string.h (modified) (1 diff)
• common/libmondo-tools.c (modified) (2 diffs)
• common/mondostructures.h (modified) (4 diffs)
• common/my-stuff.h (modified) (1 diff)
• mondorestore/mondo-prep.c (modified) (9 diffs)
• mondorestore/mondo-restore.c (modified) (5 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (2 diffs)
• mondorestore/mondoprep.h (modified) (2 diffs)
• mondorestore/mr-externs.h (modified) (1 diff)
• post-nuke.sample/usr/bin/post-nuke (modified) (1 prop)
• restore-scripts/etc (modified) (1 prop)
• restore-scripts/mondo (modified) (1 prop)
• restore-scripts/mondo/ask-me-a-question (modified) (1 prop)
• restore-scripts/mondo/compare-me (modified) (1 prop)
• restore-scripts/mondo/compare-subroutine-me (modified) (1 prop)
• restore-scripts/mondo/edit-mountlist (modified) (1 prop)
• restore-scripts/mondo/grub-MR (modified) (1 prop)
• restore-scripts/mondo/grub-install.patched (modified) (1 prop)
• restore-scripts/mondo/hack-elilo (modified) (1 prop)
• restore-scripts/mondo/hack-fstab (modified) (1 prop)
• restore-scripts/mondo/hack-grub (modified) (1 prop)
• restore-scripts/mondo/hack-lilo (modified) (1 prop)
• restore-scripts/mondo/ide-opt (modified) (1 prop)
• restore-scripts/mondo/ide-opt-off (modified) (1 prop)
• restore-scripts/mondo/label-partitions-as-necessary (modified) (1 prop)
• restore-scripts/mondo/make-me-bootable (modified) (1 prop)
• restore-scripts/mondo/mount-me (modified) (1 prop)
• restore-scripts/mondo/mount-subroutine-me (modified) (1 prop)
• restore-scripts/mondo/raw-MR (modified) (1 prop)
• restore-scripts/mondo/restore-bigfiles-from-iso (modified) (1 prop)
• restore-scripts/mondo/stabelilo-me (modified) (1 prop)
• restore-scripts/mondo/stabgrub-me (modified) (1 prop)
• restore-scripts/mondo/stablilo-me (modified) (1 prop)
• restore-scripts/mondo/stabraw-me (modified) (1 prop)
• restore-scripts/mondo/unmount-me (modified) (1 prop)
• restore-scripts/mondo/unmount-subroutine-me (modified) (1 prop)
• restore-scripts/usr (modified) (1 prop)
• restore-scripts/usr.bin (modified) (1 prop)
• restore-scripts/usr/bin (modified) (1 prop)

branches/2.0.8/mondo/mondo/common/libmondo-raid-EXT.h

@@ -53 +53 @@
 #endif
 
-extern int create_raidtab_from_mdstat(char *, char *);
-extern int read_mdstat(struct s_mdstat *mdstat, char *mdstat_file);
-
-extern int create_raidtab_from_mdstat(char *raidtab_fname,
-                                      char *mdstat_fname);
+extern int parse_mdstat(struct raidlist_itself *raidlist, char *device_prefix);
+extern int create_raidtab_from_mdstat(char *raidtab_fname);

branches/2.0.8/mondo/mondo/common/libmondo-raid.c

@@ -395 +395 @@
 
     fprintf(fout, "raiddev %s\n", raidrec->raid_device);
-    if (raidrec->raid_level == -1) {
+    if (raidrec->raid_level == -2) {
+        fprintf(fout, "    raid-level            multipath\n");
+    } else if (raidrec->raid_level == -1) {
         fprintf(fout, "    raid-level            linear\n");
     } else {
@@ -401 +403 @@
                 raidrec->raid_level);
     }
-    fprintf(fout, "    chunk-size            %d\n", raidrec->chunk_size);
     fprintf(fout, "    nr-raid-disks         %d\n",
             raidrec->data_disks.entries);
-    fprintf(fout, "    nr-spare-disks        %d\n",
-            raidrec->spare_disks.entries);
+    if (raidrec->spare_disks.entries > 0) {
+        fprintf(fout, "    nr-spare-disks        %d\n",
+                raidrec->spare_disks.entries);
+    }
     if (raidrec->parity_disks.entries > 0) {
         fprintf(fout, "    nr-parity-disks       %d\n",
                 raidrec->parity_disks.entries);
     }
-
     fprintf(fout, "    persistent-superblock %d\n",
             raidrec->persistent_superblock);
+    if (raidrec->chunk_size > -1) {
+      fprintf(fout, "    chunk-size            %d\n", raidrec->chunk_size);
+    }
+    if (raidrec->parity > -1) {
+      switch(raidrec->parity) {
+      case 0:
+        fprintf(fout, "    parity-algorithm      left-asymmetric\n");
+        break;
+      case 1:
+        fprintf(fout, "    parity-algorithm      right-asymmetric\n");
+        break;
+      case 2:
+        fprintf(fout, "    parity-algorithm      left-symmetric\n");
+        break;
+      case 3:
+        fprintf(fout, "    parity-algorithm      right-symmetric\n");
+        break;
+      default:
+        fatal_error("Unknown RAID parity algorithm.");
+        break;
+      }
+    }
     save_additional_vars_to_file(&raidrec->additional_vars, fout);
     fprintf(fout, "\n");
@@ -713 +737 @@
 
     if (!strcmp(label, "raid-level")) {
-        if (!strcmp(value, "linear")) {
+        if (!strcmp(value, "multipath")) {
+            raidrec->raid_level = -2;
+        } else if (!strcmp(value, "linear")) {
             raidrec->raid_level = -1;
         } else {
@@ -726 +752 @@
     } else if (!strcmp(label, "chunk-size")) {
         raidrec->chunk_size = atoi(value);
+    } else if (!strcmp(label, "parity-algorithm")) {
+        if (!strcmp(value, "left-asymmetric")) {
+            raidrec->parity = 0;
+        } else if (!strcmp(value, "right-asymmetric")) {
+            raidrec->parity = 1;
+        } else if (!strcmp(value, "left-symmetric")) {
+            raidrec->parity = 2;
+        } else if (!strcmp(value, "right-symmetric")) {
+            raidrec->parity = 3;
+        } else {
+            log_msg(1, "Unknown RAID parity algorithm '%s'\n.", value);
+        }
     } else if (!strcmp(label, "device")) {
         get_next_raidtab_line(fin, labelB, valueB);
@@ -972 +1010 @@
 
 
-int read_mdstat(struct s_mdstat *mdstat, char *mdstat_file)
-{
-    FILE *fin;
-    char *tmp;
-    char *stub;
-    char *incoming;
-    char *raid_devname;
-    char *p, *q, *r;
-    int diskno;
-
-    malloc_string(tmp);
-    malloc_string(stub);
-    malloc_string(incoming);
-    malloc_string(raid_devname);
-    if (!(fin = fopen(mdstat_file, "r"))) {
-        log_msg(1, "%s not found", mdstat_file);
+int parse_mdstat(struct raidlist_itself *raidlist, char *device_prefix) {
+
+  const char delims[] = " ";
+
+  FILE   *fin;
+  int    res = 0, row, i, index_min;
+  int lastpos = 0;
+  size_t len = 0;
+  char   *token;
+  char *string = NULL;
+  char *pos;
+  char type;
+  char *strtmp;
+
+  // open file
+  if (!(fin = fopen(MDSTAT_FILE, "r"))) {
+    log_msg(1, "Could not open %s.\n", MDSTAT_FILE);
+    return 1;
+  }
+  // initialise record, build progress and row counters
+  raidlist->entries = 0;
+  raidlist->el[raidlist->entries].progress = 999;
+  row = 1;
+  // skip first output row - contains registered RAID levels
+  res = getline(&string, &len, fin);
+  // parse the rest
+  while ( !feof_unlocked(fin) ) {
+    res = getline(&string, &len, fin);
+    if (res <= 0) break;
+    // trim leading spaces
+    pos = string;
+    while (*pos == ' ') *pos++;
+    asprintf(&string, pos);
+    //
+    // if we have newline after only spaces, this is a blank line, update
+    // counters, otherwise do normal parsing
+    if (*string == '\n') {
+      row = 1;
+      raidlist->entries++;
+      raidlist->el[raidlist->entries].progress = 999;
+    } else {
+      switch (row) {
+      case 1:  // device information
+    // check whether last line of record and if so skip
+    pos = strcasestr(string, "unused devices: ");
+    if (pos == string) {
+      //raidlist->entries--;
+      break;
+    }
+    // tokenise string
+    token = mr_strtok (string, delims, &lastpos);
+    // get RAID device name
+    asprintf(&strtmp,"%s%s", device_prefix, token);
+    strcpy(raidlist->el[raidlist->entries].raid_device, strtmp);
+    paranoid_free(strtmp);
+    paranoid_free(token);
+    // skip ':' and status
+    token = mr_strtok (string, delims, &lastpos);
+    paranoid_free(token);
+    token = mr_strtok (string, delims, &lastpos);
+    if (!strcmp(token, "inactive")) {
+      log_msg(1, "RAID device '%s' inactive.\n",
+         raidlist->el[raidlist->entries].raid_device);
+      paranoid_free(string);
+      paranoid_free(token);
+      return 1;
+    }
+    paranoid_free(token);
+
+    // get RAID level
+    token = mr_strtok (string, delims, &lastpos);
+    if (!strcmp(token, "multipath")) {
+      raidlist->el[raidlist->entries].raid_level = -2;
+    } else if (!strcmp(token, "linear")) {
+      raidlist->el[raidlist->entries].raid_level = -1;
+    } else if (!strcmp(token, "raid0")) {
+      raidlist->el[raidlist->entries].raid_level = 0;
+    } else if (!strcmp(token, "raid1")) {
+      raidlist->el[raidlist->entries].raid_level = 1;
+    } else if (!strcmp(token, "raid4")) {
+      raidlist->el[raidlist->entries].raid_level = 4;
+    } else if (!strcmp(token, "raid5")) {
+      raidlist->el[raidlist->entries].raid_level = 5;
+    } else if (!strcmp(token, "raid6")) {
+      raidlist->el[raidlist->entries].raid_level = 6;
+    } else if (!strcmp(token, "raid10")) {
+      raidlist->el[raidlist->entries].raid_level = 10;
+    } else {
+      log_msg(1, "Unknown RAID level '%s'.\n", token);
+      paranoid_free(string);
+      paranoid_free(token);
+      return 1;
+    }
+    paranoid_free(token);
+
+    // get RAID devices (type, index, device)
+    // Note: parity disk for RAID4 is last normal disk, there is no '(P)'
+    raidlist->el[raidlist->entries].data_disks.entries = 0;
+    raidlist->el[raidlist->entries].spare_disks.entries = 0;
+    raidlist->el[raidlist->entries].failed_disks.entries = 0;
+    while((token = mr_strtok (string, delims, &lastpos))) {
+      if ((pos = strstr(token, "("))) {
+        type = *(pos+1);
+      } else {
+        type = ' ';
+      }
+      pos = strstr(token, "[");
+      *pos = '\0';
+      switch(type) {
+      case ' ': // normal data disks
+        raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].index = atoi(pos + 1);
+        asprintf(&strtmp,"%s%s", device_prefix, token);
+        strcpy(raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].device, strtmp);
+        paranoid_free(strtmp);
+        raidlist->el[raidlist->entries].data_disks.entries++;
+        break;
+      case 'S': // spare disks
+        raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].index = atoi(pos + 1);
+        asprintf(&strtmp,"%s%s", device_prefix, token);
+        strcpy(raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].device, strtmp);
+        paranoid_free(strtmp);
+        raidlist->el[raidlist->entries].spare_disks.entries++;
+        break;
+      case 'F': // failed disks
+        raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].index = atoi(pos + 1);
+        asprintf(&strtmp,"%s%s", device_prefix, token);
+        strcpy(raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].device, strtmp);
+        paranoid_free(strtmp);
+        raidlist->el[raidlist->entries].failed_disks.entries++;
+        log_it("At least one failed disk found in RAID array.\n");
+        break;
+      default: // error
+        log_msg(1, "Unknown device type '%c'\n", type);
+        paranoid_free(string);
+        paranoid_free(token);
+        return 1;
+        break;
+      }
+      paranoid_free(token);
+    }
+
+    // adjust index for each device so that it starts with 0 for every type
+    index_min = 99;
+    for (i=0; i<raidlist->el[raidlist->entries].data_disks.entries;i++) {
+      if (raidlist->el[raidlist->entries].data_disks.el[i].index < index_min) {
+        index_min = raidlist->el[raidlist->entries].data_disks.el[i].index;
+      }
+    }
+    if (index_min > 0) {
+      for (i=0; i<raidlist->el[raidlist->entries].data_disks.entries;i++) {
+        raidlist->el[raidlist->entries].data_disks.el[i].index = raidlist->el[raidlist->entries].data_disks.el[i].index - index_min;    
+      }
+    }
+    index_min = 99;
+    for (i=0; i<raidlist->el[raidlist->entries].spare_disks.entries;i++) {
+      if (raidlist->el[raidlist->entries].spare_disks.el[i].index < index_min) {
+        index_min = raidlist->el[raidlist->entries].spare_disks.el[i].index;
+      }
+    }
+    if (index_min > 0) {
+      for (i=0; i<raidlist->el[raidlist->entries].spare_disks.entries;i++) {
+        raidlist->el[raidlist->entries].spare_disks.el[i].index = raidlist->el[raidlist->entries].spare_disks.el[i].index - index_min;  
+      }
+    }
+    index_min = 99;
+    for (i=0; i<raidlist->el[raidlist->entries].failed_disks.entries;i++) {
+      if (raidlist->el[raidlist->entries].failed_disks.el[i].index < index_min) {
+        index_min = raidlist->el[raidlist->entries].failed_disks.el[i].index;
+      }
+    }
+    if (index_min > 0) {
+      for (i=0; i<raidlist->el[raidlist->entries].failed_disks.entries;i++) {
+        raidlist->el[raidlist->entries].failed_disks.el[i].index = raidlist->el[raidlist->entries].failed_disks.el[i].index - index_min;    
+      }
+    }
+    break;
+      case 2:  // config information
+    // check for persistent super block
+    if (strcasestr(string, "super non-persistent")) {
+      raidlist->el[raidlist->entries].persistent_superblock = 0;
+    } else {
+      raidlist->el[raidlist->entries].persistent_superblock = 1;
+    }
+    // extract chunk size
+    if (!(pos = strcasestr(string, "k chunk"))) {
+      raidlist->el[raidlist->entries].chunk_size = -1;
+    } else {
+      while (*pos != ' ') {
+        *pos--;
+        if (pos < string) {
+          log_it("String underflow!\n");
+          paranoid_free(string);
+          return 1;
+        }
+      }
+      raidlist->el[raidlist->entries].chunk_size = atoi(pos + 1);
+    }
+    // extract parity if present
+    if ((pos = strcasestr(string, "algorithm"))) {
+      raidlist->el[raidlist->entries].parity = atoi(pos + 9);
+    } else {
+      raidlist->el[raidlist->entries].parity = -1;
+    }
+    break;
+      case 3:  // optional build status information
+    if (!(pos = strchr(string, '\%'))) {
+      if (strcasestr(string, "delayed")) {
+        raidlist->el[raidlist->entries].progress = -1;  // delayed (therefore, stuck at 0%)
+      } else {
+        raidlist->el[raidlist->entries].progress = 999; // not found
+      }
+    } else {
+      while (*pos != ' ') {
+        *pos--;
+        if (pos < string) {
+          printf("ERROR: String underflow!\n");
+          paranoid_free(string);
+          return 1;
+        }
+      }
+      raidlist->el[raidlist->entries].progress = atoi(pos);
+    }
+    break;
+      default: // error
+    log_msg(1, "Row %d should not occur in record!\n", row);
+    break;
+      }
+      row++;
+    }
+  }
+  // close file
+  fclose(fin);
+  // free string
+  paranoid_free(string);
+  // return success
+  return 0;
+
+}
+
+
+
+
+int create_raidtab_from_mdstat(char *raidtab_fname)
+{
+    struct raidlist_itself *raidlist;
+    int retval = 0;
+
+    raidlist = malloc(sizeof(struct raidlist_itself));
+
+    // FIXME: Prefix '/dev/' should really be dynamic!
+    if (parse_mdstat(raidlist, "/dev/")) {
+        log_to_screen("Sorry, cannot read %s", MDSTAT_FILE);
         return (1);
     }
-    mdstat->entries = 0;
-    for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-         fgets(incoming, MAX_STR_LEN - 1, fin)) {
-        p = incoming;
-        if (*p != 'm' && *(p + 1) == 'm') {
-            p++;
-        }
-        if (strncmp(p, "md", 2)) {
-            continue;
-        }
-// read first line --- mdN : active raidX ............
-        mdstat->el[mdstat->entries].md = atoi(p + 2);
-        log_msg(8, "Storing /dev/md%d's info", atoi(p + 2));
-        while (*p != ':' && *p) {
-            p++;
-        }
-        while ((*p != 'r' || *(p + 1) != 'a') && *p) {
-            p++;
-        }
-        if (!strncmp(p, "raid", 4)) {
-            mdstat->el[mdstat->entries].raidlevel = *(p + 4) - '0';
-        }
-        p += 4;
-        while (*p != ' ' && *p) {
-            p++;
-        }
-        while (*p == ' ' && *p) {
-            p++;
-        }
-        for (diskno = 0; *p; diskno++) {
-            strcpy(stub, p);
-//      log_msg(1, "diskno=%d; tmp=%s", diskno, tmp);
-            q = strchr(stub, '[');
-            if (q) {
-                *q = '\0';
-                q++;
-                r = strchr(q, ']');
-                if (r) {
-                    *r = '\0';
-                }
-                mdstat->el[mdstat->entries].disks.el[diskno].index =
-                    atoi(q);
-            } else {
-                mdstat->el[mdstat->entries].disks.el[diskno].index = -1;
-                q = strchr(stub, ' ');
-                if (q) {
-                    *q = '\0';
-                }
-            }
-            sprintf(tmp, "/dev/%s", stub);
-            log_msg(8, "/dev/md%d : disk#%d : %s (%d)",
-                    mdstat->el[mdstat->entries].md, diskno, tmp,
-                    mdstat->el[mdstat->entries].disks.el[diskno].index);
-            strcpy(mdstat->el[mdstat->entries].disks.el[diskno].device,
-                   tmp);
-            while (*p != ' ' && *p) {
-                p++;
-            }
-            while (*p == ' ' && *p) {
-                p++;
-            }
-        }
-        mdstat->el[mdstat->entries].disks.entries = diskno;
-// next line --- skip it
-        if (!feof(fin)) {
-            fgets(incoming, MAX_STR_LEN - 1, fin);
-        } else {
-            continue;
-        }
-// next line --- the 'progress' line
-        if (!feof(fin)) {
-            fgets(incoming, MAX_STR_LEN - 1, fin);
-        } else {
-            continue;
-        }
-//  log_msg(1, "Percentage line = '%s'", incoming);
-        if (!(p = strchr(incoming, '\%'))) {
-            mdstat->el[mdstat->entries].progress = 999; // not found
-        } else if (strstr(incoming, "DELAYED")) {
-            mdstat->el[mdstat->entries].progress = -1;  // delayed (therefore, stuck at 0%)
-        } else {
-            for (*p = '\0'; *p != ' '; p--);
-            mdstat->el[mdstat->entries].progress = atoi(p);
-        }
-        log_msg(8, "progress =%d", mdstat->el[mdstat->entries].progress);
-        mdstat->entries++;
-    }
-    fclose(fin);
-    paranoid_free(tmp);
-    paranoid_free(stub);
-    paranoid_free(incoming);
-    paranoid_free(raid_devname);
-    return (0);
-}
-
-
-
-int create_raidtab_from_mdstat(char *raidtab_fname, char *mdstat_fname)
-{
-    struct raidlist_itself *raidlist;
-    struct s_mdstat *mdstat;
-    int retval = 0;
-    int i;
-
-    raidlist = malloc(sizeof(struct raidlist_itself));
-    mdstat = malloc(sizeof(struct s_mdstat));
-
-    if (read_mdstat(mdstat, mdstat_fname)) {
-        log_to_screen("Sorry, cannot read %s", mdstat_fname);
-        return (1);
-    }
-
-    for (i = 0; i < mdstat->entries; i++) {
-        sprintf(raidlist->el[i].raid_device, "/dev/md%d",
-                mdstat->el[i].md);
-        raidlist->el[i].raid_level = mdstat->el[i].raidlevel;
-        raidlist->el[i].persistent_superblock = 1;
-        raidlist->el[i].chunk_size = 4;
-        memcpy((void *) &raidlist->el[i].data_disks,
-               (void *) &mdstat->el[i].disks,
-               sizeof(struct list_of_disks));
-        // FIXME --- the above line does not allow for spare disks
-        log_to_screen
-            ("FIXME - create_raidtab_from_mdstat does not allow for spare disks");
-    }
-    raidlist->entries = i;
+
     retval += save_raidlist_to_raidtab(raidlist, raidtab_fname);
     return (retval);

branches/2.0.8/mondo/mondo/common/libmondo-raid.h

@@ -43 +43 @@
 #endif
 
-
-int create_raidtab_from_mdstat(char *, char *);
-int read_mdstat(struct s_mdstat *mdstat, char *mdstat_file);
-
-int create_raidtab_from_mdstat(char *raidtab_fname, char *mdstat_fname);
+int create_raidtab_from_mdstat(char *raidtab_fname);
+int parse_mdstat(struct raidlist_itself *raidlist, char *device_prefix);

branches/2.0.8/mondo/mondo/common/libmondo-string-EXT.h

@@ -44 +44 @@
 extern inline void turn_wildcard_chars_into_literal_chars(char *out,
                                                           char *in);
+/* Valid external functions */
+extern char *mr_strtok(char *instr, const char *delims, int *lastpos);

branches/2.0.8/mondo/mondo/common/libmondo-string.c

@@ -1 @@
-/* libmondo-string.c
-   $Id$
-
-- string manipulation
-
-
-08/02
-- added function turn_wildcard_chars_into_literal_chars()
-
-03/10/2004?
-- make percent_media_full_comment() use media_descriptor_string():
-  "DVD %d" or "ISO %d" (if that's what it is) rather than "CD %d"
-- fix build_partition_name() to use 'adXsY' rather than 'adXpY' on FreeBSD
-
-10/08/2003
-- changed 'CD %d' to '<media> %d' (msg)
-
-10/01
-- fixing strip_spaces() to handle /r properly
-
-09/26
-- added char *media_descriptor_string(t_bkptype);
-
-05/06
-- cleaned up severity_of_difference() a bit
-
-05/05
-- added Joshua Oreman's FreeBSD patches
-
-04/24
-- added lots of assert()'s and log_OS_error()'s
-- severity_of_difference() skips "/mnt/RESTORING" at start
-  of filename if it's there
-
-04/04/2003
-- misc clean-up (Tom Mortell)
-
-11/17/2002
-- strip_spaces() now accommodates _smaller_ strings auto'y
-
-11/08
-- if decimal point in string sent to friendly_sizestr_to_sizelong()
-  then fatal error: we expect integers only
-
-10/01 - 10/31
-- commented subroutines
-- strip_spaces() allows up to MAX_STR_LEN-len input string
-
-08/01 - 08/31
-- fixed bug in friendly_sizestr_to_sizelong() which stopped
-  it from working with capital G's and K's
-- fixed bug in build_partition_name()
-
-07/24
-- created
-*/
+/* $Id$ */
 
 
@@ -1212 +1157 @@
 }
 
+
+/* New functions safe from a memory manageemnt point of view */
+/* Developped by Andree Leidenfrost */
+
+char *mr_strtok(char *instr, const char *delims, int *lastpos) {
+
+char *token = NULL;
+char *strptr = NULL;
+size_t pos1 = 0;
+size_t pos2 = 0;
+
+if (strlen(instr) <= *lastpos) {
+    *lastpos = 0;
+    return token;
+}
+
+strptr = instr + *lastpos;
+pos2 = strspn(strptr, delims);
+strptr += pos2;
+pos1 = strcspn(strptr, delims);
+token = malloc(sizeof(*token)*(pos1+1));
+strncpy(token, strptr, pos1);
+*lastpos = *lastpos + pos1 + pos2 + 1;
+
+return token;
+}
 /* @} - end of stringGroup */

branches/2.0.8/mondo/mondo/common/libmondo-string.h

@@ -34 +34 @@
 char *media_descriptor_string(t_bkptype);
 inline void turn_wildcard_chars_into_literal_chars(char *out, char *in);
+
+/* Valid external functions */
+char *mr_strtok(char *instr, const char *delims, int *lastpos);

branches/2.0.8/mondo/mondo/common/libmondo-tools.c

@@ -442 +442 @@
     assert(raidrec != NULL);
     raidrec->raid_device[0] = '\0';
-    raidrec->raid_level = 0;
-    raidrec->chunk_size = 4;
+    raidrec->raid_level = -9;
     raidrec->persistent_superblock = 1;
+    raidrec->chunk_size = 64;
+    raidrec->parity = -1;
     raidrec->data_disks.entries = 0;
     raidrec->spare_disks.entries = 0;
@@ -1224 +1225 @@
         log_to_screen
             ("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat");
-        create_raidtab_from_mdstat("/etc/raidtab", "/proc/mdstat");
+        create_raidtab_from_mdstat("/etc/raidtab");
     }
 

branches/2.0.8/mondo/mondo/common/mondostructures.h

@@ -150 +150 @@
    */
     int index;
+    
+  /**
+   * Type of disk.
+   */
+    char type;  // ' ' = data (default), S = spare, F = faulty
+    
 };
 
@@ -241 +247 @@
        */
     int chunk_size;
+    
+      /**
+       * The parity algorithm of this RAID device. (RAID5 only)
+       */
+    int parity; // 0=left-asymmetric, 1=right-asymmetric, 2=left-symmetric, 3=right-symmetric
 
       /**
@@ -266 +277 @@
        */
     struct additional_raid_variables additional_vars;
+
+      /**
+       * Resync progress for this device.
+       */
+    int progress;
 };
 
@@ -787 +803 @@
     struct s_tapecat_entry el[MAX_TAPECATALOG_ENTRIES];
 };
-
-
-
-struct s_mdrec {
-    int md;                     // /dev/mdN
-    int raidlevel;              // 0, 1, 5
-    struct list_of_disks disks;
-    int progress;
-};
-
-struct s_mdstat {
-    int entries;
-    struct s_mdrec el[MAXIMUM_RAID_DEVS];
-};

branches/2.0.8/mondo/mondo/common/my-stuff.h

@@ -231 +231 @@
  */
 #define MONDO_CFG_FILE_STUB "tmp/mondo-restore.cfg"
+
+/**
+ * The RAID kernel proc file
+ */
+#define MDSTAT_FILE "/proc/mdstat"
 
 /**

branches/2.0.8/mondo/mondo/mondorestore/mondo-prep.c

@@ -695 +695 @@
 
 /**
+ * Create @p RAID device using information from @p structure.
+ * This will create the specified RAID devive using information provided in
+ * raidlist by means of the mdadm tool.
+ * @param raidlist The structure containing all RAID information
+ * @param device The RAID device to create.
+ * @return 0 for success, nonzero for failure.
+ */
+int create_raid_device_via_mdadm(struct raidlist_itself *raidlist, char *device)
+{
+  /** int **************************************************************/
+  int i   = 0;
+  int j   = 0;
+  int res = 0;
+  
+  /** buffers ***********************************************************/
+  char *devices = NULL;
+  char *strtmp  = NULL;
+  char *level   = NULL;
+  char *program = NULL;
+  
+  // leave straight away if raidlist is initial or has no entries
+  if (!raidlist || raidlist->entries == 0) {
+    log_msg(1, "No RAID arrays found.");
+    return 1;
+  } else {
+    log_msg(1, "%d RAID arrays found.", raidlist->entries);
+  }
+  // find raidlist entry for requested device
+  for (i = 0; i < raidlist->entries; i++) {
+    if (!strcmp(raidlist->el[i].raid_device, device)) break;
+  }
+  // check whether RAID device was found in raidlist
+  if (i == raidlist->entries) {
+    log_msg(1, "RAID device %s not found in list.", device);
+    return 1;
+  }
+  // create device list from normal disks followed by spare ones
+  asprintf(&devices, raidlist->el[i].data_disks.el[0].device);
+  for (j = 1; j < raidlist->el[i].data_disks.entries; j++) {
+    asprintf(&strtmp, "%s", devices);
+    paranoid_free(devices);
+    asprintf(&devices, "%s %s", strtmp,
+         raidlist->el[i].data_disks.el[j].device);
+    paranoid_free(strtmp);
+  }
+  for (j = 0; j < raidlist->el[i].spare_disks.entries; j++) {
+    asprintf(&strtmp, "%s", devices);
+    paranoid_free(devices);
+    asprintf(&devices, "%s %s", strtmp,
+         raidlist->el[i].spare_disks.el[j].device);
+    paranoid_free(strtmp);
+  }
+  // translate RAID level
+  if (raidlist->el[i].raid_level == -2) {
+    asprintf(&level, "multipath");
+  } else if (raidlist->el[i].raid_level == -1) {
+    asprintf(&level, "linear");
+  } else {
+    asprintf(&level, "raid%d", raidlist->el[i].raid_level);
+  }
+  // create RAID device:
+  // - RAID device, number of devices and devices mandatory
+  // - parity algorithm, chunk size and spare devices optional
+  // - faulty devices ignored
+  // - persistent superblock always used as this is recommended
+  asprintf(&program,
+       "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d",
+       raidlist->el[i].raid_device, level,
+       raidlist->el[i].data_disks.entries);
+  if (raidlist->el[i].parity != -1) {
+    asprintf(&strtmp, "%s", program);
+    paranoid_free(program);
+    switch(raidlist->el[i].parity) {
+    case 0:
+      asprintf(&program, "%s --parity=%s", strtmp, "la");
+      break;
+    case 1:
+      asprintf(&program, "%s --parity=%s", strtmp, "ra");
+      break;
+    case 2:
+      asprintf(&program, "%s --parity=%s", strtmp, "ls");
+      break;
+    case 3:
+      asprintf(&program, "%s --parity=%s", strtmp, "rs");
+      break;
+    default:
+      fatal_error("Unknown RAID parity algorithm.");
+      break;
+    }
+    paranoid_free(strtmp);
+  }
+  if (raidlist->el[i].chunk_size != -1) {
+    asprintf(&strtmp, "%s", program);
+    paranoid_free(program);
+    asprintf(&program, "%s --chunk=%d", strtmp, raidlist->el[i].chunk_size);
+    paranoid_free(strtmp);
+  }
+  if (raidlist->el[i].spare_disks.entries > 0) {
+    asprintf(&strtmp, "%s", program);
+    paranoid_free(program);
+    asprintf(&program, "%s --spare-devices=%d", strtmp,
+         raidlist->el[i].spare_disks.entries);
+    paranoid_free(strtmp);
+  }
+  asprintf(&strtmp, "%s", program);
+  paranoid_free(program);
+  asprintf(&program, "%s %s", strtmp, devices);
+  paranoid_free(strtmp);
+  res = run_program_and_log_output(program, 1);
+  // free memory
+  paranoid_free(devices);
+  paranoid_free(level);
+  paranoid_free(program);
+  // return to calling instance
+  return res;
+}
+
+
+/**
  * Format @p device as a @p format filesystem.
  * This will use the format command returned by which_format_command_do_i_need().
@@ -704 +823 @@
  * @return 0 for success, nonzero for failure.
  */
-int format_device(char *device, char *format)
+int format_device(char *device, char *format, struct raidlist_itself *raidlist)
 {
     /** int **************************************************************/
@@ -836 +955 @@
 
         log_msg(1, "Making %s", device);
-        sprintf(program, "mkraid --really-force %s", device);
-        res = run_program_and_log_output(program, 1);
-        log_msg(1, "%s returned %d", program, res);
-        system("sync");
-        sleep(3);
-        start_raid_device(device);
-        if (g_fprep) {
-            fprintf(g_fprep, "%s\n", program);
+        // use mkraid if it exists, otherwise use mdadm
+        if (run_program_and_log_output("which mkraid", FALSE)) {
+            res = create_raid_device_via_mdadm(raidlist, device);
+            log_msg(1, "Creating RAID device %s via mdadm returned %d", device, res);
+        } else {
+            sprintf(program, "mkraid --really-force %s", device);
+            res = run_program_and_log_output(program, 1);
+            log_msg(1, "%s returned %d", program, res);
+            system("sync");
+            sleep(3);
+            start_raid_device(device);
+            if (g_fprep) {
+                fprintf(g_fprep, "%s\n", program);
+            }
         }
         system("sync");
         sleep(2);
-
 //      log_to_screen("Starting %s", device);
 //      sprintf(program, "raidstart %s", device);
@@ -853 +977 @@
 //      log_msg(1, "%s returned %d", program, res);
 //      system("sync"); sleep(1);
-        if (g_fprep) {
-            fprintf(g_fprep, "%s\n", program);
-        }
 #endif
         system("sync");
@@ -923 +1044 @@
  * @return The number of errors encountered (0 for success).
  */
-int format_everything(struct mountlist_itself *mountlist,
-                      bool interactively)
+int format_everything(struct mountlist_itself *mountlist, bool interactively,
+                          struct raidlist_itself *raidlist)
 {
     /** int **************************************************************/
@@ -983 +1104 @@
             if (do_it) {
                 // NB: format_device() also stops/starts RAID device if necessary
-                retval += format_device(me->device, me->format);
+                retval += format_device(me->device, me->format, raidlist);
             }
             g_current_progress += progress_step;
@@ -1000 +1121 @@
     log_msg(1, "Creating LVMs");
     if (does_file_exist("/tmp/i-want-my-lvm")) {
-        wait_until_software_raids_are_prepped("/proc/mdstat", 10);
+        wait_until_software_raids_are_prepped("/proc/mdstat", 100);
         log_to_screen("Configuring LVM");
         if (!g_text_mode) {
@@ -1076 +1197 @@
 
             if (do_it)
-                retval += format_device(me->device, me->format);
+                retval += format_device(me->device, me->format, raidlist);
         }
 
@@ -2247 +2368 @@
     sprintf(program, "vinum stop -f %s", raid_device);
 #else
-    sprintf(program, "raidstop %s", raid_device);
-//      sprintf (program, "raidstop " RAID_DEVICE_STUB "*");
+    // use raidstop if it exists, otherwise use mdadm
+    if (run_program_and_log_output("which raidstop", FALSE)) {
+        sprintf(program, "mdadm -S %s", raid_device);
+    } else {
+        sprintf(program, "raidstop %s", raid_device);
+    }
 #endif
     log_msg(1, "program = %s", program);

branches/2.0.8/mondo/mondo/mondorestore/mondo-restore.c

@@ -837 +837 @@
                     }
 
-                    fmt_errs = format_everything(mountlist, FALSE);
+                    fmt_errs = format_everything(mountlist, FALSE, raidlist);
                     if (!fmt_errs) {
                         log_to_screen
@@ -855 +855 @@
                 if (ask_me_yes_or_no
                     ("Do you want to format your hard drives?")) {
-                    fmt_errs = format_everything(mountlist, TRUE);
+                    fmt_errs = format_everything(mountlist, TRUE, raidlist);
                     if (!fmt_errs) {
                         done = TRUE;
@@ -1162 +1162 @@
                 system("sync");
                 log_to_screen("Please wait. This may take a few minutes.");
-                res += format_everything(mountlist, FALSE);
+                res += format_everything(mountlist, FALSE, raidlist);
             }
             paranoid_fclose(g_fprep);
@@ -3415 +3415 @@
     }
 
-    if (argc == 4 && strcmp(argv[1], "--mdconv") == 0) {
-        finish(create_raidtab_from_mdstat(argv[2], argv[3]));
+    if (argc == 3 && strcmp(argv[1], "--mdconv") == 0) {
+        finish(create_raidtab_from_mdstat(argv[2]));
     }
 
@@ -3515 +3515 @@
             strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
             load_mountlist(mountlist, g_mountlist_fname);
-            res = format_everything(mountlist, FALSE);
+            res = format_everything(mountlist, FALSE, raidlist);
             finish(res);
         }

branches/2.0.8/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -2585 +2585 @@
                                            int wait_for_percentage)
 {
-    struct s_mdstat *mdstat;
+    struct raidlist_itself *raidlist;
     int unfinished_mdstat_devices = 9999, i;
     char *screen_message;
 
     malloc_string(screen_message);
-    mdstat = malloc(sizeof(struct s_mdstat));
+    raidlist = malloc(sizeof(struct raidlist_itself));
 
     assert(wait_for_percentage <= 100);
     iamhere("Help, my boat is sync'ing. (Get it? Urp! Urp!)");
     while (unfinished_mdstat_devices > 0) {
-        if (read_mdstat(mdstat, mdstat_file)) {
-            log_to_screen("Sorry, cannot read %s", mdstat_file);
+            // FIXME: Prefix '/dev/' should really be dynamic!
+        if (parse_mdstat(raidlist, "/dev/")) {
+            log_to_screen("Sorry, cannot read %s", MDSTAT_FILE);
+            log_msg(1,"Sorry, cannot read %s", MDSTAT_FILE);
             return;
         }
-        for (unfinished_mdstat_devices = i = 0; i < mdstat->entries; i++) {
-            if (mdstat->el[i].progress < wait_for_percentage) {
+        for (unfinished_mdstat_devices = i = 0; i <= raidlist->entries; i++) {
+            if (raidlist->el[i].progress < wait_for_percentage) {
                 unfinished_mdstat_devices++;
-                sprintf(screen_message, "Sync'ing /dev/md%d",
-                        mdstat->el[i].md);
+                log_msg(1,"Sync'ing %s (i=%d)", raidlist->el[i].raid_device, i);
+                sprintf(screen_message, "Sync'ing %s",
+                        raidlist->el[i].raid_device);
                 open_evalcall_form(screen_message);
-                if (mdstat->el[i].progress == -1)   // delayed while another partition inits
+                if (raidlist->el[i].progress == -1) // delayed while another partition inits
                 {
                     continue;
                 }
-                while (mdstat->el[i].progress < wait_for_percentage) {
-                    update_evalcall_form(mdstat->el[i].progress);
+                while (raidlist->el[i].progress < wait_for_percentage) {
+                    log_msg(1,"Percentage sync'ed: %d", raidlist->el[i].progress);
+                    update_evalcall_form(raidlist->el[i].progress);
                     sleep(2);
-                    if (read_mdstat(mdstat, mdstat_file)) {
+                    // FIXME: Prefix '/dev/' should really be dynamic!
+                    if (parse_mdstat(raidlist, "/dev/")) {
                         break;
                     }
@@ -2621 +2626 @@
     }
     paranoid_free(screen_message);
-    paranoid_free(mdstat);
-}
+    paranoid_free(raidlist);
+}

branches/2.0.8/mondo/mondo/mondorestore/mondoprep.h

@@ -58 +58 @@
 int start_all_raid_devices(struct mountlist_itself *);
 int stop_all_raid_devices(struct mountlist_itself *);
-int format_everything(struct mountlist_itself *, bool);
+int format_everything(struct mountlist_itself *, bool, struct raidlist_itself *);
 int partition_device(FILE *, const char *, int, int, const char *,
                      long long);
@@ -65 +65 @@
 int partition_device_with_fdisk(FILE *, const char *, int, int,
                                 const char *, long long);
-int format_device(char *, char *);
+int format_device(char *, char *, struct raidlist_itself *);
 int partition_drive(struct mountlist_itself *, char *);
 int partition_everything(struct mountlist_itself *);

branches/2.0.8/mondo/mondo/mondorestore/mr-externs.h

@@ -27 +27 @@
 extern int edit_mountlist(char *mountlist_fname, struct mountlist_itself *,
                           struct raidlist_itself *);
-extern int format_everything(struct mountlist_itself *, bool);
-extern int format_device(char *, char *);
+extern int format_everything(struct mountlist_itself *, bool, struct raidlist_itself *);
+extern int format_device(char *, char *, struct raidlist_itself *);
 extern void finish(int);
 extern void free_filelist(struct s_node *);