Changeset 2989 in MondoRescue

Timestamp:

Apr 4, 2012, 2:27:02 PM (12 years ago)

Author:

Bruno Cornec

Message:

r4626@localhost: bruno | 2012-03-30 16:24:25 +0200

• Handle the md version as an additional param in raidtab per device to solve various bug reports, including the previous one mentioned today. Doesn't still fully work, as not generating correctly the -e option, whereas the raidrec structure is correct

Location:

branches/3.0/mondo/src

Files:

• common/libmondo-raid.c (modified) (9 diffs)
• mondorestore/mondo-prep.c (modified) (3 diffs)

branches/3.0/mondo/src/common/libmondo-raid.c

@@ -598 +598 @@
 {
     FILE *fin;
-    char *tmp;
     char *label;
     char *value;
@@ -604 +603 @@
     int v;
 
-    malloc_string(tmp);
-    malloc_string(label);
-    malloc_string(value);
     assert(raidlist != NULL);
     assert_string_is_neither_NULL_nor_zerolength(fname);
@@ -613 +609 @@
         log_it("Raidtab is very small or non-existent. Ignoring it.");
         raidlist->entries = 0;
-        paranoid_free(tmp);
-        paranoid_free(label);
-        paranoid_free(value);
         return (0);
     }
     if (!(fin = fopen(fname, "r"))) {
         log_it("Cannot open raidtab");
-        paranoid_free(tmp);
-        paranoid_free(label);
-        paranoid_free(value);
         return (1);
     }
+    malloc_string(label);
+    malloc_string(value);
     items = 0;
     log_it("Loading raidtab...");
@@ -636 +628 @@
             strcpy(raidlist->el[items].additional_vars.el[v].label, label);
             strcpy(raidlist->el[items].additional_vars.el[v].value, value);
+            log_msg(2,"Found raidtab entry Label: %s Value: %s",raidlist->el[items].additional_vars.el[v].label,raidlist->el[items].additional_vars.el[v].value);
             v++;
             get_next_raidtab_line(fin, label, value);
-            log_it(tmp);
         }
         raidlist->el[items].additional_vars.entries = v;
@@ -658 +650 @@
     log_msg(1, "Raidtab loaded successfully.");
     log_msg(1, "%d RAID devices in raidtab", items);
-    paranoid_free(tmp);
     paranoid_free(label);
     paranoid_free(value);
@@ -710 +701 @@
             raidrec->raid_level = atoi(value);
         }
+        log_msg(4,"Found raid level %d",raidrec->raid_level);
     } else if (!strcmp(label, "nr-raid-disks")) {   /* ignore it */
     } else if (!strcmp(label, "nr-spare-disks")) {  /* ignore it */
@@ -730 +722 @@
             log_msg(1, "Unknown RAID parity algorithm '%s'\n.", value);
         }
+        log_msg(4,"Found raid parity %d",raidrec->parity);
     } else if (!strcmp(label, "device")) {
         get_next_raidtab_line(fin, labelB, valueB);
@@ -755 +748 @@
         strcpy(raidrec->additional_vars.el[v].label, label);
         strcpy(raidrec->additional_vars.el[v].value, value);
-        raidrec->additional_vars.entries = ++v;
+        log_msg(4,"Found additional raid pair #%d: %s / %s",v,raidrec->additional_vars.el[v].label,raidrec->additional_vars.el[v].value);
+        v++;
+        raidrec->additional_vars.entries = v;
     }
     paranoid_free(labelB);
@@ -1042 +1037 @@
             strcpy(raidlist->el[raidlist->entries].additional_vars.el[v].label, "UUID");
             mr_asprintf(&cmd,"mdadm --detail %s | grep UUID | cut -d: -f2- | sed 's/^ *//'", raidlist->el[raidlist->entries].raid_device);
+            mr_asprintf(&strtmp, "%s", call_program_and_get_last_line_of_output(cmd));
+            strcpy(raidlist->el[raidlist->entries].additional_vars.el[v].value, strtmp);
+            mr_free(strtmp);
+            v++;
+            // store the Version value in the additional_vars structure
+            strcpy(raidlist->el[raidlist->entries].additional_vars.el[v].label, "Version");
+            mr_asprintf(&cmd,"mdadm --detail %s | grep Version | cut -d: -f2- | sed 's/^ *//'", raidlist->el[raidlist->entries].raid_device);
             mr_asprintf(&strtmp, "%s", call_program_and_get_last_line_of_output(cmd));
             strcpy(raidlist->el[raidlist->entries].additional_vars.el[v].value, strtmp);

branches/3.0/mondo/src/mondorestore/mondo-prep.c

@@ -565 +565 @@
   char *tmp = NULL;
   char *tmp1 = NULL;
-  char *oldmd = NULL;
-  char *name;
-  char *ver;
-
-  malloc_string(name);
-  malloc_string(ver);
-  
+
   // leave straight away if raidlist is initial or has no entries
   if (!raidlist || raidlist->entries == 0) {
@@ -620 +614 @@
   // - faulty devices ignored
   // - persistent superblock always used as this is recommended
-  // As per bug #473, the parameter "-e 0.90" is used only when:
-  //   1) It detects that system boots from Raid-1
-  //   2) grub bootloader < v1 is used.
-  // Otherwise it won't boot which is bad.
-    if (read_cfg_var(g_mondo_cfg_file, "bootloader.name", name) != 0) {
-            log_msg(2, "Unable to find bootloader.name param in %s conf file\n", g_mondo_cfg_file);
-        strcpy(name,"NONE");
-    }
-    if (read_cfg_var(g_mondo_cfg_file, "bootloader.ver", ver) != 0) {
-            log_msg(2, "No bootloader.ver param in %s conf file\n", g_mondo_cfg_file);
-        strcpy(ver,"NONE");
-    }
-    if (strcmp(name,"GRUB") == 0) {
-        if ((strstr(ver, "GRUB 0.9") != NULL) && (strcmp(raidlist->el[i].raid_device,device) == 0)) {
-            mr_asprintf(&oldmd, "-e 0.90");
-            log_it("Forcing old metadata (%s) for md on %s for old GRUB", oldmd, device);
-        } else {
-            mr_asprintf(&oldmd, "");
-        }
-    } else if ((strcmp(name,"LILO") == 0) && (strcmp(raidlist->el[i].raid_device,device) == 0)) {
-        mr_asprintf(&oldmd, "-e 0.90");
-        log_it("Forcing old metadata (%s) for md on %s for LILO", oldmd, device);
-    } else {
-        mr_asprintf(&oldmd, "");
-    }
-    mr_free(name);
-    mr_free(ver);
-        log_msg(4, "RAID oldmd: %s", oldmd);
-
-  mr_asprintf(&program, "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d %s", raidlist->el[i].raid_device, level, raidlist->el[i].data_disks.entries, oldmd);
-  mr_free(oldmd);
+
+  mr_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);
   mr_free(level);
         log_msg(4, "cmd built: %s", program);
-  // Restoring the UUID stored at backup time of present
-  for (v = 0; v <= raidlist->el[i].additional_vars.entries ; v++ ) {
+  // Restoring the UUID and Version stored at backup time of present
+  for (v = 0; v < raidlist->el[i].additional_vars.entries ; v++ ) {
+      log_msg(4,"Working on additional param #%d (Label: %s)",v,raidlist->el[i].additional_vars.el[v].label);
     if ((raidlist->el[i].additional_vars.el[v].label != NULL) && (strcmp(raidlist->el[i].additional_vars.el[v].label,"UUID") == 0)) {
         // We have a UUID to handle
@@ -663 +629 @@
             break;
         } else {
-            log_it("Unable to manage previous NULL UUID");
+            log_msg(1,"Unable to manage previous NULL UUID");
+        }
+    }
+    if ((raidlist->el[i].additional_vars.el[v].label != NULL) && (strcmp(raidlist->el[i].additional_vars.el[v].label,"Version") == 0)) {
+        // We have a Version to handle
+        if (raidlist->el[i].additional_vars.el[v].value != NULL) {
+            // force its restoration in order to support all complex boot loader + md format cases
+            // Also see bug #473
+            log_it("Managing previous Version %s", raidlist->el[i].additional_vars.el[v].value);
+            mr_strcat(program, " -e %s",raidlist->el[i].additional_vars.el[v].value);
+            break;
+        } else {
+            log_msg(1,"Unable to manage previous NULL Version");
         }
     }