From f100bc94cdd6025b9996213ba86aca8a276039b0 Mon Sep 17 00:00:00 2001 From: digimer Date: Mon, 29 Jan 2024 21:18:32 -0500 Subject: [PATCH 1/6] Bumped logging to debug striker-collect-debug Signed-off-by: digimer --- tools/striker-collect-debug | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/striker-collect-debug b/tools/striker-collect-debug index 1f5a5b08..71835a62 100755 --- a/tools/striker-collect-debug +++ b/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(); From a3c30779639f3ee6389506fa4600b3304222e4af Mon Sep 17 00:00:00 2001 From: digimer Date: Tue, 30 Jan 2024 20:07:29 -0500 Subject: [PATCH 2/6] Called pcs directly for CIB data collection. Signed-off-by: digimer --- tools/striker-collect-debug | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/striker-collect-debug b/tools/striker-collect-debug index 71835a62..121dab7b 100755 --- a/tools/striker-collect-debug +++ b/tools/striker-collect-debug @@ -555,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}); From f25323ba9bcea6eccf3bde32b00f579ab34b89c6 Mon Sep 17 00:00:00 2001 From: digimer Date: Fri, 2 Feb 2024 19:43:36 -0500 Subject: [PATCH 3/6] Fixed type on words variable insertion Signed-off-by: digimer --- share/words.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/words.xml b/share/words.xml index 0f3b4ec1..ef16a357 100644 --- a/share/words.xml +++ b/share/words.xml @@ -3250,7 +3250,7 @@ Proceed? [y/N] - Target: [#!variable!device_target!#], boot: [#!variable!say_boot!#], ISO: [#!variable!device_path!#] Subnodes: DR Hosts: - |- Name: [#!variable!host_name!#], UUID: [#!ariable!host_uuid!#] + |- Name: [#!variable!host_name!#], UUID: [#!variable!host_uuid!#] |- 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!#] Anvil! Node: [#!variable!anvil_name!#], UUID: [#!variable!anvil_uuid!#] - Description: [#!variable!anvil_description!#] From 0d06004a3b420509e664114a679fc8d61577854d Mon Sep 17 00:00:00 2001 From: digimer Date: Fri, 2 Feb 2024 19:44:01 -0500 Subject: [PATCH 4/6] Added a 60 second delay to restart in unit files. Signed-off-by: digimer --- units/anvil-daemon.service | 1 + units/scancore.service | 1 + 2 files changed, 2 insertions(+) diff --git a/units/anvil-daemon.service b/units/anvil-daemon.service index c9915ceb..889ca9cb 100644 --- a/units/anvil-daemon.service +++ b/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 diff --git a/units/scancore.service b/units/scancore.service index 17c33651..c9965798 100644 --- a/units/scancore.service +++ b/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 From f180f1adfc97445836331a05fbe21cf413ebe7dc Mon Sep 17 00:00:00 2001 From: digimer Date: Fri, 2 Feb 2024 22:30:17 -0500 Subject: [PATCH 5/6] Added anvil-monitor-network to Makefile Signed-off-by: digimer --- tools/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/Makefile.am b/tools/Makefile.am index bdd4fddd..38f4a110 100644 --- a/tools/Makefile.am +++ b/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 \ From e166d181c44dd08d43ac2d81955b32af4a169969 Mon Sep 17 00:00:00 2001 From: digimer Date: Fri, 2 Feb 2024 23:42:36 -0500 Subject: [PATCH 6/6] Disabled RAM counting as a debug step. Signed-off-by: digimer --- Anvil/Tools/System.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Anvil/Tools/System.pm b/Anvil/Tools/System.pm index 1d837517..d4a28242 100644 --- a/Anvil/Tools/System.pm +++ b/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)