seasharp
/
anvil
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #130 from ClusterLabs/anvil-tools-dev

Browse Source 
* Continuing to try to get the network to reliably start during confi…
main
digimer-bot 4 years ago committed by GitHub
parent 6ae88cf696 0c0f2172ce
commit a612aa000a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Anvil/Tools/Network.pm
  2. 1
      tools/anvil-configure-host

6
Anvil/Tools/Network.pm
Unescape View File

@ -513,13 +513,13 @@ sub check_bonds
# Link shown, try to start the interface. # Link shown, try to start the interface.
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "log_0629", variables => { $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "log_0629", variables => {
bond => $bond, bond => $bond,
interface => $interface, interface => $interface." (".$anvil->data->{bond_health}{$bond}{interface}{$interface}{name}.")",
}}); }});
my $shell_call = $anvil->data->{path}{exe}{ifup}." ".$anvil->data->{bond_health}{$bond}{interface}{$interface}{name}; my $shell_call = $anvil->data->{path}{exe}{ifup}." ".$anvil->data->{bond_health}{$bond}{interface}{$interface}{name};
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { shell_call => $shell_call }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 1, list => { shell_call => $shell_call }});
my ($output, $return_code) = $anvil->System->call({debug => $debug, shell_call => $shell_call}); my ($output, $return_code) = $anvil->System->call({debug => 1, shell_call => $shell_call});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
'output' => $output, 'output' => $output,
'return_code' => $return_code, 'return_code' => $return_code,

1
tools/anvil-configure-host
Unescape View File

@ -946,6 +946,7 @@ sub reconfigure_network
until ($anvil->data->{sys}{database}{connections}) until ($anvil->data->{sys}{database}{connections})
{ {
$anvil->refresh(); $anvil->refresh();
$anvil->Network->check_bonds({heal => "all"});
$anvil->Database->connect(); $anvil->Database->connect();
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, 'print' => 1, secure => 0, key => "log_0132"}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, 'print' => 1, secure => 0, key => "log_0132"});
if (not $anvil->data->{sys}{database}{connections}) if (not $anvil->data->{sys}{database}{connections})

Write Preview
Loading…
Cancel
Save