Merge ~troyanov/maas:backport-d792780-3.5 into maas:3.5

Proposed by Anton Troyanov
Status: Merged
Approved by: Anton Troyanov
Approved revision: f30301f8493d90136aa0ee9aaf1dd874210751f6
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~troyanov/maas:backport-d792780-3.5
Merge into: maas:3.5
Diff against target: 38 lines (+17/-3)
1 file modified
src/provisioningserver/utils/deb.py (+17/-3)
Reviewer Review Type Date Requested Status
Anton Troyanov Approve
Review via email: mp+463682@code.launchpad.net

Commit message

Fixing memory leak when we use apt_pkg in deb.py

(cherry picked from commit d792780dbd0571fcd94e22cb7ce559d5f69aa1a0)

To post a comment you must log in.
Revision history for this message
Anton Troyanov (troyanov) wrote :

Self approving backport

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/provisioningserver/utils/deb.py b/src/provisioningserver/utils/deb.py
2index afa6aa5..6722489 100644
3--- a/src/provisioningserver/utils/deb.py
4+++ b/src/provisioningserver/utils/deb.py
5@@ -14,6 +14,22 @@ maaslog = get_maas_logger("deb")
6
7 MAAS_PACKAGES = ("maas-region-api", "maas-rack-controller")
8
9+APT_PKG = None
10+
11+
12+def get_apt_pkg():
13+ """Return the initalized apt_pkg."""
14+ global APT_PKG
15+ # Make sure that .init() is only called after initial import.
16+ # init() can be slow, and cause memory leaks if called multiple
17+ # times.
18+ if APT_PKG is None:
19+ import apt_pkg
20+
21+ apt_pkg.init()
22+ APT_PKG = apt_pkg
23+ return APT_PKG
24+
25
26 @dataclasses.dataclass
27 class DebVersion:
28@@ -44,9 +60,7 @@ def get_deb_versions_info(apt_pkg=None) -> Optional[DebVersionsInfo]:
29 """Return versions information for Debian-based MAAS."""
30
31 if apt_pkg is None:
32- import apt_pkg
33-
34- apt_pkg.init()
35+ apt_pkg = get_apt_pkg()
36
37 try:
38 cache = apt_pkg.Cache(None)

Subscribers

People subscribed via source and target branches