percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-23 12:47:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge merge-pt-agent-2.

Browse Source
This commit is contained in:
Daniel Nichter
2013-11-07 18:25:06 -08:00
parent 2c34f63f58 4b9b6f968d
commit a4634d78c8
1 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
bin/pt-agent
View File

@@ -7366,15 +7366,7 @@ sub run_service {
# if 1) the service spools data and 2) there is data. # if 1) the service spools data and 2) there is data.
my $file_size = (-s $tmp_data_file) || 0; my $file_size = (-s $tmp_data_file) || 0;
$logger->debug("$tmp_data_file size: " . ($file_size || 0) . " bytes"); $logger->debug("$tmp_data_file size: " . ($file_size || 0) . " bytes");
if ( $file_size > $max_data ) { if ( $use_spool && $file_size ) {
$logger->error("Data file is larger than $max_data, the service "
. "may be malfunctioning, stopping service");
stop_service(
service => $service->name,
lib_dir => $lib_dir,
);
}
elsif ( $use_spool && $file_size ) {
# Save metadata about this sample _first_, because --send-data looks # Save metadata about this sample _first_, because --send-data looks
# for the data file first, then for a corresponding .meta file. If # for the data file first, then for a corresponding .meta file. If
# we write the data file first, then we create a race condition: while # we write the data file first, then we create a race condition: while
@@ -7391,24 +7383,31 @@ sub run_service {
); );
$metadata->{run_time} = sprintf('%.6f', time - $start_time); $metadata->{run_time} = sprintf('%.6f', time - $start_time);
(my $meta_file = $data_file) =~ s/\.data/\.meta/; (my $meta_file = $data_file) =~ s/\.data/\.meta/;
my $json_metadata = as_json($metadata, json => $json);
write_to_file( write_to_file(
data => as_json($metadata, json => $json), data => $json_metadata,
file => "$data_dir/$meta_file", file => "$data_dir/$meta_file",
); );
# Use system mv instead of Perl File::Copy::move() because it's if ( $file_size <= $max_data ) {
# unknown if the Perl version will do an optimized move, i.e. # Use system mv instead of Perl File::Copy::move() because it's
# simply move the inode, _not_ copy the file. A system mv on # unknown if the Perl version will do an optimized move, i.e.
# the same filesystem is pretty much guaranteed to do an optimized, # simply move the inode, _not_ copy the file. A system mv on
# i.e. quasi-atomic, move. # the same filesystem is pretty much guaranteed to do an optimized,
my $cmd = "mv $tmp_data_file $data_dir"; # i.e. quasi-atomic, move.
$logger->debug($cmd); my $cmd = "mv $tmp_data_file $data_dir";
system($cmd); $logger->debug($cmd);
my $cmd_exit_status = $CHILD_ERROR >> 8; system($cmd);
if ( $cmd_exit_status != 0 ) { my $cmd_exit_status = $CHILD_ERROR >> 8;
$logger->error("Move failed: $cmd") if ( $cmd_exit_status != 0 ) {
$logger->error("Move failed: $cmd")
}
$exit_status |= $cmd_exit_status;
}
else {
$logger->error("Data file is larger than $max_data, skipping: "
. ($json_metadata || ''));
} }
$exit_status |= $cmd_exit_status;
} }
# Remove staged files. Anything to save should have been moved # Remove staged files. Anything to save should have been moved