From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id C61851FF185 for ; Mon, 4 Aug 2025 16:06:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 292F3329CA; Mon, 4 Aug 2025 16:07:41 +0200 (CEST) Message-ID: <922690fd-414b-4a12-b994-82de7d59c151@proxmox.com> Date: Mon, 4 Aug 2025 16:07:37 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: Proxmox VE development discussion , Stefan Hanreich References: <20250804134706.408039-1-s.hanreich@proxmox.com> <20250804134706.408039-2-s.hanreich@proxmox.com> Content-Language: en-US From: Thomas Lamprecht In-Reply-To: <20250804134706.408039-2-s.hanreich@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1754316439297 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.030 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 pve-manager 1/1] api: network: default to not regenerating the frr configuration 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Am 04.08.25 um 15:46 schrieb Stefan Hanreich: > Default to not regenerating the FRR configuration, unless explicitly > requested. Otherwise applying the host network configuration would > reload and enable the FRR service. Invert the boolean from skip to > regenerate, since the logic is less convoluted this way. and casually break API and reloading SDN during the upgrade, while triggering such updates might be not the best idea to do in the first place it would be at least good to call it out here. FWIW, if we'd walk the full mile here we probably would keep the old param as fallback and check the node version from the pmxcs in memory kv store in pve-network to determine what param to send to the other nodes. That said, I can live with skip doing that, it is a major release after all. Just ensure you have upgrades on your mind or, if you had, add a note for that next time. > > Signed-off-by: Stefan Hanreich > --- > PVE/API2/Network.pm | 7 ++++--- > bin/pve-sdn-commit | 4 ++-- > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/PVE/API2/Network.pm b/PVE/API2/Network.pm > index 93f441bab..b423e19b5 100644 > --- a/PVE/API2/Network.pm > +++ b/PVE/API2/Network.pm > @@ -891,10 +891,11 @@ __PACKAGE__->register_method({ > additionalProperties => 0, > properties => { > node => get_standard_option('pve-node'), > - skip_frr => { > + 'regenerate-frr' => { > type => 'boolean', > description => 'Whether FRR config generation should get skipped or not.', > optional => 1, > + default => 0, > }, > }, > }, > @@ -910,7 +911,7 @@ __PACKAGE__->register_method({ > my $current_config_file = "/etc/network/interfaces"; > my $new_config_file = "/etc/network/interfaces.new"; > > - my $skip_frr = extract_param($param, 'skip_frr'); > + my $regenerate_frr = extract_param($param, 'regenerate-frr'); > > assert_ifupdown2_installed(); > > @@ -931,7 +932,7 @@ __PACKAGE__->register_method({ > }; > PVE::Tools::run_command(['ifreload', '-a'], errfunc => $err); > > - if ($have_sdn && !$skip_frr) { > + if ($have_sdn && $regenerate_frr) { > PVE::Network::SDN::generate_frr_config(1); > } > }; > diff --git a/bin/pve-sdn-commit b/bin/pve-sdn-commit > index 492963baf..6eeba301c 100644 > --- a/bin/pve-sdn-commit > +++ b/bin/pve-sdn-commit > @@ -83,7 +83,7 @@ my $previous_config_has_frr = PVE::Network::SDN::running_config_has_frr(); > PVE::Network::SDN::commit_config(); > > my $new_config_has_frr = PVE::Network::SDN::running_config_has_frr(); > -my $skip_frr = !($previous_config_has_frr || $new_config_has_frr); > +my $regenerate_frr = ($previous_config_has_frr || $new_config_has_frr); > > PVE::Network::SDN::generate_etc_network_config(); > PVE::Network::SDN::generate_dhcp_config(); > @@ -97,6 +97,6 @@ my $err = sub { > > PVE::Tools::run_command(['ifreload', '-a'], errfunc => $err); > > -PVE::Network::SDN::generate_frr_config(1) if !$skip_frr; > +PVE::Network::SDN::generate_frr_config(1) if $regenerate_frr; > > exit 0; _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel