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

Fixed two small bugs that were preventing proactive live migration from working.

Browse Source 
Signed-off-by: Digimer <digimer@alteeve.ca>
main
Digimer 3 years ago
parent 09c4b3fa57
commit ccd89f923b
2 changed files with 10 additions and 4 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. 12
      Anvil/Tools/ScanCore.pm
  2. 2
      scancore-agents/scan-cluster/scan-cluster

12
Anvil/Tools/ScanCore.pm
Unescape View File

@ -355,11 +355,17 @@ sub check_health
my $debug = defined $parameter->{debug} ? $parameter->{debug} : 3; my $debug = defined $parameter->{debug} ? $parameter->{debug} : 3;
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0125", variables => { method => "ScanCore->check_health()" }}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0125", variables => { method => "ScanCore->check_health()" }});
my $host_uuid = defined $parameter->{host_uuid} ? $parameter->{host_uuid} : $anvil->Get->host_uuid; my $host_uuid = defined $parameter->{host_uuid} ? $parameter->{host_uuid} : "";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
host_uuid => $host_uuid, host_uuid => $host_uuid,
}}); }});
if (not $host_uuid)
{
$host_uuid = $anvil->Get->host_uuid;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { host_uuid => $host_uuid }});
}
my $health_score = 0; my $health_score = 0;
my $query = " my $query = "
SELECT SELECT
@ -1305,7 +1311,7 @@ sub post_scan_analysis_node
my $local_health = $anvil->ScanCore->check_health({debug => $debug}); my $local_health = $anvil->ScanCore->check_health({debug => $debug});
my $peer_health = $anvil->ScanCore->check_health({ my $peer_health = $anvil->ScanCore->check_health({
debug => $debug, debug => $debug,
host_uuid => $anvil->data->{cib}{parsed}{peer}{host_uuid}, host_uuid => $peer_host_uuid,
}); });
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
local_health => $local_health, local_health => $local_health,
@ -1821,7 +1827,7 @@ sub post_scan_analysis_node
$anvil->Alert->register({alert_level => "warning", message => "warning_0085", set_by => "ScanCore", variables => $variables}); $anvil->Alert->register({alert_level => "warning", message => "warning_0085", set_by => "ScanCore", variables => $variables});
$anvil->Email->send_alerts(); $anvil->Email->send_alerts();
my $shell_call = $anvil->data->{path}{exe}{'anvil-migate-server'}." --target local --server all".$anvil->Log->switches; my $shell_call = $anvil->data->{path}{exe}{'anvil-migrate-server'}." --target local --server all".$anvil->Log->switches;
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "log_0011", variables => { shell_call => $shell_call }}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "log_0011", variables => { shell_call => $shell_call }});
$anvil->System->call({shell_call => $shell_call}); $anvil->System->call({shell_call => $shell_call});

2
scancore-agents/scan-cluster/scan-cluster
Unescape View File

@ -228,7 +228,7 @@ sub check_fence_delay
} }
elsif (($local_server_count) && ($peer_server_count)) elsif (($local_server_count) && ($peer_server_count))
{ {
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0637", variables => { $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0637", variables => {
local_server_count => $local_server_count, local_server_count => $local_server_count,
peer_server_count => $peer_server_count, peer_server_count => $peer_server_count,
}}); }});

Write Preview
Loading…
Cancel
Save