* Updated anvil-delete-server to actively check for and delete any drbd-fenced attributes left over in the CIB after a server is deleted. This addresses issue #374.

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

scancore-agents/scan-cluster/scan-cluster

@@ -119,6 +119,7 @@ sub cib_cleanup
 	my ($anvil) = @_;
 	
 	my $problem = $anvil->Cluster->parse_cib({debug => 2});
+	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { problem => $problem }});
 	if ($problem)
 	{
 		# Not in a cluster

share/words.xml

@@ -2927,6 +2927,7 @@ Proceed? [y/N]</key>
 		<key name="message_0326">This daemon just started. Holding off starting jobs for another: [#!variable!will_start_in!#] second(s).</key>
 		<key name="message_0327">[ Note ] - It looks like 'anvil-version-changes' (pid(s): [#!variable!pids!#]) is running, holding off on power action until it's done (in case the system is being updated now or kernel modules are being built).</key>
 		<key name="message_0328">[ Note ] - The DRBD (replicated storage) kernel module appears to not exist. This is normal after an OS update, will try building the kernel module now. Please be patient.</key>
+		<key name="message_0329">[ Note ] - Deleting the old drbd fenced attribute: [#!variable!attribute!#] for the node: [#!variable!node_name!#] (ID: [#!variable!node_id!#]) from the CIB.</key>
 
 		<!-- Translate names (protocols, etc) -->
 		<key name="name_0001">Normal Password</key>	<!-- none in mail-server -->

tools/anvil-delete-server

@@ -260,6 +260,9 @@ WHERE
 		}});
 	}
 	
+	# Make sure drbd-fence attributes are deleted for this server.
+	clear_cib($anvil);
+	
 	# We're done
 	$anvil->Job->update_progress({
 		progress => 100,
@@ -270,6 +273,72 @@ WHERE
 	return(0);
 }
 
+# Make sure drbd-fence attributes are deleted for this server.
+sub clear_cib
+{
+	my ($anvil) = @_;
+	
+	my $problem = $anvil->Cluster->parse_cib({debug => 2});
+	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { problem => $problem }});
+	if ($problem)
+	{
+		# Not in a cluster
+		return(0);
+	}
+	
+	my $server_uuid     = $anvil->data->{job}{server_uuid};
+	my $server_name     = $anvil->data->{servers}{server_uuid}{$server_uuid}{server_name};
+	my $host_name       = $anvil->Get->host_name;
+	my $short_host_name = $anvil->Get->short_host_name;
+	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
+		server_uuid     => $server_uuid,
+		server_name     => $server_name, 
+		host_name       => $host_name, 
+		short_host_name => $short_host_name, 
+	}});
+	
+	# Find attributes
+	foreach my $node_id (sort {$a cmp $b} keys %{$anvil->data->{cib}{parsed}{cib}{node_state}})
+	{
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { node_id => $node_id }});
+		foreach my $attribute_id (sort {$a cmp $b} keys %{$anvil->data->{cib}{parsed}{cib}{node_state}{$node_id}})
+		{
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { attribute_id => $attribute_id }});
+			if ($attribute_id =~ /^drbd-fenced_(.*)$/)
+			{
+				my $this_server_name = $1;
+				my $state            = $anvil->data->{cib}{parsed}{cib}{node_state}{$node_id}{$attribute_id};
+				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
+					this_server_name => $server_name,
+					'state'          => $state, 
+				}});
+				
+				if ($this_server_name eq $server_name)
+				{
+					# Stale attribute, remove it!
+					my $node_name = $anvil->data->{cib}{parsed}{configuration}{nodes}{$node_id}{uname};
+					$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "message_0329", variables => { 
+						attribute => $attribute_id,
+						node_name => $node_name, 
+						node_id   => $node_id, 
+					}});
+					
+					my $shell_call = $anvil->data->{path}{exe}{pcs}." node attribute ".$node_name." ".$attribute_id."=";
+					$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { shell_call => $shell_call }});
+					
+					my ($output, $return_code) = $anvil->System->call({shell_call => $shell_call});
+					$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
+						output      => $output,
+						return_code => $return_code, 
+					}});
+				}
+			}
+		}
+	}
+	
+	return(0);
+}
+
 # This checks to see if the server is running and, if so, stops it. Once stopped, the resource is deleted.
 sub remove_from_pacemaker
 {