percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-26 15:31:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add 2 safeguards to Agent::Logger to avoid excessive memory usage and error spamming.

Browse Source
This commit is contained in:
Daniel Nichter
2013-06-16 22:37:42 -07:00
parent 1b0431301a
commit 9215fd5a02
2 changed files with 59 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/Percona/Agent/Logger.pm
View File

@@ -143,7 +143,8 @@ sub start_online_logging {
else {
# child
my @log_entries;
my $oktorun = 1;
my $n_errors = 0;
my $oktorun = 1;
QUEUE:
while ($oktorun) {
my $lines = read_stdin($read_timeout);
@@ -181,19 +182,42 @@ sub start_online_logging {
);
};
if ( my $e = $EVAL_ERROR ) {
warn "$e";
# Safegaurd: don't spam the agent log file with errors.
if ( ++$n_errors > 100 ) {
warn "$n_errors consecutive errors, no more error "
. "messages will be printed until log entries "
. "are sent successfully again.\n";
}
else {
warn "Error sending log entry to API: $e";
}
}
else {
@log_entries = ();
$n_errors = 0;
}
} # have log entries
} # LINE
# Safeguard: don't use too much memory if we lose connection
# to the API for a long time.
my $n_log_entries = scalar @log_entries;
if ( $n_log_entries > 1_000 ) {
warn "$n_log_entries log entries in send buffer, "
. "removing first 100 to avoid excessive usage.\n";
@log_entries = @log_entries[100..($n_log_entries-1)];
}
} # QUEUE
if ( scalar @log_entries ) {
my $ts = ts(time, 0); # 0=local time
warn "$ts WARNING Failed to send these log entries (timestamps are UTC):\n";
foreach my $entry ( @log_entries ) {
warn sprintf("%s %s %s\n", $entry->[0], level_name($entry->[1]), $entry->[2]);
my $ts = ts(time, 1); # 1=UTC
warn "$ts WARNING Failed to send these log entries "
. "(timestamps are UTC):\n";
foreach my $log ( @log_entries ) {
warn sprintf("%s %s %s\n",
$log->entry_ts,
level_name($log->log_level),
$log->message,
);
}
}