Changeset 2989 in MondoRescue for branches/3.0/mondo/src/common/libmondo-raid.c

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

File:

• branches/3.0/mondo/src/common/libmondo-raid.c (modified) (9 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);