From 0f45f2e517a000c018aaadd1aa26a015399371e3 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 9 Nov 2017 09:27:53 -0500 Subject: [PATCH 1/4] Fix makeconfluentcfg without arguments There were mistakes in the switch table processing attempt for non noderange makeconfluentcfg. --- xCAT-server/lib/xcat/plugins/confluent.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/confluent.pm b/xCAT-server/lib/xcat/plugins/confluent.pm index 34923dc1c..c05c51d6e 100644 --- a/xCAT-server/lib/xcat/plugins/confluent.pm +++ b/xCAT-server/lib/xcat/plugins/confluent.pm @@ -276,7 +276,12 @@ sub makeconfluentcfg { @cfgents1 = $hmtab->getAllNodeAttribs([ 'cons', 'serialport', 'mgt', 'conserver', 'termserver', 'termport', 'consoleondemand' ]); @cfgents2 = $nodepostab->getAllNodeAttribs([ 'rack', 'u', 'chassis', 'slot', 'room' ]); @cfgents3 = $nodepostab->getAllNodeAttribs([ 'mpa', 'id' ]); - @cfgents4 = $nodepostab->getAllNodeAttribs([ 'node', 'switch', 'port', 'interface' ]); + @cfgents4 = $switchtab->getAllNodeAttribs([ 'node', 'switch', 'port', 'interface' ]); + my @switchnodes; + foreach my $ent (@cfgents4) { + if ($ent->{node}) { push @switchnodes, $ent->{node} } + } + @cfgents4 = $switchtab->getNodesAttribs(\@switchnodes, [ 'node', 'switch', 'port', 'interface' ]); } From db4dc42b9de081075a204756590c7190a40163dc Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 10 Nov 2017 10:34:23 -0500 Subject: [PATCH 2/4] Add note about the nature of the auto-reconnect There was some confusion about the retry interval, provide in the manpage in case others want to know how it works and how to speed it up. --- xCAT-client/pods/man1/rcons.1.pod | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xCAT-client/pods/man1/rcons.1.pod b/xCAT-client/pods/man1/rcons.1.pod index f6b80b19f..06c21f3f5 100644 --- a/xCAT-client/pods/man1/rcons.1.pod +++ b/xCAT-client/pods/man1/rcons.1.pod @@ -18,6 +18,10 @@ If I is specified, the conserver daemon on that host will be con To exit the console session, enter: e c . +For confluent backed consoles, an extended outage of connectivity to the endpoint will result in an automated retry +of a randomized interval between 2 to 4 minutes. You can either close and reopen the console to force a quicker +reconnect, or `e o`a to request an immediate reconnect attempt. + =head1 B =over 5 From a6932bb4402481df8c517c9b7f7c178316bf34ad Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 15 Nov 2017 09:18:20 -0500 Subject: [PATCH 3/4] Add onecli 2.1.0 output masking --- xCAT-client/bin/pasu | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xCAT-client/bin/pasu b/xCAT-client/bin/pasu index 08b77e746..191aeda65 100755 --- a/xCAT-client/bin/pasu +++ b/xCAT-client/bin/pasu @@ -215,6 +215,9 @@ sub processoutput { #This way, one arbiter handles output, no interrupting $line !~ /Lenovo ToolsCenterSuite CLI/i && $line !~ /Lenovo XClarity Essentials OneCLI/i && $line !~ /Invoking SHOW command .../i && + $line !~ /Succeed in running the command: SHOW/i && + $line !~ /start to convert cmd./i && + $line !~ /Connected to BMC at IP address/i && $line !~ /Invoking SET command .../i && $line !~ /Connected to BMC by IP address/i && $line !~ /Succeeded running the command /i && From 229533cbdaa370f949c4650d48bf602d7c97b51e Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 15 Nov 2017 09:47:39 -0500 Subject: [PATCH 4/4] Further improve the filtering of OneCli --- xCAT-client/bin/pasu | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-client/bin/pasu b/xCAT-client/bin/pasu index 191aeda65..f4270bea8 100755 --- a/xCAT-client/bin/pasu +++ b/xCAT-client/bin/pasu @@ -215,13 +215,13 @@ sub processoutput { #This way, one arbiter handles output, no interrupting $line !~ /Lenovo ToolsCenterSuite CLI/i && $line !~ /Lenovo XClarity Essentials OneCLI/i && $line !~ /Invoking SHOW command .../i && - $line !~ /Succeed in running the command: SHOW/i && $line !~ /start to convert cmd./i && - $line !~ /Connected to BMC at IP address/i && $line !~ /Invoking SET command .../i && - $line !~ /Connected to BMC by IP address/i && - $line !~ /Succeeded running the command /i && $line !~ /Based on module version /i && + $line !~ /Connected to BMC by IP address/i && + $line !~ /Connected to BMC at IP address/i && + $line !~ /Succeeded running the command /i && + $line !~ /Succeed in running the command:/i && $line !~ /Succeed running command /i)) { print $nodehdl{$readyh} . ": " . $line . "\n"; }