From d98df4b2a42223d5260ff6d96d7e9afe4d141061 Mon Sep 17 00:00:00 2001
From: Tsu-ba-me <ynho.li.aa.e@gmail.com>
Date: Wed, 7 Jun 2023 00:47:50 -0400
Subject: [PATCH] fix(tools): isolate non-striker tasks in anvil-daemon

---
 tools/anvil-daemon | 43 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/tools/anvil-daemon b/tools/anvil-daemon
index f62717da..3211feb0 100755
--- a/tools/anvil-daemon
+++ b/tools/anvil-daemon
@@ -554,9 +554,7 @@ sub handle_periodic_tasks
 		# Check if anything is needed to be done in /mnt/shared.
 		check_incoming($anvil);
 
-		# Get a screenshot from every server (cluster resource)
-		# running on localhost and punt them to all strikers.
-		get_server_screenshot($anvil);
+		do_non_striker_tasks($anvil);
 
 		# Check for stale db_in_use states.
 		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 $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);
 
-	$striker_uuid_csv = $results->[0]->[0];
+	my $striker_uuid_csv = $results->[0]->[0];
 
 	foreach my $row ( @{$results}[1 .. $#{$results}] )
 	{
@@ -1843,17 +1841,21 @@ sub get_server_screenshot
 		$striker_uuid_csv = "$striker_uuid_csv,$host_uuid";
 	}
 
-	my ($rcode) = $anvil->Server->find();
-
-	return (1) if ($rcode != 0);
+	$anvil->Log->variables({ source => $THIS_FILE, line => __LINE__, level => $debug, list => { striker_uuid_csv => $striker_uuid_csv } });
 
 	my $server_list_on_local = $anvil->data->{server}{location};
 	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;";
 	$results = $anvil->Database->query({ query => $query, source => $THIS_FILE, line => __LINE__ });
 	$count   = @{$results};
 
+	$anvil->Log->variables({ source => $THIS_FILE, line => __LINE__, level => $debug, list => { query => $query, count => $count } });
+
 	return (1) if ($count == 0);
 
 	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);
 }
\ No newline at end of file