Merge branch 'main' into issues/561-correct-load-ifaces

Anvil/Tools/System.pm

@@ -693,6 +693,9 @@ sub check_memory
 	my $debug     = defined $parameter->{debug} ? $parameter->{debug} : 3;
 	$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0125", variables => { method => "System->check_memory()" }});
 	
+	### TODO: Re-enable this when we're sure it's not being killed while processing files.
+	return(0);
+	
 	my $program_name = defined $parameter->{program_name} ? $parameter->{program_name} : "";
 	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { program_name => $program_name }});
 	if (not $program_name)

share/words.xml

@@ -3250,7 +3250,7 @@ Proceed? [y/N]</key>
 		<key name="message_0338">- Target: [#!variable!device_target!#], boot: [#!variable!say_boot!#], ISO: [#!variable!device_path!#]</key>
 		<key name="message_0339">Subnodes:</key>
 		<key name="message_0340">DR Hosts:</key>
-		<key name="message_0341"> |- Name: [#!variable!host_name!#], UUID: [#!ariable!host_uuid!#]</key>
+		<key name="message_0341"> |- Name: [#!variable!host_name!#], UUID: [#!variable!host_uuid!#]</key>
 		<key name="message_0342">   |- Volume: [#!variable!volume_number!#], backing device: [#!variable!backing_disk!#], DRBD minor: [#!variable!device_minor!#], size: [#!variable!volume_size!#]
    ^- In storage group: [#!variable!storage_group_name!#], size: [#!variable!storage_group_size!#], free: [#!variable!storage_group_free_space!#]</key>
 		<key name="message_0343">Anvil! Node: [#!variable!anvil_name!#], UUID: [#!variable!anvil_uuid!#] - Description: [#!variable!anvil_description!#]</key>

tools/Makefile.am

@@ -26,6 +26,7 @@ dist_sbin_SCRIPTS	= \
 			  anvil-manage-storage-groups \
 			  anvil-manage-vnc-pipe \
 			  anvil-migrate-server \
+			  anvil-monitor-network \
 			  anvil-network-profiler \
 			  anvil-parse-fence-agents \
 			  anvil-pcs-wrapper \

tools/striker-collect-debug

@@ -40,6 +40,10 @@ $anvil->Get->switches({list => [
 $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => $anvil->data->{switches}});
 $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0115", variables => { program => $THIS_FILE }});
 
+### TODO: Disable this before merging into PR
+$anvil->Log->level({set => 2});
+$anvil->Log->secure({set => 1});
+
 # Connect to the database(s). If we have no connections, we'll proceed anyway as one of the 'run_once' tasks
 # is to setup the database server.
 $anvil->Database->connect();
@@ -551,8 +555,9 @@ sub collect_remote_data
 	# If this is a node, grab the shared files.
 	if ($this_host_type eq "node")
 	{
+		### NOTE: The pcs wrapper was timing out when dumping the CIB, hence statically calling pcs below.
 		print "- Collecting the cluster information base (CIB)... ";
-		$shell_call = $anvil->data->{path}{exe}{pcs}." cluster cib > /tmp/cib.xml";
+		$shell_call = "/usr/sbin/pcs cluster cib > /tmp/cib.xml";
 		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { shell_call => $shell_call }});
 		
 		($output, $return_code) = $anvil->System->call({shell_call => $shell_call});

units/anvil-daemon.service

@@ -7,6 +7,7 @@ Type=simple
 ExecStart=/usr/sbin/anvil-daemon
 ExecStop=/bin/kill -WINCH ${MAINPID}
 Restart=always
+RestartSec=60
 
 [Install]
 WantedBy=multi-user.target

units/scancore.service

@@ -7,6 +7,7 @@ Type=simple
 ExecStart=/usr/sbin/scancore
 ExecStop=/bin/kill -WINCH ${MAINPID}
 Restart=always
+RestartSec=60
 
 [Install]
 WantedBy=multi-user.target