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

Make init_agent() tries required. Load service earlier in send_data() and run_service(). Fix init_agent.t.

Browse Source
This commit is contained in:
Daniel Nichter
2013-09-19 14:53:31 -07:00
parent a5259a8c77
commit 25024149be
2 changed files with 54 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
bin/pt-agent
View File

@@ -5748,17 +5748,18 @@ sub init_agent {
action action
link link
client client
tries
interval interval
)) or die; )) or die;
my $agent = $args{agent}; my $agent = $args{agent};
my $action = $args{action}; my $action = $args{action};
my $link = $args{link}; my $link = $args{link};
my $client = $args{client}; my $client = $args{client};
my $tries = $args{tries};
my $interval = $args{interval}; my $interval = $args{interval};
# Optional args # Optional args
my $_oktorun = $args{oktorun} || sub { return $oktorun }; my $_oktorun = $args{oktorun} || sub { return $oktorun };
my $tries = $args{tries};
my $actions = $args{actions}; my $actions = $args{actions};
# Update these attribs every time the agent is initialized. # Update these attribs every time the agent is initialized.
@@ -5769,7 +5770,7 @@ sub init_agent {
# Try to create/update the Agent. # Try to create/update the Agent.
my $success = 0; my $success = 0;
while ( $_oktorun->() && (!defined $tries || $tries--) ) { while ( $_oktorun->() && $tries-- ) {
$logger->info($action eq 'put' ? "Updating agent " . $agent->name $logger->info($action eq 'put' ? "Updating agent " . $agent->name
: "Creating new agent"); : "Creating new agent");
my $agent_uri = eval { my $agent_uri = eval {
@@ -5818,7 +5819,7 @@ sub init_agent {
last; # success last; # success
} }
} }
if ( !defined $tries || $tries ) { if ( $tries > 0 ) {
$interval->(); # failure, try again $interval->(); # failure, try again
} }
} }
@@ -6019,8 +6020,8 @@ These values can change if a different configuration is received.
action => $action, # put or post action => $action, # put or post
link => $link, link => $link,
client => $client, client => $client,
tries => $tries, # optional tries => $tries,
interval => $interval, # optional interval => $interval,
oktorun => $_oktorun, # optional oktorun => $_oktorun, # optional
); );
if ( !$success ) { if ( !$success ) {
@@ -7003,16 +7004,29 @@ sub run_service {
quiet => 1, quiet => 1,
); );
# Load the Service object from local service JSON file.
# $service changes from a string scalar to a Service object.
$service = load_service(
service => $service,
lib_dir => $lib_dir,
);
my $service_name = $service->name;
my $daemon = Daemon->new( my $daemon = Daemon->new(
daemonize => 0, # no need: we're running from cron daemonize => 0, # no need: we're running from cron
pid_file => "$lib_dir/pids/$service.$PID", pid_file => "$lib_dir/pids/$service_name.$PID",
log_file => "$lib_dir/logs/$service.run", log_file => "$lib_dir/logs/$service_name.run",
force_log_file => 1, force_log_file => 1,
); );
$daemon->run(); $daemon->run();
$logger->info("Running $service"); if ( $service->meta ) {
$logger->service("$service run"); $logger->service($service_name);
}
else {
$logger->service("$service_name run");
}
$logger->info("Running $service_name");
# Connect to Percona, get entry links. # Connect to Percona, get entry links.
my $logger_client; my $logger_client;
@@ -7055,7 +7069,7 @@ sub run_service {
} }
else { else {
my $log_link = $agent->links->{log}; my $log_link = $agent->links->{log};
$logger->data_ts($prefix); # TODO Not needed unless $use_spool $logger->data_ts($prefix) unless $service->meta;
$logger->start_online_logging( $logger->start_online_logging(
client => $logger_client, client => $logger_client,
log_link => $log_link, log_link => $log_link,
@@ -7067,13 +7081,6 @@ sub run_service {
$logger->_log(0, 'INFO', "File logging only"); $logger->_log(0, 'INFO', "File logging only");
} }
# Load the Service object from local service JSON file.
# $service changes from a string scalar to a Service object.
$service = load_service(
service => $service,
lib_dir => $lib_dir,
);
# Check if any task spools data or uses MySQL. Any task that spools # Check if any task spools data or uses MySQL. Any task that spools
# should also use metadata because all data samples have at least a # should also use metadata because all data samples have at least a
# start_ts and end_ts as metadata. # start_ts and end_ts as metadata.
@@ -7513,7 +7520,7 @@ sub init_spool_dir {
_safe_mkdir($dir); _safe_mkdir($dir);
} }
elsif ( !-w $dir ) { elsif ( !-w $dir ) {
die "$dir does not writeable\n"; die "$dir is not writeable\n";
} }
} }
@@ -7589,23 +7596,13 @@ sub send_data {
quiet => 1, quiet => 1,
); );
# Log all output to a file.
my $daemon = Daemon->new(
daemonize => 0, # no need: we're running from cron
pid_file => "$lib_dir/pids/$service.send",
log_file => "$lib_dir/logs/$service.send",
force_log_file => $interactive ? 0 : 1,
);
$daemon->run();
$logger->service("$service send");
# Load the Service object from local service JSON file. # Load the Service object from local service JSON file.
# $service changes from a string scalar to a Service object. # $service changes from a string scalar to a Service object.
$service = load_service( $service = load_service(
service => $service, service => $service,
lib_dir => $lib_dir, lib_dir => $lib_dir,
); );
my $service_name = $service->name;
my ($service_dir) = init_spool_dir( my ($service_dir) = init_spool_dir(
spool_dir => $spool_dir, spool_dir => $spool_dir,
@@ -7614,10 +7611,23 @@ sub send_data {
my @data_files = glob "$service_dir/*.data"; my @data_files = glob "$service_dir/*.data";
if ( scalar @data_files == 0 ) { if ( scalar @data_files == 0 ) {
$logger->debug("No $service data files to send"); $logger->debug("No $service_name data files to send");
return; return;
} }
# Log all output to a file.
my $daemon = Daemon->new(
daemonize => 0, # no need: we're running from cron
pid_file => "$lib_dir/pids/$service_name.send",
log_file => "$lib_dir/logs/$service_name.send",
force_log_file => $interactive ? 0 : 1,
);
$daemon->run();
$logger->service("$service send");
my $data_link = $service->links->{data};
$logger->info("Sending " . scalar @data_files . " data files ($data_link)");
# Connect to Percona, get entry links. # Connect to Percona, get entry links.
my $logger_client; my $logger_client;
if ( !$client || !$entry_links ) { if ( !$client || !$entry_links ) {
@@ -7667,8 +7677,6 @@ sub send_data {
# Only iterator over data files because run_service() writes # Only iterator over data files because run_service() writes
# them last to avoid a race condition with us. See the code # them last to avoid a race condition with us. See the code
# comment about writing the .meta file first in run_service(). # comment about writing the .meta file first in run_service().
my $data_link = $service->links->{data};
$logger->info("Sending " . scalar @data_files . " data files ($data_link)");
DATA_FILE: DATA_FILE:
foreach my $data_file ( @data_files ) { foreach my $data_file ( @data_files ) {
(my $meta_file = $data_file) =~ s/\.data/.meta/; (my $meta_file = $data_file) =~ s/\.data/.meta/;

28
t/pt-agent/init_agent.t
View File

@@ -109,6 +109,7 @@ my $output = output(
link => "/agents", link => "/agents",
client => $client, client => $client,
interval => $interval, interval => $interval,
tries => 4,
); );
}, },
stderr => 1, stderr => 1,
@@ -152,7 +153,7 @@ $ua->{responses}->{post} = [
$ua->{responses}->{get} = [ $ua->{responses}->{get} = [
{ {
headers => { 'X-Percona-Resource-Type' => 'Agent' }, headers => { 'X-Percona-Resource-Type' => 'Agent' },
content => $return_agent, content => as_hashref($return_agent, with_links =>1 ),
}, },
]; ];
@@ -162,12 +163,13 @@ $ua->{requests} = [];
$output = output( $output = output(
sub { sub {
$got_agent = pt_agent::init_agent( ($got_agent) = pt_agent::init_agent(
agent => $post_agent, agent => $post_agent,
action => 'post', action => 'post',
link => "/agents", link => "/agents",
client => $client, client => $client,
interval => $interval, interval => $interval,
tries => 5,
oktorun => $oktorun, oktorun => $oktorun,
); );
}, },
@@ -175,10 +177,10 @@ $output = output(
); );
is( is(
$got_agent->hostname, ($got_agent ? $got_agent->hostname : ''),
'host2', 'host2',
'Got and returned Agent after error' 'Got and returned Agent after error'
) or diag($output, Dumper(as_hashref($got_agent, with_links => 1))); ) or diag($output, Dumper($got_agent));
is( is(
scalar @wait, scalar @wait,
@@ -196,14 +198,11 @@ is_deeply(
"POST POST GET new Agent after error" "POST POST GET new Agent after error"
) or diag(Dumper($ua->{requests})); ) or diag(Dumper($ua->{requests}));
TODO: { like(
local $TODO = "False-positive"; $log[3],
like( qr{WARNING Failed to POST /agents},
$output, "POST /agents failure logged after error"
qr{WARNING Failed to POST /agents}, ) or diag(Dumper($ua->{requests}), Dumper(\@log));
"POST /agents failure logged after error"
) or diag(Dumper($ua->{requests}));
}
# ############################################################################# # #############################################################################
# Init an existing agent, i.e. update it. # Init an existing agent, i.e. update it.
@@ -233,7 +232,7 @@ $ua->{responses}->{get} = [
{ {
code => 200, code => 200,
headers => { 'X-Percona-Resource-Type' => 'Agent' }, headers => { 'X-Percona-Resource-Type' => 'Agent' },
content => $return_agent, content => as_hashref($return_agent, with_links =>1 ),
} }
]; ];
@@ -242,12 +241,13 @@ $ua->{requests} = [];
$output = output( $output = output(
sub { sub {
$got_agent = pt_agent::init_agent( ($got_agent) = pt_agent::init_agent(
agent => $put_agent, agent => $put_agent,
action => 'put', action => 'put',
link => "/agents/123", link => "/agents/123",
client => $client, client => $client,
interval => $interval, interval => $interval,
tries => 4,
); );
}, },
stderr => 1, stderr => 1,