mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-10-05 07:49:59 +00:00
Put in piece of an old commit to sync up with master
Currently Table.pm has a partial revert. Rectify this to sync back up with xcat.org in optimism that the problem has been fixed (based on some examination of changes since the mistake)
This commit is contained in:
@@ -2766,6 +2766,17 @@ sub getNodeAttribs
|
||||
}
|
||||
$self->trace_db(START_TYPE);
|
||||
|
||||
if (!defined($self->{dbh})) {
|
||||
xCAT::MsgUtils->message("S", "xcatd: DBI is missing, Please check the db access process.");
|
||||
return undef;
|
||||
}
|
||||
if ($dbworkerpid > 0) { #TODO: should this be moved outside of the DB worker entirely? I'm thinking so, but I don't dare do so right now...
|
||||
#the benefit would be the potentially computationally intensive substitution logic would be moved out and less time inside limited
|
||||
#db worker scope
|
||||
return dbc_call($self, 'getNodeAttribs', $node, \@attribs, %options);
|
||||
}
|
||||
$self->trace_db(START_TYPE);
|
||||
|
||||
if (!defined($self->{dbh})) {
|
||||
xCAT::MsgUtils->message("S", "xcatd: DBI is missing, Please check the db access process.");
|
||||
return undef;
|
||||
|
||||
Reference in New Issue
Block a user