From 0626bbf7b3c4d3c92f4af868f2924a46354effb7 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Thu, 20 Apr 2023 23:36:22 +0200 Subject: [PATCH] network reload: fix UPID parsing When warning or error from ifreload are logged they are received in 1 line in result of pvesh. So, the UPID might not always start at the beginning, which was assumed by the old code, failing parsing it, throwing a warning like: > Use of uninitialized value $upid in pattern match (m//) at /usr/share/perl5/PVE/Tools.pm line 1106. > Use of uninitialized value $upid in concatenation (.) or string at /usr/share/perl5/PVE/Tools.pm line 1120. Drop the start anchor of the regex. Signed-off-by: Alexandre Derumier Signed-off-by: Thomas Lamprecht --- src/PVE/API2/Network/SDN.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/PVE/API2/Network/SDN.pm b/src/PVE/API2/Network/SDN.pm index f129d60..33ecfb7 100644 --- a/src/PVE/API2/Network/SDN.pm +++ b/src/PVE/API2/Network/SDN.pm @@ -86,9 +86,10 @@ my $create_reload_network_worker = sub { # FIXME: how to proxy to final node ? my $upid; + print "$nodename: reloading network config\n"; run_command(['pvesh', 'set', "/nodes/$nodename/network"], outfunc => sub { my $line = shift; - if ($line =~ /^["']?(UPID:[^\s"']+)["']?$/) { + if ($line =~ /["']?(UPID:[^\s"']+)["']?$/) { $upid = $1; } }); -- 2.39.5