xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-23 19:50:21 +00:00
Code Issues Releases Wiki Activity

getAllNodeAttribs will query site table too much (#5505) (#5521)

Browse Source 
- move `get_site_attribute` out from loop
This commit is contained in:
Bin Xu
2018-08-17 14:42:12 +08:00
committed by yangsong
parent ebc04e4cbc
commit 2b26797195
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
perl-xCAT/xCAT/Table.pm
View File

@@ -3417,6 +3417,12 @@ sub getAllNodeAttribs
$self->{nodelist}->_build_cache([ 'node', 'groups' ]);
$self->{_use_cache} = 1;
$self->{nodelist}->{_use_cache} = 1;
my @hierarchy_attrs = ();
my $hierarchy_field = xCAT::TableUtils->get_site_attribute("hierarchicalattrs");
if ($hierarchy_field) {
@hierarchy_attrs = split(/,/, $hierarchy_field);
}
while (my $data = $query->fetchrow_hashref())
{
@@ -3437,12 +3443,13 @@ sub getAllNodeAttribs
#} end SF 3580
#my $localhash = $self->getNodesAttribs(\@nodes,$attribq); #NOTE: This is stupid, rebuilds the cache for every entry, FIXME
my %options;
my @hierarchy_attrs = ();
my $hierarchy_field = xCAT::TableUtils->get_site_attribute("hierarchicalattrs");
if ($hierarchy_field) {
@hierarchy_attrs = split(/,/, $hierarchy_field);
}
#my @hierarchy_attrs = ();
#my $hierarchy_field = xCAT::TableUtils->get_site_attribute("hierarchicalattrs");
#if ($hierarchy_field) {
# @hierarchy_attrs = split(/,/, $hierarchy_field);
#}
my %options = ();
$options{hierarchy_attrs} = \@hierarchy_attrs;
foreach (@nodes)
{