xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-06-20 18:40:59 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7535 from VersatusHPC/fix/plugin-error-message

Browse Source 
fix: misleading plugin error message
This commit is contained in:
Markus Hilger
2026-05-03 02:35:33 +02:00
committed by GitHub
parent 1f9173f07a b10865c5d4
commit b1b0ca0396
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-server/sbin/xcatd
+8 -6
View File
@@ -2086,14 +2086,16 @@ sub plugin_command {
$@ = ""; # sometimes a child 'eval' doesn't clean up $@, if we make it this far, no non-eval bug bombed out
}; # REMOVEEVALFORDEBUG
if ($sock or $shouldbealivepid != $$) { # We shouldn't still be alive, try to send as much detail to parent as possible as to why
my $error = "$modname plugin bug, pid $$, process description: '$$progname'";
my $error;
if ($@) {
$error .= " with error '$@'";
} else { # Sys::Virt and perhaps Net::SNMP sometimes crashes in a way $@ won't catch..
$error .= " with missing eval error, probably due to special manipulation of $@ or strange circumstances in an XS library, remove evals in xcatd marked 'REMOVEEVALFORDEBUG and run xcatd -f for more info";
chomp(my $eval_err = $@);
$error = "$modname: $eval_err";
} else {
# XS libraries (Sys::Virt, Net::SNMP) can crash without setting $@
$error = "$modname plugin bug (pid $$): died without setting an error. Run xcatd -f to debug";
}
if (scalar(@nodes)) { # Don't know which of the nodes, so one error message warning about the possibliity..
$error .= " while trying to fulfill request for the following nodes: " . join(",", @nodes);
if (scalar(@nodes)) {
$error .= " [nodes: " . join(",", @nodes) . "]";
}
xCAT::MsgUtils->message("S", "xcatd: $error");
$callback->({ error => [$error], errorcode => [1] });