This contains fixes needed for beta from additional testing.

* Updated the pcs wrapper to flock anything but status calls.
* Updated scan-apc-pdu to purge regardless of the host it's called on any host.
* Fixed a bug striker-purge-target that wouldn't purge anvil nodes in various cases.

Signed-off-by: digimer <mkelly@alteeve.ca>

scancore-agents/scan-apc-pdu/scan-apc-pdu

@@ -169,6 +169,18 @@ if ($problem)
 	$anvil->nice_exit({exit_code => 1});
 }
 
+# Purge can run from anywhere
+if ($anvil->data->{switches}{purge})
+{
+	# This can be called when doing bulk-database purges.
+	my $schema_file = $anvil->data->{path}{directories}{scan_agents}."/".$THIS_FILE."/".$THIS_FILE.".sql";
+	$anvil->Database->purge_data({
+		debug  => 2,
+		tables => $anvil->Database->get_tables_from_schema({schema_file => $schema_file}),
+	});
+	$anvil->nice_exit({exit_code => 0});
+}
+
 # The APC PDUs only allow one connection at a time. As such, we only run on the striker that is also the
 # active DB.
 my $host_uuid = $anvil->Get->host_uuid();
@@ -184,17 +196,6 @@ if ((not $anvil->data->{switches}{force}) && ($anvil->data->{sys}{database}{acti
 	$anvil->nice_exit({exit_code => 0});
 }
 
-if ($anvil->data->{switches}{purge})
-{
-	# This can be called when doing bulk-database purges.
-	my $schema_file = $anvil->data->{path}{directories}{scan_agents}."/".$THIS_FILE."/".$THIS_FILE.".sql";
-	$anvil->Database->purge_data({
-		debug  => 2,
-		tables => $anvil->Database->get_tables_from_schema({schema_file => $schema_file}),
-	});
-	$anvil->nice_exit({exit_code => 0});
-}
-
 # Find the PDUs. The number of PDUs found is returned. If 0, we exit
 if (not find_pdus($anvil))
 {

tools/anvil-pcs-wrapper

@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 (
-	if [ "$1" != "constraint" ]; then
+	if [ "$1" == "status" ]; then
 		pcs $@
 		exit $?
 	fi

tools/striker-purge-target

@@ -213,6 +213,64 @@ else
 	}
 }
 
+# If we're purging an Anvil!, we need to purge servers on that anvil node first.
+if ($anvil->data->{purge}{anvil_uuid})
+{
+	# Get the servers, and walk through those on this Anvil, and then delete their definitions before 
+	# deleting the server.
+	$anvil->Database->get_servers({include_deleted => 1});
+	my $anvil_uuid = $anvil->data->{purge}{anvil_uuid};
+	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { anvil_uuid => $anvil_uuid }});
+	
+	foreach my $server_name (sort {$a cmp $b} keys %{$anvil->data->{servers}{anvil_uuid}{$anvil_uuid}{server_name}})
+	{
+		my $server_uuid       = $anvil->data->{servers}{anvil_uuid}{$anvil_uuid}{server_name}{$server_name}{server_uuid};
+		my $server_anvil_uuid = $anvil->data->{servers}{server_uuid}{$server_uuid}{server_anvil_uuid};
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
+			's1:server_name'       => $server_name,
+			's2:server_uuid'       => $server_uuid, 
+			's3:server_anvil_uuid' => $server_anvil_uuid, 
+		}});
+		
+		my $queries = [];
+		push @{$queries}, "DELETE FROM history.server_definitions WHERE server_definition_server_uuid = ".$anvil->Database->quote($server_uuid).";";
+		push @{$queries}, "DELETE FROM server_definitions WHERE server_definition_server_uuid = ".$anvil->Database->quote($server_uuid).";";
+		push @{$queries}, "DELETE FROM history.servers WHERE server_uuid = ".$anvil->Database->quote($server_uuid).";";
+		push @{$queries}, "DELETE FROM servers WHERE server_uuid = ".$anvil->Database->quote($server_uuid).";";
+		foreach my $query (@{$queries})
+		{
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { query => $query }});
+		}
+		my $problem = $anvil->Database->write({query => $queries, source => $THIS_FILE, line => __LINE__});
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { problem => $problem }});
+	}
+	# Refresh
+	$anvil->Database->get_servers();
+	
+	# Unlink any DR hosts linked to this Anvil!.
+	$anvil->Database->get_dr_links({include_deleted => 1});
+	foreach my $host_name (sort {$a cmp $b} keys %{$anvil->data->{dr_links}{by_anvil_uuid}{$anvil_uuid}{dr_link_host_name}})
+	{
+		my $dr_link_uuid = $anvil->data->{dr_links}{by_anvil_uuid}{$anvil_uuid}{dr_link_host_name}{$host_name}{dr_link_uuid};
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
+			's1:host_name'    => $host_name,
+			's2:dr_link_uuid' => $dr_link_uuid, 
+		}});
+		
+		my $queries = [];
+		push @{$queries}, "DELETE FROM history.dr_links WHERE dr_link_uuid = ".$anvil->Database->quote($dr_link_uuid).";";
+		push @{$queries}, "DELETE FROM dr_links WHERE dr_link_uuid = ".$anvil->Database->quote($dr_link_uuid).";";
+		foreach my $query (@{$queries})
+		{
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { query => $query }});
+		}
+		my $problem = $anvil->Database->write({query => $queries, source => $THIS_FILE, line => __LINE__});
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { problem => $problem }});
+	}
+	# Refresh
+	$anvil->Database->get_dr_links();
+}
+
 # List all database tables in reverse order with X_host_uuid tables
 $anvil->Database->find_host_uuid_columns({debug => 3, search_column => "host_uuid", main_table => "hosts"});
 
@@ -269,21 +327,34 @@ WHERE
 		if (($table eq "anvils") && ($anvil->data->{purge}{anvil_uuid}))
 		{
 			# Storage groups
-			$query = "
+			my $query = "
+SELECT 
+    storage_group_uuid 
+FROM 
+    storage_groups 
+WHERE 
+    storage_group_anvil_uuid = ".$anvil->Database->quote($anvil->data->{purge}{anvil_uuid})."
+;";
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { query => $query }});
+			my $results = $anvil->Database->query({query => $query, source => $THIS_FILE, line => __LINE__});
+			my $count   = @{$results};
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
+				results => $results, 
+				count   => $count, 
+			}});
+			foreach my $row (@{$results})
+			{
+				my $storage_group_uuid = $row->[0];
+				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { storage_group_uuid => $storage_group_uuid }});
+				
+				# Delete members
+				my $query = "
 SELECT 
     storage_group_member_uuid 
 FROM 
     storage_group_members 
 WHERE 
-    storage_group_member_storage_group_uuid = 
+    storage_group_member_storage_group_uuid = ".$anvil->Database->quote($storage_group_uuid)."
-    (
-        SELECT 
-            storage_group_uuid 
-        FROM 
-            storage_groups 
-        WHERE 
-            storage_group_anvil_uuid = ".$anvil->Database->quote($anvil->data->{purge}{anvil_uuid})."
-    )
 ;";
 				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { query => $query }});
 				my $results = $anvil->Database->query({query => $query, source => $THIS_FILE, line => __LINE__});
@@ -305,6 +376,7 @@ WHERE
 					$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { query => $query }});
 					push @{$queries}, $query;
 				}
+			}
 		
 			$query = "DELETE FROM history.storage_groups WHERE storage_group_anvil_uuid = ".$anvil->Database->quote($anvil->data->{purge}{anvil_uuid}).";";
 			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { query => $query }});