Changeset 3432 in MondoRescue for branches

Timestamp:

Aug 28, 2015, 2:34:47 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Change analyze-my-lvm in order to generate percentage of Extents of a VG to use to create the LV instead of a fixed size. Should improve bugs when creating LVM on a disk of different size greatly.

Location:

branches/3.2

Files:

• MondoRescue/lib/MondoRescue/Disk.pm (modified) (1 diff)
• MondoRescue/lib/MondoRescue/LVM.pm (modified) (2 diffs)
• mindi/analyze-my-lvm (modified) (2 diffs)
• mindi/mindi (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (3 diffs)

branches/3.2/MondoRescue/lib/MondoRescue/Disk.pm

@@ -64 +64 @@
 return ($type);
 }
+
+

branches/3.2/MondoRescue/lib/MondoRescue/LVM.pm

@@ -160 +160 @@
 
 The LVM hash is indexed by VGs, provided by the vg_name attribute of the pvs command
+
 vg_name              - Name of the volume group linked to this PV
 
@@ -169 +170 @@
 
 The structure contains an array of PVs called pvs and starting at 1, containing the name of the PV as provided by the pv_name attribute of the pvs command
+
 pv_name              - Name of the physical volume PV
 

branches/3.2/mindi/analyze-my-lvm

@@ -82 +82 @@
     local device stripes stripesize device fname allocation output readahead
     fname=$MINDI_TMP/PLF.$$.txt
+    fname2=$MINDI_TMP/PLF2.$$.txt
     device=$1
     output=""
@@ -89 +90 @@
     [ "$stripesize" = "m" ] && stripesize=`GetValueFromField $fname "Stripe size (KByte)"`k
     [ "$stripesize" = "k" ] && stripesize=""
-    allocation=`GetValueFromField $fname "LV Size"`
-    [ ! "`echo "$allocation" | grep "[k,m,g,t]"`" ] && allocation="$allocation"m
-    if echo "$allocation" | grep -E '^.*g$' > /dev/null 2> /dev/null ; then
-        val=`echo "$allocation" | sed s/g//`
-        allocation=`echo "$val" | awk '{c=$1; printf "%d", c*1024;}'`m
-    fi
+    currentLE=`GetValueFromField $fname "Current LE"`
+    vgname=`GetValueFromField $fname "VG Name"`
+    $LVMCMD vgdisplay $vgname | cat > $fname2
+    totalLE=`GetValueFromField $fname2 "Total PE"`
+    allocation=`perl -e '$per='$currentLE'*100/'$totalLE' ; print int($per+0.5)."%VG";'`
     readahead=`GetValueFromField $fname "Read ahead sectors"`
-    rm -f $fname
+    rm -f $fname $fname2
     [ "$stripes" ]    && output="$output -i $stripes"
     [ "$stripesize" ] && output="$output -I $stripesize"
-    [ "$allocation" ] && output="$output -L $allocation"
+    [ "$allocation" ] && output="$output -l $allocation"
     [ "$readahead" ]  && output="$output -r $readahead"
     echo "$output"

branches/3.2/mindi/mindi

@@ -144 +144 @@
     if [ _"$2" != _"" ]; then
         grep -Ev "tar: Removing [a-z ]*\`/\'" "$2" >> $LOGFILE
-    fi
-    rm -f "$2"
+        rm -f "$2"
+    fi
 }
 

branches/3.2/mondo/src/common/libmondo-devices.c

@@ -1091 +1091 @@
 
     if (device_raw[0] != '/' && !strstr(device_raw, ":/")) {
-        log_msg(1, "%s needs to have a '/' prefixed - I'll do it",
-                device_raw);
+        log_msg(1, "%s needs to have a '/' prefixed - I'll do it", device_raw);
         mr_asprintf(tmp, "/%s", device_raw);
     } else {
@@ -1099 +1098 @@
     log_msg(1, "Is %s mounted?", tmp);
     if (!strcmp(tmp, "/proc") || !strcmp(tmp, "proc")) {
-        log_msg(1,
-                "I don't know how the heck /proc made it into the mountlist. I'll ignore it.");
+        log_msg(1, "I don't know how the heck /proc made it into the mountlist. I'll ignore it.");
         mr_free(tmp);
         return(FALSE);
@@ -1124 +1122 @@
     mr_free(device_with_tab);
     paranoid_pclose(fin);
+
     mr_asprintf(tmp, "%s | grep -E \"^%s\" > /dev/null 2> /dev/null", SWAPLIST_COMMAND, device_with_space);
     mr_free(device_with_space);