almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

New upstream release 4.1.16

Browse Source
This commit is contained in:
Lubomír Sedlář 2017-06-12 11:56:33 +02:00
parent d2fa77f054
commit 6df1a3e389
3 changed files with 23 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
0001-Ensure-all-phases-are-stopped.patch
View File

@ -1,190 +0,0 @@
From 860124c7d3581a6f268d313420aed27e7218b205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
Date: Mon, 29 May 2017 09:56:23 +0200
Subject: [PATCH] Ensure all phases are stopped
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
If a phase is started successfully, it needs to be stopped as well. In
most cases when `stop` is called immediately after `start`, this is not
a problem.
Only when something else happens while a phase is runnning and this
something fails, Pungi will deadlock and never exit. This something
could be another phase or just main thread raising an exception.
Fixes: #625
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
bin/pungi-koji | 48 ++++++++++++++++++++---------------------------
pungi/phases/__init__.py | 18 ++++++++++++++++++
tests/test_phase_base.py | 49 ++++++++++++++++++++++++++++++++++++++++++++++--
3 files changed, 85 insertions(+), 30 deletions(-)
diff --git a/bin/pungi-koji b/bin/pungi-koji
index c9a3654..480618d 100755
--- a/bin/pungi-koji
+++ b/bin/pungi-koji
@@ -354,25 +354,25 @@ def run_compose(compose, create_latest_link=True, latest_link_status=None):
pkgset_phase.start()
pkgset_phase.stop()
- # BUILDINSTALL phase - start
+ # BUILDINSTALL phase - start, we can run gathering, extra files and
+ # createrepo while buildinstall is in progress.
buildinstall_phase.start()
- # GATHER phase
- gather_phase.start()
- gather_phase.stop()
+ # If any of the following three phases fail, we must ensure that
+ # buildinstall is stopped. Otherwise the whole process will hang.
+ try:
+ gather_phase.start()
+ gather_phase.stop()
+
+ extrafiles_phase.start()
+ extrafiles_phase.stop()
- # EXTRA_FILES phase
- extrafiles_phase.start()
- extrafiles_phase.stop()
+ createrepo_phase.start()
+ createrepo_phase.stop()
- # CREATEREPO phase
- createrepo_phase.start()
- createrepo_phase.stop()
+ finally:
+ buildinstall_phase.stop()
- # BUILDINSTALL phase
- # must finish before PRODUCTIMG
- # must finish before CREATEISO
- buildinstall_phase.stop()
if not buildinstall_phase.skip():
buildinstall_phase.copy_files()
@@ -396,20 +396,12 @@ def run_compose(compose, create_latest_link=True, latest_link_status=None):
timestamp = pungi.metadata.write_discinfo(compose, arch, variant)
pungi.metadata.write_media_repo(compose, arch, variant, timestamp)
- # CREATEISO and LIVEIMAGES phases
- createiso_phase.start()
- liveimages_phase.start()
- image_build_phase.start()
- livemedia_phase.start()
- ostree_installer_phase.start()
- osbs_phase.start()
-
- createiso_phase.stop()
- liveimages_phase.stop()
- image_build_phase.stop()
- livemedia_phase.stop()
- ostree_installer_phase.stop()
- osbs_phase.stop()
+ # Start all phases for image artifacts
+ pungi.phases.run_all([createiso_phase,
+ liveimages_phase,
+ image_build_phase,
+ ostree_installer_phase,
+ osbs_phase])
image_checksum_phase.start()
image_checksum_phase.stop()
diff --git a/pungi/phases/__init__.py b/pungi/phases/__init__.py
index e0db601..044aa46 100644
--- a/pungi/phases/__init__.py
+++ b/pungi/phases/__init__.py
@@ -31,3 +31,21 @@ from .livemedia_phase import LiveMediaPhase # noqa
from .ostree import OSTreePhase # noqa
from .ostree_installer import OstreeInstallerPhase # noqa
from .osbs import OSBSPhase # noqa
+
+
+def run_all(phases):
+ """Start and stop all given phases and make them run in parallel.
+
+ This function makes sure that even if one of the phases fails and raises an
+ exception, all the phases will still be correctly stopped.
+
+ If multiple phases fail, a exception from one of them will be raised, but
+ there are no guarantees which one it will be.
+ """
+ if not phases:
+ return
+ phases[0].start()
+ try:
+ run_all(phases[1:])
+ finally:
+ phases[0].stop()
diff --git a/tests/test_phase_base.py b/tests/test_phase_base.py
index ea2992d..d0588fe 100644
--- a/tests/test_phase_base.py
+++ b/tests/test_phase_base.py
@@ -8,8 +8,8 @@ import sys
sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
-from pungi.phases import base
-from tests.helpers import DummyCompose, PungiTestCase
+from pungi.phases import run_all, base
+from tests.helpers import DummyCompose, PungiTestCase, boom
class Phase1(base.ImageConfigMixin, base.PhaseBase):
@@ -69,5 +69,50 @@ class ImageConfigMixinTestCase(PungiTestCase):
self.assertEqual(resolve_git_url.num, 3, 'Resolver was not called three times')
+class TestRunAll(unittest.TestCase):
+ def assertFinalized(self, p):
+ self.assertEqual(p.mock_calls, [mock.call.start(), mock.call.stop()])
+
+ def test_calls_stop(self):
+ p1 = mock.Mock()
+ p2 = mock.Mock()
+
+ run_all([p1, p2])
+
+ self.assertFinalized(p1)
+ self.assertFinalized(p2)
+
+ def test_calls_stop_on_failure(self):
+ p1 = mock.Mock()
+ p2 = mock.Mock()
+ p3 = mock.Mock()
+
+ p2.stop.side_effect = boom
+
+ with self.assertRaises(Exception) as ctx:
+ run_all([p1, p2, p3])
+
+ self.assertEqual('BOOM', str(ctx.exception))
+ self.assertFinalized(p1)
+ self.assertFinalized(p2)
+ self.assertFinalized(p3)
+
+ def test_multiple_fail(self):
+ p1 = mock.Mock(name='p1')
+ p2 = mock.Mock(name='p2')
+ p3 = mock.Mock(name='p3')
+
+ p2.stop.side_effect = boom
+ p3.stop.side_effect = boom
+
+ with self.assertRaises(Exception) as ctx:
+ run_all([p1, p2, p3])
+
+ self.assertEqual('BOOM', str(ctx.exception))
+ self.assertFinalized(p1)
+ self.assertFinalized(p2)
+ self.assertFinalized(p3)
+
+
if __name__ == "__main__":
unittest.main()
--
2.9.4

26
pungi.spec
View File

@ -1,13 +1,12 @@
Name: pungi
Version: 4.1.15
Release: 2%{?dist}
Version: 4.1.16
Release: 1%{?dist}
Summary: Distribution compose tool
Group: Development/Tools
License: GPLv2
URL: https://pagure.io/pungi
Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
Patch0: 0001-Ensure-all-phases-are-stopped.patch
BuildRequires: python-nose, python-mock
BuildRequires: python-devel, python-setuptools, python2-productmd >= 1.3
@ -77,7 +76,6 @@ notification to Fedora Message Bus.
%prep
%setup -q
%patch0 -p1
%build
%{__python} setup.py build
@ -122,6 +120,26 @@ cd tests && ./test_compose.sh
%{_bindir}/%{name}-compare-depsolving
%changelog
* Mon Jun 12 2017 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.16-1
- Fix changelog generator script (lsedlar)
- util: Retry resolving git branches (lsedlar)
- arch: Move exclu(de|sive)arch check to a function (lsedlar)
- gather-source: Check arch in module source (jkaluza)
- koji-wrapper: Stop mangling env variables (lsedlar)
- Ensure all phases are stopped (lsedlar)
- comps-wrapper: Report unknown package types (lsedlar)
- Generate proper modular metadata when there are different versions of the
same package in the variant (jkaluza)
- checks: Make gpgkey a boolean option (lsedlar)
- ostree: Refactor writing repo file (lsedlar)
- iso-wrapper: Capture debug information for mounting (lsedlar)
- comps-wrapper: Fix crash on conditional packages (lsedlar)
- gather: Don't resolve dependencies in lookaside (lsedlar)
- koji-wrapper: Run all blocking commands with fresh ccache (lsedlar)
- Add @retry decorator and use it to retry connection on PDC on IOError and in
SCM's retry_run. (jkaluza)
- Remove shebang from non-executable files (lsedlar)
* Mon Jun 05 2017 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.15-2
- Ensure proper exit on failure

2
sources
View File

@ -1 +1 @@
SHA512 (pungi-4.1.15.tar.bz2) = 7748f7c0f111dbafeaa58299740c6fcac0ad981b7052ab321c9e281e3a53df1aace561b2072d482883b37c59f9726db49a3419a340abaffb0f3859bfd3dbe1c7
SHA512 (pungi-4.1.16.tar.bz2) = 6addda69782f476077059ff08b5e88c45029b347e5836c59d5636b00988dc6e2f04e91fba0471cd7aa053aabcad0d7554019fd36068b508b5bd979993f83d87d