* Updated 'db_in_use' state to add the caller's name to the state name. This is pulled out when logging stale locks that are being reaped, to help debug where stale locks are coming from.

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

Anvil/Tools/Database.pm

@@ -15382,7 +15382,7 @@ sub mark_active
 	# Record that we're using each available striker DB UUID.
 	foreach my $uuid (sort {$a cmp $b} keys %{$anvil->data->{cache}{database_handle}})
 	{
-		my $state_name = "db_in_use::".$uuid."::".$$;
+		my $state_name = "db_in_use::".$uuid."::".$$."::".$ENV{_};
 		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { 
 			set        => $set,
 			state_name => $state_name,

share/words.xml

@@ -3249,7 +3249,7 @@ We will sleep a bit and try again.
 		<key name="warning_0137">[ Warning ] - Timed out waiting for the connections to the peers, and the local resource(s) is not in 'UpToDate' state. Booting the server will likely fail.</key>
 		<key name="warning_0138">[ Warning ] - Timed out waiting for the connections to the peers.</key>
 		<key name="warning_0139">[ Warning ] - We're using: [#!variable!ram_used!#] (#!variable!ram_used_bytes!# Bytes). but there is a job: [#!variable!job_command!#] is runnng, which might be why the RAM is high. NOT exiting while this program is running.</key>
-		<key name="warning_0140">[ Warning ] - A no-longer active PID: [#!variable!pid!#] had marked the database: [#!variable!db!#] as "in_use", but the PID is gone now. Reaping the flag.</key>
+		<key name="warning_0140">[ Warning ] - A no-longer active PID: [#!variable!pid!#] (used by: [#!variable!caller!#] had marked the database: [#!variable!db!#] as "in_use", but the PID is gone now. Reaping the flag.</key>
 		<key name="warning_0141">[ Warning ] - We waited for: [#!variable!wait_time!#] seconds for all users of the local database to exit. Giving up waiting and taking the database down now.</key>
 		<key name="warning_0142">[ Warning ] - The command: [#!variable!command!#] is still using our database.</key>
 		<key name="warning_0143">[ Warning ] - While evaluating database shutdown, the host UUID: [#!variable!host_uuid!#] was not yet found in the database on host: [#!variable!db_uuid!#]. DB shutdown will not happen until all hosts are in all DBs.</key>

tools/anvil-daemon

@@ -799,18 +799,29 @@ AND
 				's3:state_note' => $state_note, 
 			}});
 			
-			my ($db_uuid, $state_pid) = ($state_name =~ /db_in_use::(.*?)::(\d+)$/);
+			my $caller                = "";
+			my ($db_uuid, $state_pid) = ($state_name =~ /db_in_use::(.*?)::(.*)$/);
 			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
 				's1:db_uuid'   => $anvil->Get->host_name_from_uuid({host_uuid => $db_uuid})." (".$db_uuid.")", 
-				's4:state_pid' => $state_pid, 
+				's2:state_pid' => $state_pid, 
 			}});
+			if ($state_pid =~ /(\d+)::(.*)$/)
+			{
+				$state_pid = $1;
+				$caller    = $2;
+				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
+					's1:state_pid' => $state_pid, 
+					's2:caller'    => $caller,
+				}});
+			}
 			
 			if (not exists $anvil->data->{pids}{$state_pid})
 			{
 				# Reap the 'db_is_use'.
 				$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, priority => "alert", key => "warning_0140", variables => { 
-					db  => $anvil->Get->host_name_from_uuid({host_uuid => $db_uuid})." (".$db_uuid.")",
+					db       => $anvil->Get->host_name_from_uuid({host_uuid => $db_uuid})." (".$db_uuid.")",
-					pid => $state_pid,
+					pid      => $state_pid,
+					'caller' => $caller, 
 				}});
 				
 				my $query = "DELETE FROM states WHERE state_uuid = ".$anvil->Database->quote($state_uuid).";";

tools/anvil-manage-files

@@ -456,7 +456,7 @@ sub check_incoming
 	});
 	
 	my $incoming_directory = $anvil->data->{path}{directories}{shared}{incoming};
-	$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0264"});
+	$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0264"});
 	foreach my $full_path (sort {$a cmp $b} keys %{$anvil->data->{scan}{directories}})
 	{
 		# Skip this if it's under '/mnt/shared/temp' (that's used for files being downloaded, etc)