Attachment 467772 Details for Bug 651445 – new patch (inclusive of previous) that accounts for --percent and --recommended together in same vg

[patch] new patch (inclusive of previous) that accounts for --percent and --recommended together in same vg

anaconda-percent.patch (text/plain), 3.64 KB, created by John Ruemker on 2010-12-09 15:55:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Ruemker

Created: 2010-12-09 15:55:35 UTC

Size: 3.64 KB

patch

obsolete

>diff --git a/kickstart.py b/kickstart.py
>index cc138ad..400bec7 100644
>--- a/kickstart.py
>+++ b/kickstart.py
>@@ -656,7 +656,7 @@ class PartitionData(commands.partition.F12_PartData):
>             self.mountpoint = ""
>             if self.recommended:
>                 (self.size, self.maxSizeMB) = iutil.swapSuggestion()
>-                self.grow = True
>+                self.grow = False
>         # if people want to specify no mountpoint for some reason, let them
>         # this is really needed for pSeries boot partitions :(
>         elif self.mountpoint == "None":
>diff --git a/storage/partitioning.py b/storage/partitioning.py
>index e12b3e3..3f27fc7 100644
>--- a/storage/partitioning.py
>+++ b/storage/partitioning.py
>@@ -1717,14 +1717,16 @@ def growLVM(storage):
> 
>         # This first loop is to calculate percentage-based growth
>         # amounts. These are based on total free space.
>+        using_percents = False
>         lvs = vg.lvs
>         lvs.sort(cmp=lvCompare)
>         for lv in lvs:
>             if not lv.req_grow or not lv.req_percent:
>                 continue
> 
>+            using_percents = True
>             portion = (lv.req_percent * 0.01)
>-            grow = portion * vg.vgFree
>+            grow = portion * vg.freeSpace
>             new_size = lv.req_size + grow
>             if lv.req_max_size and new_size > lv.req_max_size:
>                 grow -= (new_size - lv.req_max_size)
>@@ -1790,29 +1792,34 @@ def growLVM(storage):
>             lv.size += grow_amounts[lv.name]
> 
>         # now there shouldn't be any free space left, but if there is we
>-        # should allocate it to one of the LVs
>-        vg_free = vg.freeSpace
>-        log.debug("vg %s has %dMB free" % (vg.name, vg_free))
>-        if vg_free:
>-            for lv in lvs:
>-                if not lv.req_grow:
>-                    continue
>+        # should allocate it to one of the LVs, unless percentages have
>+        # been specified
>+        if not using_percents:
>+            vg_free = vg.freeSpace
>+    	    log.debug("vg %s has %dMB free" % (vg.name, vg_free))
>+            if vg_free:
>+                for lv in lvs:
>+                    if not lv.req_grow:
>+                        continue
> 
>-                if lv.req_max_size and lv.size == lv.req_max_size:
>-                    continue
>+                    if lv.req_percent > 0:
>+                        continue
> 
>-                if lv.format.maxSize and lv.size == lv.format.maxSize:
>-                    continue
>+                    if lv.req_max_size and lv.size == lv.req_max_size:
>+                        continue
>+
>+                    if lv.format.maxSize and lv.size == lv.format.maxSize:
>+                        continue
> 
>-                # first come, first served
>-                projected = lv.size + vg.freeSpace
>-                if lv.req_max_size and projected > lv.req_max_size:
>-                    projected = lv.req_max_size
>+                    # first come, first served
>+                    projected = lv.size + vg.freeSpace
>+                    if lv.req_max_size and projected > lv.req_max_size:
>+                        projected = lv.req_max_size
> 
>-                if lv.format.maxSize and projected > lv.format.maxSize:
>-                    projected = lv.format.maxSize
>+                    if lv.format.maxSize and projected > lv.format.maxSize:
>+                        projected = lv.format.maxSize
> 
>-                log.debug("giving leftover %dMB to %s" % (projected - lv.size,
>+                    log.debug("giving leftover %dMB to %s" % (projected - lv.size,
>                                                           lv.name))
>-                lv.size = projected
>+                    lv.size = projected
>

Actions: View | Diff

Attachments on bug 651445: 459149 | 459153 | 459203 | 459204 | 467772 | 467773