Made the host_key check conditional on an available DB

Signed-off-by: digimer <mkelly@alteeve.ca>
main
digimer 8 months ago
parent 9775612de7
commit 5c3d1860c8
  1. 2
      Anvil/Tools/Database.pm
  2. 9
      Anvil/Tools/Remote.pm

@ -3687,7 +3687,7 @@ WHERE
;"; ;";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { query => $query }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { query => $query }});
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 = ref($results) eq "ARRAY" ? @{$results} : 0;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
results => $results, results => $results,
count => $count, count => $count,

@ -1218,8 +1218,9 @@ sub _check_known_hosts_for_target
return($known_machine) return($known_machine)
} }
### NOTE: This is called by ocf:alteeve:server, so there might not be a database available.
# Make sure we've loaded hosts. # Make sure we've loaded hosts.
if (not exists $anvil->data->{hosts}{host_uuid}) if (($anvil->data->{sys}{database}{read_uuid}) && (not exists $anvil->data->{hosts}{host_uuid}))
{ {
$anvil->Database->get_hosts({debug => $debug}); $anvil->Database->get_hosts({debug => $debug});
} }
@ -1250,6 +1251,12 @@ sub _check_known_hosts_for_target
# If we're already planning to delete # If we're already planning to delete
next if $delete_if_found; next if $delete_if_found;
# If we don't have any DBs to read from, we're also done.
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, secure => 0, list => {
'sys::database::read_uuid' => $anvil->data->{sys}{database}{read_uuid},
}});
next if not $anvil->data->{sys}{database}{read_uuid};
my $target_host_uuid = ""; my $target_host_uuid = "";
my $target_host_name = ""; my $target_host_name = "";
if ($is_ip) if ($is_ip)

Loading…
Cancel
Save