From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 54D7799BC for ; Mon, 26 Jun 2023 11:42:52 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 38AE025FF4 for ; Mon, 26 Jun 2023 11:42:52 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 26 Jun 2023 11:42:51 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 5BE4E7FC0; Mon, 26 Jun 2023 11:42:44 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 41830350DD5; Mon, 26 Jun 2023 11:42:44 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 26 Jun 2023 11:42:42 +0200 Message-Id: <20230626094242.1981493-2-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230626094242.1981493-1-aderumier@odiso.com> References: <20230626094242.1981493-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.020 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 HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [ifupdown2 1/1] patch: add missing import traceback in scheduler X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Jun 2023 09:42:52 -0000 upstream: https://github.com/CumulusNetworks/ifupdown2/pull/267 if a script in /etc/network/ifup.d/ is segfaulting, ifup is crashing with info: executing2 /etc/network/if-up.d/postfix debug: lo: up : running script /etc/network/if-up.d/resolved info: executing2 /etc/network/if-up.d/resolved error: name 'traceback' is not defined debug: saving state .. info: exit status 1 Signed-off-by: Alexandre Derumier --- debian/patches/series | 1 + .../0001-scheduler-import-traceback.patch | 60 +++++++++++++++++++ ifupdown2 | 2 +- 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 debian/patches/upstream/0001-scheduler-import-traceback.patch diff --git a/debian/patches/series b/debian/patches/series index 9f2936f..9017c04 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ pve/0008-lacp-bond-remove-bond-min-links-0-warning.patch pve/0009-gvgeb-fix-python-interpreter-shebang.patch upstream/0001-add-ipv6-slaac-support-inet6-auto-accept_ra.patch upstream/0001-addons-ethtool-add-rx-vlan-filter.patch +upstream/0001-scheduler-import-traceback.patch \ No newline at end of file diff --git a/debian/patches/upstream/0001-scheduler-import-traceback.patch b/debian/patches/upstream/0001-scheduler-import-traceback.patch new file mode 100644 index 0000000..296445d --- /dev/null +++ b/debian/patches/upstream/0001-scheduler-import-traceback.patch @@ -0,0 +1,60 @@ +From 4b674a4c722c3e2072cf9e7d6d08195d9da7b698 Mon Sep 17 00:00:00 2001 +From: Alexandre Derumier +Date: Mon, 26 Jun 2023 11:14:26 +0200 +Subject: [PATCH] scheduler: import traceback + +if a script in /etc/network/ifup.d/ is segfaulting, + +on config loading (ifup -a), ifupdown2 is stopping + +ifup -a +" +info: executing2 /etc/network/if-up.d/postfix +debug: lo: up : running script /etc/network/if-up.d/resolved +info: executing2 /etc/network/if-up.d/resolved +error: name 'traceback' is not defined +debug: saving state .. +info: exit status 1 +" + +with this fix: + +debug: lo: up : running script /etc/network/if-up.d/resolved +info: executing2 /etc/network/if-up.d/resolved + File "/usr/share/ifupdown2/ifupdown/scheduler.py", line 325, in run_iface_list + cls.run_iface_graph(ifupdownobj, ifacename, ops, parent, + File "/usr/share/ifupdown2/ifupdown/scheduler.py", line 315, in run_iface_graph + cls.run_iface_list_ops(ifupdownobj, ifaceobjs, ops) + File "/usr/share/ifupdown2/ifupdown/scheduler.py", line 188, in run_iface_list_ops + cls.run_iface_op(ifupdownobj, ifaceobj, op, + File "/usr/share/ifupdown2/ifupdown/scheduler.py", line 150, in run_iface_op + ifupdownobj.log_error('%s: %s %s' % (ifacename, op, str(e))) + File "/usr/share/ifupdown2/ifupdown/ifupdownmain.py", line 226, in log_error + raise Exception(str) +error: lo : lo: up cmd '/etc/network/if-up.d/resolved' failed: returned -11 +debug: vmbr0: found dependents ['bond0'] +debug: bond0: found dependents ['enp65s0d1', 'enp65s0'] +info: enp65s0d1: running ops ... +... +... + +Signed-off-by: Alexandre Derumier +--- + ifupdown2/ifupdown/scheduler.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ifupdown2/ifupdown/scheduler.py b/ifupdown2/ifupdown/scheduler.py +index 154e557..fda6ff2 100644 +--- a/ifupdown2/ifupdown/scheduler.py ++++ b/ifupdown2/ifupdown/scheduler.py +@@ -9,6 +9,7 @@ + + import os + import sys ++import traceback + + from collections import OrderedDict + +-- +2.39.2 + diff --git a/ifupdown2 b/ifupdown2 index a087295..a052254 160000 --- a/ifupdown2 +++ b/ifupdown2 @@ -1 +1 @@ -Subproject commit a087295ba496680b81ecafe72f999d4e9076e737 +Subproject commit a0522546b848435115a20eb647f87ade01761a33 -- 2.39.2