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

* Started working on the updated Databse->_find_behind_databases logic.

Browse Source 
Signed-off-by: Digimer <digimer@alteeve.ca>
main
Digimer 7 years ago
parent b5e7054a33
commit 3ce3a80c98
3 changed files with 143 additions and 100 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      AN/Tools.pm
  2. 206
      AN/Tools/Database.pm
  3. 15
      AN/Tools/System.pm

8
AN/Tools.pm
Unescape View File

@ -599,6 +599,14 @@ sub _set_defaults
restart_firewalld => 1, restart_firewalld => 1,
}, },
database => { database => {
core_tables => [
"hosts",
"host_variable",
"alerts",
"variables",
"alert_sent",
"states",
],
local_lock_active => 0, local_lock_active => 0,
locking_reap_age => 300, locking_reap_age => 300,
log_transactions => 0, log_transactions => 0,

206
AN/Tools/Database.pm
Unescape View File

@ -105,12 +105,12 @@ sub archive_databases
my $self = shift; my $self = shift;
my $parameter = shift; my $parameter = shift;
my $an = $self->parent; my $an = $self->parent;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0125", variables => { method => "Database->archive_databases()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0125", variables => { method => "Database->archive_databases()" }});
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0126", variables => { method => "Database->archive_databases()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0126", variables => { method => "Database->archive_databases()" }});
return(0); return(0);
} }
@ -124,7 +124,7 @@ sub check_lock_age
my $self = shift; my $self = shift;
my $parameter = shift; my $parameter = shift;
my $an = $self->parent; my $an = $self->parent;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0125", variables => { method => "Database->check_lock_age()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0125", variables => { method => "Database->check_lock_age()" }});
# Make sure we've got the 'sys::database::local_lock_active' and 'reap_age' variables set. # Make sure we've got the 'sys::database::local_lock_active' and 'reap_age' variables set.
if ((not defined $an->data->{sys}{database}{local_lock_active}) or ($an->data->{sys}{database}{local_lock_active} =~ /\D/)) if ((not defined $an->data->{sys}{database}{local_lock_active}) or ($an->data->{sys}{database}{local_lock_active} =~ /\D/))
@ -579,15 +579,14 @@ This is the SQL schema file that will be used to initialize the database, if the
=head3 tables (optional) =head3 tables (optional)
This is an optional hash reference of tables and their host UUID columns to specifically check when connecting to databases. If specified, the table's most recent C<< modified_date >> time stamp will be read (specifically; C<< SELECT modified_date FROM history.$table WHERE $host_uuid_column = 'sys::host_uuid' ORDER BY modified_date DESC LIMIT 1 >>) and if a table doesn't return, or any of the time stamps are missing, a resync will be requested. This is an optional array reference of of tables to specifically check when connecting to databases. Each entry is treated as a table name, and that table's most recent C<< modified_date >> time stamp will be read. If a column name in the table ends in C<< _host_uuid >>, then the check and resync will be restricted to entries in that column matching the current host's C<< sys::host_uuid >>. If the table does not have a corresponding table in the C<< history >> schema, then only the public table will be synced.
Note; The array order is used to allow you to ensure tables with primary keys are synchronyzed before tables with foreign keys. As such, please be aware of the order the table hash references are put into the array reference.
Example use; Example use;
$an->Database->connect({ $an->Database->connect({
tables => { tables => ["upses", "ups_batteries"],
upses => "ups_host_uuid",
ups_batteries => "ups_battery_host_uuid",
},
}); });
If you want to specify a table that is not linked to a host, set the hash variable's value as an empty string. If you want to specify a table that is not linked to a host, set the hash variable's value as an empty string.
@ -616,7 +615,7 @@ sub connect
my $sql_file = defined $parameter->{sql_file} ? $parameter->{sql_file} : $an->data->{path}{sql}{'Tools.sql'}; my $sql_file = defined $parameter->{sql_file} ? $parameter->{sql_file} : $an->data->{path}{sql}{'Tools.sql'};
my $tables = defined $parameter->{tables} ? $parameter->{tables} : ""; my $tables = defined $parameter->{tables} ? $parameter->{tables} : "";
my $test_table = defined $parameter->{test_table} ? $parameter->{test_table} : $an->data->{defaults}{sql}{test_table}; my $test_table = defined $parameter->{test_table} ? $parameter->{test_table} : $an->data->{defaults}{sql}{test_table};
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
source => $source, source => $source,
sql_file => $sql_file, sql_file => $sql_file,
tables => $tables, tables => $tables,
@ -652,7 +651,7 @@ sub connect
my $name = $an->data->{database}{$id}{name} ? $an->data->{database}{$id}{name} : ""; # This should fail my $name = $an->data->{database}{$id}{name} ? $an->data->{database}{$id}{name} : ""; # This should fail
my $user = $an->data->{database}{$id}{user} ? $an->data->{database}{$id}{user} : ""; # This should fail my $user = $an->data->{database}{$id}{user} ? $an->data->{database}{$id}{user} : ""; # This should fail
my $password = $an->data->{database}{$id}{password} ? $an->data->{database}{$id}{password} : ""; my $password = $an->data->{database}{$id}{password} ? $an->data->{database}{$id}{password} : "";
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
host => $host, host => $host,
port => $port, port => $port,
name => $name, name => $name,
@ -815,7 +814,7 @@ sub connect
push @{$successful_connections}, $id; push @{$successful_connections}, $id;
$an->data->{cache}{db_fh}{$id} = $dbh; $an->data->{cache}{db_fh}{$id} = $dbh;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0071", variables => { $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0071", variables => {
host => $host, host => $host,
port => $port, port => $port,
name => $name, name => $name,
@ -889,7 +888,7 @@ sub connect
} }
# Do I have any connections? Don't die, if not, just return. # Do I have any connections? Don't die, if not, just return.
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { connections => $connections }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { connections => $connections }});
if (not $connections) if (not $connections)
{ {
# Failed to connect to any database. Log this, print to the caller and return. # Failed to connect to any database. Log this, print to the caller and return.
@ -1014,10 +1013,15 @@ sub connect
# For now, we just find which DBs are behind and let each agent deal with bringing their tables up to # For now, we just find which DBs are behind and let each agent deal with bringing their tables up to
# date. # date.
if ($connections > 1)
{
$an->Database->_find_behind_databases({ $an->Database->_find_behind_databases({
source => $source, source => $source,
tables => $tables, tables => $tables,
}); });
}
die;
# Hold if a lock has been requested. # Hold if a lock has been requested.
$an->Database->locking(); $an->Database->locking();
@ -1029,15 +1033,7 @@ sub connect
$an->Database->archive_databases({}); $an->Database->archive_databases({});
# Sync the database, if needed. # Sync the database, if needed.
$an->Database->resync_databases({tables => [ $an->Database->resync_databases({tables => $tables});
"hosts",
"host_variable",
"alerts",
"variables",
"updated",
"alert_sent",
"states",
]});
# Add ourselves to the database, if needed. # Add ourselves to the database, if needed.
$an->Database->insert_or_update_hosts; $an->Database->insert_or_update_hosts;
@ -1055,7 +1051,7 @@ sub disconnect
my $self = shift; my $self = shift;
my $parameter = shift; my $parameter = shift;
my $an = $self->parent; my $an = $self->parent;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0125", variables => { method => "Database->disconnect()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0125", variables => { method => "Database->disconnect()" }});
my $marked_inactive = 0; my $marked_inactive = 0;
foreach my $id (sort {$a cmp $b} keys %{$an->data->{database}}) foreach my $id (sort {$a cmp $b} keys %{$an->data->{database}})
@ -1103,7 +1099,7 @@ sub get_hosts
my $self = shift; my $self = shift;
my $parameter = shift; my $parameter = shift;
my $an = $self->parent; my $an = $self->parent;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0125", variables => { method => "Database->get_hosts()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0125", variables => { method => "Database->get_hosts()" }});
my $query = " my $query = "
SELECT SELECT
@ -1165,7 +1161,7 @@ sub get_local_id
my $self = shift; my $self = shift;
my $parameter = shift; my $parameter = shift;
my $an = $self->parent; my $an = $self->parent;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0125", variables => { method => "Database->get_local_id()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0125", variables => { method => "Database->get_local_id()" }});
my $local_id = ""; my $local_id = "";
my $network_details = $an->Get->network_details; my $network_details = $an->Get->network_details;
@ -1207,7 +1203,7 @@ sub initialize
my $self = shift; my $self = shift;
my $parameter = shift; my $parameter = shift;
my $an = $self->parent; my $an = $self->parent;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0125", variables => { method => "Database->initialize()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0125", variables => { method => "Database->initialize()" }});
my $id = $parameter->{id} ? $parameter->{id} : $an->data->{sys}{read_db_id}; my $id = $parameter->{id} ? $parameter->{id} : $an->data->{sys}{read_db_id};
my $sql_file = $parameter->{sql_file} ? $parameter->{sql_file} : $an->data->{path}{sql}{'Tools.sql'}; my $sql_file = $parameter->{sql_file} ? $parameter->{sql_file} : $an->data->{path}{sql}{'Tools.sql'};
@ -1317,7 +1313,7 @@ sub insert_or_update_hosts
my $self = shift; my $self = shift;
my $parameter = shift; my $parameter = shift;
my $an = $self->parent; my $an = $self->parent;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0125", variables => { method => "Database->insert_or_update_hosts()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0125", variables => { method => "Database->insert_or_update_hosts()" }});
my $host_name = $parameter->{host_name} ? $parameter->{host_name} : $an->_hostname; my $host_name = $parameter->{host_name} ? $parameter->{host_name} : $an->_hostname;
my $host_type = $parameter->{host_type} ? $parameter->{host_type} : $an->System->determine_host_type; my $host_type = $parameter->{host_type} ? $parameter->{host_type} : $an->System->determine_host_type;
@ -1410,9 +1406,11 @@ WHERE
$query =~ s/'NULL'/NULL/g; $query =~ s/'NULL'/NULL/g;
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { query => $query }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { query => $query }});
$an->Database->write({query => $query, id => $id, source => $THIS_FILE, line => __LINE__}); $an->Database->write({query => $query, id => $id, source => $THIS_FILE, line => __LINE__});
die;
} }
die;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0126", variables => { method => "Database->insert_or_update_hosts()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0126", variables => { method => "Database->insert_or_update_hosts()" }});
return(0); return(0);
} }
@ -1447,7 +1445,7 @@ sub insert_or_update_states
my $self = shift; my $self = shift;
my $parameter = shift; my $parameter = shift;
my $an = $self->parent; my $an = $self->parent;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0125", variables => { method => "Database->insert_or_update_states()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0125", variables => { method => "Database->insert_or_update_states()" }});
my $state_uuid = $parameter->{state_uuid} ? $parameter->{state_uuid} : ""; my $state_uuid = $parameter->{state_uuid} ? $parameter->{state_uuid} : "";
my $state_name = $parameter->{state_name} ? $parameter->{state_name} : ""; my $state_name = $parameter->{state_name} ? $parameter->{state_name} : "";
@ -1664,7 +1662,7 @@ sub insert_or_update_variables
my $self = shift; my $self = shift;
my $parameter = shift; my $parameter = shift;
my $an = $self->parent; my $an = $self->parent;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0125", variables => { method => "Database->insert_or_update_variables()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0125", variables => { method => "Database->insert_or_update_variables()" }});
my $variable_uuid = defined $parameter->{variable_uuid} ? $parameter->{variable_uuid} : ""; my $variable_uuid = defined $parameter->{variable_uuid} ? $parameter->{variable_uuid} : "";
my $variable_name = defined $parameter->{variable_name} ? $parameter->{variable_name} : ""; my $variable_name = defined $parameter->{variable_name} ? $parameter->{variable_name} : "";
@ -1929,7 +1927,7 @@ sub lock_file
my $self = shift; my $self = shift;
my $parameter = shift; my $parameter = shift;
my $an = $self->parent; my $an = $self->parent;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0125", variables => { method => "Database->lock_file()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0125", variables => { method => "Database->lock_file()" }});
my $do = $parameter->{'do'} ? $parameter->{'do'} : "get"; my $do = $parameter->{'do'} ? $parameter->{'do'} : "get";
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 'do' => $do }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 'do' => $do }});
@ -1989,13 +1987,13 @@ sub locking
my $self = shift; my $self = shift;
my $parameter = shift; my $parameter = shift;
my $an = $self->parent; my $an = $self->parent;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0125", variables => { method => "Database->locking()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0125", variables => { method => "Database->locking()" }});
my $request = defined $parameter->{request} ? $parameter->{request} : 0; my $request = defined $parameter->{request} ? $parameter->{request} : 0;
my $release = defined $parameter->{release} ? $parameter->{release} : 0; my $release = defined $parameter->{release} ? $parameter->{release} : 0;
my $renew = defined $parameter->{renew} ? $parameter->{renew} : 0; my $renew = defined $parameter->{renew} ? $parameter->{renew} : 0;
my $check = defined $parameter->{check} ? $parameter->{check} : 0; my $check = defined $parameter->{check} ? $parameter->{check} : 0;
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
request => $request, request => $request,
release => $release, release => $release,
renew => $renew, renew => $renew,
@ -2005,7 +2003,7 @@ sub locking
# These are used to ID this lock. # These are used to ID this lock.
my $source_name = $an->_hostname; my $source_name = $an->_hostname;
my $source_uuid = $an->data->{sys}{host_uuid}; my $source_uuid = $an->data->{sys}{host_uuid};
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
source_name => $source_name, source_name => $source_name,
source_uuid => $source_uuid, source_uuid => $source_uuid,
}}); }});
@ -2013,7 +2011,7 @@ sub locking
my $set = 0; my $set = 0;
my $variable_name = "lock_request"; my $variable_name = "lock_request";
my $variable_value = $source_name."::".$source_uuid."::".time; my $variable_value = $source_name."::".$source_uuid."::".time;
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
variable_name => $variable_name, variable_name => $variable_name,
variable_value => $variable_value, variable_value => $variable_value,
}}); }});
@ -2025,14 +2023,14 @@ sub locking
) )
{ {
$an->data->{database}{locking}{reap_age} = $an->data->{defaults}{database}{locking}{reap_age}; $an->data->{database}{locking}{reap_age} = $an->data->{defaults}{database}{locking}{reap_age};
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { "database::locking::reap_age" => $an->data->{database}{locking}{reap_age} }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { "database::locking::reap_age" => $an->data->{database}{locking}{reap_age} }});
} }
# If I have been asked to check, we will return the variable_uuid if a lock is set. # If I have been asked to check, we will return the variable_uuid if a lock is set.
if ($check) if ($check)
{ {
my ($lock_value, $variable_uuid, $modified_date) = $an->Database->read_variable({variable_name => $variable_name}); my ($lock_value, $variable_uuid, $modified_date) = $an->Database->read_variable({variable_name => $variable_name});
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
lock_value => $lock_value, lock_value => $lock_value,
variable_uuid => $variable_uuid, variable_uuid => $variable_uuid,
modified_date => $modified_date, modified_date => $modified_date,
@ -2047,7 +2045,7 @@ sub locking
# We check to see if there is a lock before we clear it. This way we don't log that we # We check to see if there is a lock before we clear it. This way we don't log that we
# released a lock unless we really released a lock. # released a lock unless we really released a lock.
my ($lock_value, $variable_uuid, $modified_date) = $an->Database->read_variable({variable_name => $variable_name}); my ($lock_value, $variable_uuid, $modified_date) = $an->Database->read_variable({variable_name => $variable_name});
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
lock_value => $lock_value, lock_value => $lock_value,
variable_uuid => $variable_uuid, variable_uuid => $variable_uuid,
modified_date => $modified_date, modified_date => $modified_date,
@ -2061,7 +2059,7 @@ sub locking
update_value_only => 1, update_value_only => 1,
}); });
$an->data->{sys}{database}{local_lock_active} = 0; $an->data->{sys}{database}{local_lock_active} = 0;
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
variable_uuid => $variable_uuid, variable_uuid => $variable_uuid,
"sys::local_lock_active" => $an->data->{sys}{database}{local_lock_active}, "sys::local_lock_active" => $an->data->{sys}{database}{local_lock_active},
}}); }});
@ -2070,7 +2068,7 @@ sub locking
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0039", variables => { host => $an->_hostname }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0039", variables => { host => $an->_hostname }});
} }
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { set => $set }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { set => $set }});
return($set); return($set);
} }
@ -2083,15 +2081,15 @@ sub locking
variable_value => $variable_value, variable_value => $variable_value,
update_value_only => 1, update_value_only => 1,
}); });
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { variable_uuid => $variable_uuid }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { variable_uuid => $variable_uuid }});
if ($variable_uuid) if ($variable_uuid)
{ {
$set = 1; $set = 1;
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { set => $set }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { set => $set }});
} }
$an->data->{sys}{database}{local_lock_active} = time; $an->data->{sys}{database}{local_lock_active} = time;
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
variable_uuid => $variable_uuid, variable_uuid => $variable_uuid,
"sys::local_lock_active" => $an->data->{sys}{database}{local_lock_active}, "sys::local_lock_active" => $an->data->{sys}{database}{local_lock_active},
}}); }});
@ -2099,7 +2097,7 @@ sub locking
# Log that we've renewed the lock. # Log that we've renewed the lock.
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0044", variables => { host => $an->_hostname }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0044", variables => { host => $an->_hostname }});
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { set => $set }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { set => $set }});
return($set); return($set);
} }
@ -2113,7 +2111,7 @@ sub locking
# See if we had a lock. # See if we had a lock.
my ($lock_value, $variable_uuid, $modified_date) = $an->Database->read_variable({variable_name => $variable_name}); my ($lock_value, $variable_uuid, $modified_date) = $an->Database->read_variable({variable_name => $variable_name});
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
waiting => $waiting, waiting => $waiting,
lock_value => $lock_value, lock_value => $lock_value,
variable_uuid => $variable_uuid, variable_uuid => $variable_uuid,
@ -2127,7 +2125,7 @@ sub locking
my $current_time = time; my $current_time = time;
my $timeout_time = $lock_time + $an->data->{database}{locking}{reap_age}; my $timeout_time = $lock_time + $an->data->{database}{locking}{reap_age};
my $lock_age = $current_time - $lock_time; my $lock_age = $current_time - $lock_time;
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
lock_source_name => $lock_source_name, lock_source_name => $lock_source_name,
lock_source_uuid => $lock_source_uuid, lock_source_uuid => $lock_source_uuid,
current_time => $current_time, current_time => $current_time,
@ -2145,7 +2143,7 @@ sub locking
variable_value => "", variable_value => "",
update_value_only => 1, update_value_only => 1,
}); });
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { variable_uuid => $variable_uuid }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { variable_uuid => $variable_uuid }});
} }
# Only wait if this isn't our own lock. # Only wait if this isn't our own lock.
elsif ($lock_source_uuid ne $source_uuid) elsif ($lock_source_uuid ne $source_uuid)
@ -2154,7 +2152,7 @@ sub locking
$an->Database->mark_active({set => 0}); $an->Database->mark_active({set => 0});
$waiting = 1; $waiting = 1;
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
lock_source_uuid => $lock_source_uuid, lock_source_uuid => $lock_source_uuid,
source_uuid => $source_uuid, source_uuid => $source_uuid,
waiting => $waiting, waiting => $waiting,
@ -2173,13 +2171,13 @@ sub locking
variable_value => $variable_value, variable_value => $variable_value,
update_value_only => 1, update_value_only => 1,
}); });
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { variable_uuid => $variable_uuid }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { variable_uuid => $variable_uuid }});
if ($variable_uuid) if ($variable_uuid)
{ {
$set = 1; $set = 1;
$an->data->{sys}{database}{local_lock_active} = time; $an->data->{sys}{database}{local_lock_active} = time;
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
set => $set, set => $set,
variable_uuid => $variable_uuid, variable_uuid => $variable_uuid,
"sys::local_lock_active" => $an->data->{sys}{database}{local_lock_active}, "sys::local_lock_active" => $an->data->{sys}{database}{local_lock_active},
@ -2191,7 +2189,7 @@ sub locking
} }
# Now return. # Now return.
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { set => $set }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { set => $set }});
return($set); return($set);
} }
@ -2211,7 +2209,7 @@ sub mark_active
my $self = shift; my $self = shift;
my $parameter = shift; my $parameter = shift;
my $an = $self->parent; my $an = $self->parent;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0125", variables => { method => "Database->mark_active()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0125", variables => { method => "Database->mark_active()" }});
my $set = defined $parameter->{set} ? $parameter->{set} : 1; my $set = defined $parameter->{set} ? $parameter->{set} : 1;
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { set => $set }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { set => $set }});
@ -2309,7 +2307,7 @@ sub query
my $self = shift; my $self = shift;
my $parameter = shift; my $parameter = shift;
my $an = $self->parent; my $an = $self->parent;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0125", variables => { method => "Database->query()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0125", variables => { method => "Database->query()" }});
my $id = $parameter->{id} ? $parameter->{id} : $an->data->{sys}{read_db_id}; my $id = $parameter->{id} ? $parameter->{id} : $an->data->{sys}{read_db_id};
my $line = $parameter->{line} ? $parameter->{line} : __LINE__; my $line = $parameter->{line} ? $parameter->{line} : __LINE__;
@ -2404,7 +2402,7 @@ sub read_variable
my $self = shift; my $self = shift;
my $parameter = shift; my $parameter = shift;
my $an = $self->parent; my $an = $self->parent;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0125", variables => { method => "Database->read_variable()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0125", variables => { method => "Database->read_variable()" }});
my $variable_uuid = $parameter->{variable_uuid} ? $parameter->{variable_uuid} : ""; my $variable_uuid = $parameter->{variable_uuid} ? $parameter->{variable_uuid} : "";
my $variable_name = $parameter->{variable_name} ? $parameter->{variable_name} : ""; my $variable_name = $parameter->{variable_name} ? $parameter->{variable_name} : "";
@ -2497,7 +2495,7 @@ sub resync_databases
my $self = shift; my $self = shift;
my $parameter = shift; my $parameter = shift;
my $an = $self->parent; my $an = $self->parent;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0125", variables => { method => "Database->resync_databases()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0125", variables => { method => "Database->resync_databases()" }});
# Get a list if tables. Note that we'll only sync a given table with peers that have the same table. # Get a list if tables. Note that we'll only sync a given table with peers that have the same table.
my $table_array = ref($parameter->{tables}) eq "ARRAY" ? $parameter->{tables} : []; my $table_array = ref($parameter->{tables}) eq "ARRAY" ? $parameter->{tables} : [];
@ -2523,15 +2521,15 @@ sub write
my $self = shift; my $self = shift;
my $parameter = shift; my $parameter = shift;
my $an = $self->parent; my $an = $self->parent;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0125", variables => { method => "Database->write()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0125", variables => { method => "Database->write()" }});
my $id = $parameter->{id} ? $parameter->{id} : $an->data->{sys}{read_db_id}; my $id = $parameter->{id} ? $parameter->{id} : "";
my $line = $parameter->{line} ? $parameter->{line} : __LINE__; my $line = $parameter->{line} ? $parameter->{line} : __LINE__;
my $query = $parameter->{query} ? $parameter->{query} : ""; my $query = $parameter->{query} ? $parameter->{query} : "";
my $secure = $parameter->{secure} ? $parameter->{secure} : 0; my $secure = $parameter->{secure} ? $parameter->{secure} : 0;
my $source = $parameter->{source} ? $parameter->{source} : $THIS_FILE; my $source = $parameter->{source} ? $parameter->{source} : $THIS_FILE;
my $reenter = $parameter->{reenter} ? $parameter->{reenter} : ""; my $reenter = $parameter->{reenter} ? $parameter->{reenter} : "";
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
id => $id, id => $id,
"cache::db_fh::${id}" => $an->data->{cache}{db_fh}{$id}, "cache::db_fh::${id}" => $an->data->{cache}{db_fh}{$id},
line => $line, line => $line,
@ -2559,12 +2557,14 @@ sub write
my @db_ids; my @db_ids;
if ($id) if ($id)
{ {
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { id => $id }});
push @db_ids, $id; push @db_ids, $id;
} }
else else
{ {
foreach my $id (sort {$a cmp $b} keys %{$an->data->{cache}{db_fh}}) foreach my $id (sort {$a cmp $b} keys %{$an->data->{cache}{db_fh}})
{ {
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { id => $id }});
push @db_ids, $id; push @db_ids, $id;
} }
} }
@ -2573,19 +2573,19 @@ sub write
my $limit = 25000; my $limit = 25000;
my $count = 0; my $count = 0;
my $query_set = []; my $query_set = [];
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { "sys::database::maximum_batch_size" => $an->data->{sys}{database}{maximum_batch_size} }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { "sys::database::maximum_batch_size" => $an->data->{sys}{database}{maximum_batch_size} }});
if ($an->data->{sys}{database}{maximum_batch_size}) if ($an->data->{sys}{database}{maximum_batch_size})
{ {
if ($an->data->{sys}{database}{maximum_batch_size} =~ /\D/) if ($an->data->{sys}{database}{maximum_batch_size} =~ /\D/)
{ {
# Bad value. # Bad value.
$an->data->{sys}{database}{maximum_batch_size} = 25000; $an->data->{sys}{database}{maximum_batch_size} = 25000;
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { "sys::database::maximum_batch_size" => $an->data->{sys}{database}{maximum_batch_size} }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { "sys::database::maximum_batch_size" => $an->data->{sys}{database}{maximum_batch_size} }});
} }
# Use the set value now. # Use the set value now.
$limit = $an->data->{sys}{database}{maximum_batch_size}; $limit = $an->data->{sys}{database}{maximum_batch_size};
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { limit => $limit }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { limit => $limit }});
} }
if (ref($query) eq "ARRAY") if (ref($query) eq "ARRAY")
{ {
@ -2594,7 +2594,7 @@ sub write
# If I am re-entering, then we'll proceed normally. If not, and if we have more than 10k # If I am re-entering, then we'll proceed normally. If not, and if we have more than 10k
# queries, we'll split up the queries into 10k chunks and re-enter. # queries, we'll split up the queries into 10k chunks and re-enter.
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
count => $count, count => $count,
limit => $limit, limit => $limit,
reenter => $reenter, reenter => $reenter,
@ -2603,7 +2603,7 @@ sub write
{ {
my $i = 0; my $i = 0;
my $next = $limit; my $next = $limit;
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { i => $i, 'next' => $next }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { i => $i, 'next' => $next }});
foreach my $this_query (@{$query}) foreach my $this_query (@{$query})
{ {
push @{$query_set}, $this_query; push @{$query_set}, $this_query;
@ -2622,7 +2622,7 @@ sub write
# This can get memory intensive, so check our RAM usage and # This can get memory intensive, so check our RAM usage and
# bail if we're eating too much. # bail if we're eating too much.
my $ram_use = $an->System->check_memory({program_name => $THIS_FILE}); my $ram_use = $an->System->check_memory({program_name => $THIS_FILE});
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { ram_use => $ram_use }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { ram_use => $ram_use }});
# Wipe out the old set array, create it as a new anonymous array and reset 'i'. # Wipe out the old set array, create it as a new anonymous array and reset 'i'.
undef $query_set; undef $query_set;
@ -2648,11 +2648,11 @@ sub write
foreach my $id (@db_ids) foreach my $id (@db_ids)
{ {
# Test access to the DB before we do the actual query # Test access to the DB before we do the actual query
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { id => $id }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { id => $id }});
$an->Database->_test_access({id => $id}); $an->Database->_test_access({id => $id});
# Do the actual query(ies) # Do the actual query(ies)
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
id => $id, id => $id,
count => $count, count => $count,
}}); }});
@ -2668,7 +2668,7 @@ sub write
#if ($an->Log->db_transactions()) #if ($an->Log->db_transactions())
if (1) if (1)
{ {
$an->Log->entry({source => $source, line => $line, secure => $secure, level => 3, key => "log_0074", variables => { $an->Log->entry({source => $source, line => $line, secure => $secure, level => 2, key => "log_0074", variables => {
id => $id, id => $id,
query => $query, query => $query,
}}); }});
@ -2688,7 +2688,7 @@ sub write
}}); }});
} }
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { count => $count }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { count => $count }});
if ($count) if ($count)
{ {
# Commit the changes. # Commit the changes.
@ -2696,7 +2696,7 @@ sub write
} }
} }
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { count => $count }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { count => $count }});
if ($count) if ($count)
{ {
# Free up some memory. # Free up some memory.
@ -2738,7 +2738,7 @@ sub _find_behind_databases
my $self = shift; my $self = shift;
my $parameter = shift; my $parameter = shift;
my $an = $self->parent; my $an = $self->parent;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0125", variables => { method => "Database->_find_behind_databases()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0125", variables => { method => "Database->_find_behind_databases()" }});
my $source = $parameter->{source} ? $parameter->{source} : ""; my $source = $parameter->{source} ? $parameter->{source} : "";
my $tables = $parameter->{tables} ? $parameter->{tables} : ""; my $tables = $parameter->{tables} ? $parameter->{tables} : "";
@ -2754,12 +2754,30 @@ sub _find_behind_databases
return("!!error!!"); return("!!error!!");
} }
# Now, look through the core tables, plus any tables the user might have passed, for differing
# 'modified_date' entries, or no entries in one DB with entries in the other (as can happen with a
# newly setup db).
my $check_tables = [];
foreach my $table (@{$an->data->{sys}{database}{core_tables}})
{
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { table => $table }});
push @{$check_tables}, $table;
}
if (ref($tables) eq "ARRAY")
{
foreach my $table (@{$tables})
{
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { table => $table }});
push @{$check_tables}, $table;
}
}
# Look at all the databases and find the most recent time stamp (and the ID of the DB). # Look at all the databases and find the most recent time stamp (and the ID of the DB).
$an->data->{sys}{database}{source_db_id} = 0; $an->data->{sys}{database}{source_db_id} = 0;
$an->data->{sys}{database}{source_updated_time} = 0; $an->data->{sys}{database}{source_updated_time} = 0;
foreach my $id (sort {$a cmp $b} keys %{$an->data->{database}}) foreach my $id (sort {$a cmp $b} keys %{$an->data->{database}})
{ {
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
"database::${id}::host" => $an->data->{database}{$id}{host}, "database::${id}::host" => $an->data->{database}{$id}{host},
"database::${id}::port" => $an->data->{database}{$id}{port}, "database::${id}::port" => $an->data->{database}{$id}{port},
"database::${id}::name" => $an->data->{database}{$id}{name}, "database::${id}::name" => $an->data->{database}{$id}{name},
@ -2810,32 +2828,44 @@ AND
"database::${id}::last_updated" => $an->data->{database}{$id}{last_updated} "database::${id}::last_updated" => $an->data->{database}{$id}{last_updated}
}}); }});
# If we have a tables hash, look into them, too. foreach my $table (@{$check_tables})
if (ref($tables) eq "HASH")
{ {
foreach my $table (sort {$a cmp $b} keys %{$tables}) # Does this table exist yet?
my $query = "SELECT COUNT(*) FROM information_schema.tables WHERE table_type = 'BASE TABLE' AND table_schema = 'public' AND table_name = ".$an->data->{sys}{use_db_fh}->quote($table).";";
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { query => $query }});
my $count = $an->Database->query({id => $id, query => $query, source => $THIS_FILE, line => __LINE__})->[0]->[0];
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { count => $count }});
if ($count == 1)
{ {
# I'm going to both check the number of entries in the history schema # Does this table have a '*_host_uuid' column?
my $table_name = $an->data->{sys}{use_db_fh}->quote($table); my $query = "SELECT column_name FROM information_schema.columns WHERE table_schema = 'public' AND column_name LIKE '\%_host_uuid' AND table_name = ".$an->data->{sys}{use_db_fh}->quote($table).";";
$table_name =~ s/'(.*?)'/$1/; $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { query => $query }});
my $host_column = $an->data->{sys}{use_db_fh}->quote($tables->{$table});
$host_column =~ s/'(.*?)'/$1/;
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
table_name => $table_name,
host_column => $host_column,
}});
my $query = " my $host_column = $an->Database->query({id => $id, query => $query, source => $THIS_FILE, line => __LINE__})->[0]->[0];
$host_column = "" if not defined $host_column;
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { host_column => $host_column }});
# Does this table have a history schema version?
$query = "SELECT COUNT(*) FROM information_schema.tables WHERE table_type = 'BASE TABLE' AND table_schema = 'history' AND table_name = ".$an->data->{sys}{use_db_fh}->quote($table).";";
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { query => $query }});
my $count = $an->Database->query({id => $id, query => $query, source => $THIS_FILE, line => __LINE__})->[0]->[0];
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { count => $count }});
my $schema = $count ? "history" : "public";
$query = "
SELECT SELECT
round(extract(epoch from modified_date)) round(extract(epoch from modified_date))
FROM FROM
history.$table_name "; $schema.$table ";
if ($host_column) if ($host_column)
{ {
$query .= " $query .= "
WHERE WHERE
$host_column = ".$an->data->{sys}{use_db_fh}->quote($an->data->{sys}{host_uuid})." $host_column = ".$an->data->{sys}{use_db_fh}->quote($an->data->{sys}{host_uuid}) ;
";
} }
$query .= " $query .= "
ORDER BY ORDER BY
@ -2935,7 +2965,7 @@ sub _mark_database_as_behind
my $self = shift; my $self = shift;
my $parameter = shift; my $parameter = shift;
my $an = $self->parent; my $an = $self->parent;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0125", variables => { method => "Database->_mark_database_as_behind()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0125", variables => { method => "Database->_mark_database_as_behind()" }});
my $id = $parameter->{id} ? $parameter->{id} : ""; my $id = $parameter->{id} ? $parameter->{id} : "";
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { id => $id }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { id => $id }});
@ -2981,7 +3011,7 @@ sub _test_access
my $self = shift; my $self = shift;
my $parameter = shift; my $parameter = shift;
my $an = $self->parent; my $an = $self->parent;
$an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0125", variables => { method => "Database->_test_access()" }}); $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0125", variables => { method => "Database->_test_access()" }});
my $id = $parameter->{id} ? $parameter->{id} : ""; my $id = $parameter->{id} ? $parameter->{id} : "";
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { id => $id }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { id => $id }});

15
AN/Tools/System.pm
Unescape View File

@ -260,27 +260,32 @@ sub determine_host_type
my $an = $self->parent; my $an = $self->parent;
my $host_type = ""; my $host_type = "";
my $host_name = $an->_hostname; my $host_name = $an->_short_hostname;
$host_type = "unknown"; $host_type = "unknown";
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
host_type => $host_type,
host_name => $host_name,
"sys::host_type" => $an->data->{sys}{host_type},
}});
if ($an->data->{sys}{host_type}) if ($an->data->{sys}{host_type})
{ {
$host_type = $an->data->{sys}{host_type}; $host_type = $an->data->{sys}{host_type};
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { host_type => $host_type }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { host_type => $host_type }});
} }
elsif (($host_name =~ /n\d+$/) or ($host_name =~ /node\d+$/)) elsif (($host_name =~ /n\d+$/) or ($host_name =~ /node\d+$/))
{ {
$host_type = "node"; $host_type = "node";
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { host_type => $host_type }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { host_type => $host_type }});
} }
elsif (($host_name =~ /striker\d+$/) or ($host_name =~ /dashboard\d+$/)) elsif (($host_name =~ /striker\d+$/) or ($host_name =~ /dashboard\d+$/))
{ {
$host_type = "dashboard"; $host_type = "dashboard";
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { host_type => $host_type }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { host_type => $host_type }});
} }
elsif ($host_name =~ /dr\d+$/) elsif ($host_name =~ /dr\d+$/)
{ {
$host_type = "dr"; $host_type = "dr";
$an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { host_type => $host_type }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { host_type => $host_type }});
} }
return($host_type); return($host_type);

Write Preview
Loading…
Cancel
Save