Save memory less agressively

This commit is contained in:
Lubomír Sedlář 2018-10-15 16:26:51 +02:00
parent 5d69a0a97b
commit 8480fd3241
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,33 @@
From 844f2005a0d9e0848a03a328d5a0770c9072e1a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
Date: Mon, 15 Oct 2018 15:34:35 +0200
Subject: [PATCH] Save memory less agressively
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
We can't drop the whole package set once the first solver iteration
finishes, because it runs for each arch separately and we need the data
for each of them. We can however delete the arch specific portion.
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
pungi/phases/gather/methods/method_deps.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pungi/phases/gather/methods/method_deps.py b/pungi/phases/gather/methods/method_deps.py
index 3c7b54fb..083992ef 100644
--- a/pungi/phases/gather/methods/method_deps.py
+++ b/pungi/phases/gather/methods/method_deps.py
@@ -146,7 +146,7 @@ def write_pungi_config(compose, arch, variant, packages, groups, filter_packages
'{0.name}-{1}:{0.version}-{0.release}'.format(rpm_obj, rpm_obj.epoch or 0))
# Drop the packageset to hopefully save some memory
- variant.pkgset = None
+ variant.pkgset.rpms_by_arch[arch] = None
pungi_wrapper.write_kickstart(
ks_path=pungi_cfg, repos=repos, groups=groups, packages=packages_str,
--
2.17.2

View File

@ -1,6 +1,6 @@
Name: pungi Name: pungi
Version: 4.1.29 Version: 4.1.29
Release: 2%{?dist} Release: 3%{?dist}
Summary: Distribution compose tool Summary: Distribution compose tool
Group: Development/Tools Group: Development/Tools
@ -10,6 +10,7 @@ Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
Patch0: 0001-Revert-Move-ostree-phase-and-pipelines-for-running-p.patch Patch0: 0001-Revert-Move-ostree-phase-and-pipelines-for-running-p.patch
Patch1: 0002-Revert-Other-repo-for-OstreeInstaller.patch Patch1: 0002-Revert-Other-repo-for-OstreeInstaller.patch
Patch2: 0003-Revert-Ostree-can-use-pkgset-repos.patch Patch2: 0003-Revert-Ostree-can-use-pkgset-repos.patch
Patch3: 0001-Save-memory-less-agressively.patch
BuildRequires: python3-nose BuildRequires: python3-nose
BuildRequires: python3-mock BuildRequires: python3-mock
@ -183,6 +184,9 @@ nosetests-3 --exe
%{_bindir}/%{name}-wait-for-signed-ostree-handler %{_bindir}/%{name}-wait-for-signed-ostree-handler
%changelog %changelog
* Mon Oct 15 2018 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.29-3
- Save memory less agressively
* Wed Oct 10 2018 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.29-2 * Wed Oct 10 2018 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.29-2
- Add dependency on xorriso to pungi-legacy - Add dependency on xorriso to pungi-legacy
- Bump dependency on python-productmd - Bump dependency on python-productmd