seasharp/anvil
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a bug in scan-ipmitool that was causing duplicate history entries

Browse Source 
* Increased logging to scan-ipmitool and scan-network to help trace a
  duplicate DB entry bug.

Signed-off-by: digimer <mkelly@alteeve.ca>
This commit is contained in:
digimer 2023-11-07 15:32:57 -05:00
parent fe453ac51d
commit 822854f0c3
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scancore-agents/scan-ipmitool/scan-ipmitool
View File

@ -1147,7 +1147,8 @@ AND
if (ref($anvil->data->{old}{$host_name}{temperature}{$scan_ipmitool_sensor_name})) if (ref($anvil->data->{old}{$host_name}{temperature}{$scan_ipmitool_sensor_name}))
{ {
# Update the existing entry, if needed. # Update the existing entry, if needed.
my $temperature_uuid = $anvil->data->{old}{$host_name}{temperature}{$scan_ipmitool_sensor_name}{temperature_uuid}; $temperature_uuid = $anvil->data->{old}{$host_name}{temperature}{$scan_ipmitool_sensor_name}{temperature_uuid};
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { temperature_uuid => $temperature_uuid }});
} }
# Generate and store the UUID. # Generate and store the UUID.

24
scancore-agents/scan-network/scan-network
View File

@ -378,7 +378,7 @@ OR
;"; ;";
my $results = $anvil->Database->query({query => $query, source => $THIS_FILE, line => __LINE__}); my $results = $anvil->Database->query({query => $query, source => $THIS_FILE, line => __LINE__});
my $count = @{$results}; my $count = @{$results};
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
results => $results, results => $results,
count => $count, count => $count,
}}); }});
@ -386,18 +386,18 @@ OR
{ {
my $variable_uuid = $row->[0]; my $variable_uuid = $row->[0];
my $variable_name = $row->[1]; my $variable_name = $row->[1];
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
's1:variable_name' => $variable_name, 's1:variable_name' => $variable_name,
's2:variable_uuid' => $variable_uuid, 's2:variable_uuid' => $variable_uuid,
}}); }});
# Find out of there are any records to remove at all. # Find out of there are any records to remove at all.
my $query = "SELECT history_id FROM history.variables WHERE variable_uuid = ".$anvil->Database->quote($variable_uuid)." AND modified_date <= '".$old_timestamp."';"; my $query = "SELECT history_id FROM history.variables WHERE variable_uuid = ".$anvil->Database->quote($variable_uuid)." AND modified_date <= '".$old_timestamp."';";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { query => $query }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { query => $query }});
my $results = $anvil->Database->query({uuid => $uuid, query => $query, source => $THIS_FILE, line => __LINE__}); my $results = $anvil->Database->query({uuid => $uuid, query => $query, source => $THIS_FILE, line => __LINE__});
my $count = @{$results}; my $count = @{$results};
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
results => $results, results => $results,
count => $count, count => $count,
}}); }});
@ -406,11 +406,11 @@ OR
{ {
# Find how many records will be left. If it's 0, we'll use an OFFSET 1. # Find how many records will be left. If it's 0, we'll use an OFFSET 1.
my $query = "SELECT history_id FROM history.variables WHERE variable_uuid = ".$anvil->Database->quote($variable_uuid)." AND modified_date > '".$old_timestamp."';"; my $query = "SELECT history_id FROM history.variables WHERE variable_uuid = ".$anvil->Database->quote($variable_uuid)." AND modified_date > '".$old_timestamp."';";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { query => $query }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { query => $query }});
my $results = $anvil->Database->query({uuid => $uuid, query => $query, source => $THIS_FILE, line => __LINE__}); my $results = $anvil->Database->query({uuid => $uuid, query => $query, source => $THIS_FILE, line => __LINE__});
my $count = @{$results}; my $count = @{$results};
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
results => $results, results => $results,
count => $count, count => $count,
}}); }});
@ -418,7 +418,7 @@ OR
{ {
# At least one record will be left, we can do a simple delete. # At least one record will be left, we can do a simple delete.
my $query = "DELETE FROM history.variables WHERE variable_uuid = ".$anvil->Database->quote($variable_uuid)." AND modified_date <= '".$old_timestamp."';"; my $query = "DELETE FROM history.variables WHERE variable_uuid = ".$anvil->Database->quote($variable_uuid)." AND modified_date <= '".$old_timestamp."';";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { query => $query }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { query => $query }});
push @{$queries}, $query; push @{$queries}, $query;
} }
else else
@ -427,10 +427,10 @@ OR
foreach my $row (@{$results}) foreach my $row (@{$results})
{ {
my $history_id = $row->[0]; my $history_id = $row->[0];
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { history_id => $history_id }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { history_id => $history_id }});
my $query = "DELETE FROM history.variables WHERE variable_uuid = ".$anvil->Database->quote($variable_uuid)." AND history_id = '".$history_id."';"; my $query = "DELETE FROM history.variables WHERE variable_uuid = ".$anvil->Database->quote($variable_uuid)." AND history_id = '".$history_id."';";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { query => $query }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { query => $query }});
push @{$queries}, $query; push @{$queries}, $query;
} }
} }
@ -447,7 +447,7 @@ OR
records => $commits, records => $commits,
host => $anvil->Get->host_name_from_uuid({host_uuid => $uuid}), host => $anvil->Get->host_name_from_uuid({host_uuid => $uuid}),
}}); }});
$anvil->Database->write({debug => 3, uuid => $uuid, query => $queries, source => $THIS_FILE, line => __LINE__}); $anvil->Database->write({debug => 2, uuid => $uuid, query => $queries, source => $THIS_FILE, line => __LINE__});
undef $queries; undef $queries;
} }
} }
@ -1924,6 +1924,7 @@ WHERE
# Read in the RX/TX values, set to '0' if not found. # Read in the RX/TX values, set to '0' if not found.
my ($rx_bytes, $rx_variable_uuid, $modified_date) = $anvil->Database->read_variable({ my ($rx_bytes, $rx_variable_uuid, $modified_date) = $anvil->Database->read_variable({
debug => 2,
variable_name => "bond::".$bond_name."::rx_bytes", variable_name => "bond::".$bond_name."::rx_bytes",
variable_source_uuid => $bond_uuid, variable_source_uuid => $bond_uuid,
variable_source_table => "bonds", variable_source_table => "bonds",
@ -1933,6 +1934,7 @@ WHERE
rx_variable_uuid => $rx_variable_uuid, rx_variable_uuid => $rx_variable_uuid,
}}); }});
(my $tx_bytes, my $tx_variable_uuid, $modified_date) = $anvil->Database->read_variable({ (my $tx_bytes, my $tx_variable_uuid, $modified_date) = $anvil->Database->read_variable({
debug => 2,
variable_name => "bond::".$bond_name."::tx_bytes", variable_name => "bond::".$bond_name."::tx_bytes",
variable_source_uuid => $bond_uuid, variable_source_uuid => $bond_uuid,
variable_source_table => "bonds", variable_source_table => "bonds",
@ -2026,6 +2028,7 @@ WHERE
# Read in the RX/TX values, set to '0' if not found. # Read in the RX/TX values, set to '0' if not found.
my ($rx_bytes, $rx_variable_uuid, $modified_date) = $anvil->Database->read_variable({ my ($rx_bytes, $rx_variable_uuid, $modified_date) = $anvil->Database->read_variable({
debug => 2,
variable_name => "bridge::".$bridge_name."::rx_bytes", variable_name => "bridge::".$bridge_name."::rx_bytes",
variable_source_uuid => $bridge_uuid, variable_source_uuid => $bridge_uuid,
variable_source_table => "bridges", variable_source_table => "bridges",
@ -2035,6 +2038,7 @@ WHERE
rx_variable_uuid => $rx_variable_uuid, rx_variable_uuid => $rx_variable_uuid,
}}); }});
(my $tx_bytes, my $tx_variable_uuid, $modified_date) = $anvil->Database->read_variable({ (my $tx_bytes, my $tx_variable_uuid, $modified_date) = $anvil->Database->read_variable({
debug => 2,
variable_name => "bridge::".$bridge_name."::tx_bytes", variable_name => "bridge::".$bridge_name."::tx_bytes",
variable_source_uuid => $bridge_uuid, variable_source_uuid => $bridge_uuid,
variable_source_table => "bridges", variable_source_table => "bridges",