fix(tools): isolate non-striker tasks in anvil-daemon

main
Tsu-ba-me 2 years ago
parent 7465a3ab4e
commit d98df4b2a4
  1. 43
      tools/anvil-daemon

@ -554,9 +554,7 @@ sub handle_periodic_tasks
# Check if anything is needed to be done in /mnt/shared. # Check if anything is needed to be done in /mnt/shared.
check_incoming($anvil); check_incoming($anvil);
# Get a screenshot from every server (cluster resource) do_non_striker_tasks($anvil);
# running on localhost and punt them to all strikers.
get_server_screenshot($anvil);
# Check for stale db_in_use states. # Check for stale db_in_use states.
check_db_in_use_states($anvil); check_db_in_use_states($anvil);
@ -1830,11 +1828,11 @@ sub get_server_screenshot
my $results = $anvil->Database->query({ query => $query, source => $THIS_FILE, line => __LINE__ }); my $results = $anvil->Database->query({ query => $query, source => $THIS_FILE, line => __LINE__ });
my $count = @{$results}; my $count = @{$results};
my $striker_uuid_csv; $anvil->Log->variables({ source => $THIS_FILE, line => __LINE__, level => $debug, list => { query => $query, count => $count } });
return (1) if ($count == 0); return (1) if ($count == 0);
$striker_uuid_csv = $results->[0]->[0]; my $striker_uuid_csv = $results->[0]->[0];
foreach my $row ( @{$results}[1 .. $#{$results}] ) foreach my $row ( @{$results}[1 .. $#{$results}] )
{ {
@ -1843,17 +1841,21 @@ sub get_server_screenshot
$striker_uuid_csv = "$striker_uuid_csv,$host_uuid"; $striker_uuid_csv = "$striker_uuid_csv,$host_uuid";
} }
my ($rcode) = $anvil->Server->find(); $anvil->Log->variables({ source => $THIS_FILE, line => __LINE__, level => $debug, list => { striker_uuid_csv => $striker_uuid_csv } });
return (1) if ($rcode != 0);
my $server_list_on_local = $anvil->data->{server}{location}; my $server_list_on_local = $anvil->data->{server}{location};
my $server_name_csv = join(", ", map { $anvil->Database->quote($_) } keys %{$server_list_on_local}); my $server_name_csv = join(", ", map { $anvil->Database->quote($_) } keys %{$server_list_on_local});
$anvil->Log->variables({ source => $THIS_FILE, line => __LINE__, level => $debug, list => { server_name_csv => $server_name_csv } });
return (1) if ( length($server_name_csv) == 0 );
$query = "SELECT server_uuid FROM servers WHERE server_name IN (".$server_name_csv.") ORDER BY server_name;"; $query = "SELECT server_uuid FROM servers WHERE server_name IN (".$server_name_csv.") ORDER BY server_name;";
$results = $anvil->Database->query({ query => $query, source => $THIS_FILE, line => __LINE__ }); $results = $anvil->Database->query({ query => $query, source => $THIS_FILE, line => __LINE__ });
$count = @{$results}; $count = @{$results};
$anvil->Log->variables({ source => $THIS_FILE, line => __LINE__, level => $debug, list => { query => $query, count => $count } });
return (1) if ($count == 0); return (1) if ($count == 0);
foreach my $row ( @{$results} ) foreach my $row ( @{$results} )
@ -1873,5 +1875,30 @@ sub get_server_screenshot
}}); }});
} }
return (0);
}
sub do_non_striker_tasks
{
my $anvil = shift;
my $parameters = shift;
my $debug = $parameters->{debug} // 3;
my $host_type = $anvil->data->{sys}{host_type};
$anvil->Log->variables({ source => $THIS_FILE, line => __LINE__, level => $debug, list => { host_type => $host_type } });
return (1) if ($host_type eq "striker");
# Get the servers running on this host (except striker).
my ($rcode) = $anvil->Server->find();
if ($rcode == 0)
{
# Get a screenshot from every server (cluster resource)
# running on localhost and punt them to all strikers.
get_server_screenshot($anvil, { debug => $debug });
}
return (0); return (0);
} }
Loading…
Cancel
Save