summaryrefslogtreecommitdiffstats
path: root/isys
diff options
context:
space:
mode:
authorAles Kozumplik <akozumpl@redhat.com>2010-05-05 11:00:59 +0200
committerAles Kozumplik <akozumpl@redhat.com>2010-05-06 14:57:11 +0200
commitfbe24fe21350eec043d3f8ad41c1908b0878114a (patch)
treeca170e2762d32ac2b01dfc3c92c2f3a04846bb88 /isys
parent5c8be71aab71654c29df8a0950372c41e8a47aad (diff)
memory: increase the RAM limits, check for URL installs (#549653).
Due to higher memory consumption of LVM, kernel, anaconda and other running processes in general our current memory limits are insufficient and the increase is neccessary. I am also introducing additional check for URL installs which require another 108 MB from the ramdisk, no need to penalize other install methods. This is the current memory budget: - unpacked initrd takes 63 MB - running processes (anaconda, loader, udev, nm): 67 MB (estimate) - peak LVM memory consumption: up to additional 56 MB - with URL install install.img takes additional: 108 MB - memory requriements of X additional: 256 MB (estimate) Currently we always expect there will be calls to lvm (though we could do another memory check just at the moment where the necessity arises). All of the estimates are on the upper bound, still I am running into OOM easily with text install+http stage2+lvm detection with the old limits.
Diffstat (limited to 'isys')
-rw-r--r--isys/isys.c1
-rw-r--r--isys/isys.h5
-rwxr-xr-xisys/isys.py1
3 files changed, 5 insertions, 2 deletions
diff --git a/isys/isys.c b/isys/isys.c
index 6b49ba625..409170b29 100644
--- a/isys/isys.c
+++ b/isys/isys.c
@@ -313,6 +313,7 @@ void init_isys(void) {
PyDict_SetItemString(d, "MIN_RAM", PyInt_FromLong(MIN_RAM));
PyDict_SetItemString(d, "MIN_GUI_RAM", PyInt_FromLong(MIN_GUI_RAM));
+ PyDict_SetItemString(d, "URL_INSTALL_EXTRA_RAM", PyInt_FromLong(URL_INSTALL_EXTRA_RAM));
PyDict_SetItemString(d, "EARLY_SWAP_RAM", PyInt_FromLong(EARLY_SWAP_RAM));
}
diff --git a/isys/isys.h b/isys/isys.h
index 265dc7760..e3cb1fca5 100644
--- a/isys/isys.h
+++ b/isys/isys.h
@@ -20,8 +20,9 @@
#ifndef H_ISYS
#define H_ISYS
-#define MIN_RAM 131072
-#define MIN_GUI_RAM 393216
+#define MIN_RAM 262144 // 256 MB
+#define MIN_GUI_RAM 524288 // 512 MB
+#define URL_INSTALL_EXTRA_RAM 131072 // 128 MB
#define EARLY_SWAP_RAM 524288
#define OUTPUT_TERMINAL "/dev/tty5"
diff --git a/isys/isys.py b/isys/isys.py
index b16c8e4e0..38eafe791 100755
--- a/isys/isys.py
+++ b/isys/isys.py
@@ -61,6 +61,7 @@ mountCount = {}
MIN_RAM = _isys.MIN_RAM
MIN_GUI_RAM = _isys.MIN_GUI_RAM
+URL_INSTALL_EXTRA_RAM = _isys.URL_INSTALL_EXTRA_RAM
EARLY_SWAP_RAM = _isys.EARLY_SWAP_RAM
## Get the amount of free space available under a directory path.