Projects
openEuler:24.03:SP1:Everything
firewalld
_service:tar_scm:backport-fix-nm-release-NM-cli...
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File _service:tar_scm:backport-fix-nm-release-NM-client-after-a-timeout.patch of Package firewalld
From eb76e2a80a43481da7a54ff784edf1c76651db96 Mon Sep 17 00:00:00 2001 From: Eric Garver <eric@garver.life> Date: Wed, 22 Nov 2023 12:10:09 -0500 Subject: [PATCH] fix(nm): release NM client after a timeout Conflict: NA Reference: https://github.com/firewalld/firewalld/commit/eb76e2a80a43481da7a54ff784edf1c76651db96 libnm will accumulate a bunch of data, e.g. routes, that is irrelevant to firewalld. To avoid unbound growth in memory we can destroy the client and reinitialize it when we query NM. Fixes: #1232 --- src/firewall/core/fw_nm.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/firewall/core/fw_nm.py b/src/firewall/core/fw_nm.py index 0e38dd4..c1f8e1d 100644 --- a/src/firewall/core/fw_nm.py +++ b/src/firewall/core/fw_nm.py @@ -39,6 +39,7 @@ else: except (ImportError, ValueError, GLib.Error): _nm_imported = False _nm_client = None +_nm_client_timeout = None from firewall import errors from firewall.errors import FirewallError @@ -61,9 +62,28 @@ def nm_get_client(): """Returns the NM client object or None if the import of NM failed @return NM.Client instance if import was successful, None otherwise """ + + def _release(): + """ + Release the client to avoid excess memory usage when libnm pushes + irrelevant (to firewalld) updates. + """ + global _nm_client + global _nm_client_timeout + _nm_client = None + _nm_client_timeout = None + global _nm_client + global _nm_client_timeout + if not _nm_client: _nm_client = NM.Client.new(None) + else: + # refresh timer + GLib.source_remove(_nm_client_timeout) + + _nm_client_timeout = GLib.timeout_add_seconds(5, _release) + return _nm_client def nm_get_zone_of_connection(connection): -- 2.33.0
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2