From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id D81F51FF176
for <inbox@lore.proxmox.com>; Fri, 7 Mar 2025 09:14:39 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 7F2A314547;
Fri, 7 Mar 2025 09:14:34 +0100 (CET)
References: <20250303144253.1140731-1-m.sandoval@proxmox.com>
<sreeukcmnl4lqj3ookyrfr2dm4new5gm3magemwrt2ah57qhiz@b2s35kdk6iod>
User-agent: mu4e 1.10.8; emacs 30.1
From: Maximiliano Sandoval <m.sandoval@proxmox.com>
To: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Fri, 07 Mar 2025 09:14:23 +0100
In-reply-to: <sreeukcmnl4lqj3ookyrfr2dm4new5gm3magemwrt2ah57qhiz@b2s35kdk6iod>
Message-ID: <s8omsdx45qx.fsf@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.099 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: Re: [pve-devel] [PATCH] systemd: disconnect signals
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Cc: pve-devel@lists.proxmox.com
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
Wolfgang Bumiller <w.bumiller@proxmox.com> writes:
> On Mon, Mar 03, 2025 at 03:42:53PM +0100, Maximiliano Sandoval wrote:
>> Dbus has a limit of 512 connections by default and signals should be
>> disconnected as soon as they are not needed anymore.
>>
>> This should alleviate https://bugzilla.proxmox.com/show_bug.cgi?id=5876.
>>
>> Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
>> ---
>> src/PVE/Systemd.pm | 34 ++++++++++++++++++++++++++++------
>> 1 file changed, 28 insertions(+), 6 deletions(-)
>>
>> diff --git a/src/PVE/Systemd.pm b/src/PVE/Systemd.pm
>> index 07c912e3..1d7772d9 100644
>> --- a/src/PVE/Systemd.pm
>> +++ b/src/PVE/Systemd.pm
>> @@ -44,6 +44,7 @@ sub unescape_unit {
>> # main loop is being used as we need to wait signals.
>> sub systemd_call($;$) {
>> my ($code, $timeout) = @_;
>> + my $signal_info;
>>
>> my $bus = Net::DBus->system();
>> my $reactor = Net::DBus::Reactor->main();
>> @@ -64,13 +65,22 @@ sub systemd_call($;$) {
>> $timer = undef;
>> }
>>
>> + if (defined($signal_info)) {
>> + if (my $signal_name = $signal_info->{name}) {
>> + if (my $signal_handle = $signal_info->{handle}) {
>
> I think it's enough to require the info to either be valid or undef,
> therefore the first `if` should suffice.
>
>> + $if->disconnect_from_signal($signal_name, $signal_handle);
>> + }
>> + }
>> + $signal_info = undef;
>> + }
>> +
>> if (defined($reactor)) {
>> $reactor->shutdown();
>> $reactor = undef;
>> }
>> };
>>
>> - my $result = $code->($if, $reactor, $finish_callback);
>> + (my $result, $signal_info) = $code->($if, $reactor, $finish_callback);
>> # Are we done immediately?
>> return $result if defined $result;
>>
>> @@ -124,7 +134,8 @@ sub enter_systemd_scope {
>>
>> my $job;
>>
>> - $if->connect_to_signal('JobRemoved', sub {
>> + my $signal_name = 'JobRemoved';
>> + my $signal_handle = $if->connect_to_signal($signal_name, sub {
>> my ($id, $removed_job, $signaled_unit, $result) = @_;
>> return if $signaled_unit ne $unit || $removed_job ne $job;
>> if ($result ne 'done') {
>> @@ -139,7 +150,12 @@ sub enter_systemd_scope {
>>
>> $job = $if->StartTransientUnit($unit, 'fail', $properties, []);
>>
>> - return undef;
>> + my $signal_info = {
>> + name => $signal_name,
>> + handle => $signal_handle,
>> + };
>> +
>> + return (undef, $signal_info);
>> }, $timeout);
>> }
>>
>> @@ -152,18 +168,24 @@ sub wait_for_unit_removed($;$) {
>> my $unit_obj = eval { $if->GetUnit($unit) };
>> return 1 if !$unit_obj;
>>
>> - $if->connect_to_signal('UnitRemoved', sub {
>> + my $signal_name = 'UnitRemoved';
>> + my $signal_handle = $if->connect_to_signal($signal_name, sub {
>> my ($id, $removed_unit) = @_;
>> $finish_cb->(1) if $removed_unit eq $unit_obj;
>> });
>>
>> + my $signal_info = {
>> + name => $signal_name,
>> + handle => $signal_handle,
>> + };
>> +
>> # Deal with what we lost between GetUnit() and connecting to UnitRemoved:
>> my $unit_obj_new = eval { $if->GetUnit($unit) };
>> if (!$unit_obj_new) {
>> - return 1;
>> + return (1, $signal_info);
>> }
>>
>> - return undef;
>> + return (undef, $signal_info);
>> }, $timeout);
>> }
>>
>> --
>> 2.39.5
v2 sent.
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel