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

Update/fix run_agent.t. Set action and link in run_agent() when given test agent. Fix apply_config(): don't die if config file doesn't exist. Expect Config.lib to be set. Fix run_service(): run run_once services without meta or syncing time interval.

Browse Source
This commit is contained in:
Daniel Nichter
2013-04-13 10:24:52 -06:00
parent 80b79c962b
commit 2d89fe6163
2 changed files with 189 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
bin/pt-agent
View File

@@ -5124,7 +5124,7 @@ sub run_agent {
my $daemonize = $args{daemonize}; my $daemonize = $args{daemonize};
my $pid_file = $args{pid_file}; my $pid_file = $args{pid_file};
my $log_file = $args{log_file}; my $log_file = $args{log_file};
my $oktorun = $args{oktorun} || sub { return $oktorun }; my $_oktorun = $args{oktorun} || sub { return $oktorun };
my $versions = $args{versions}; # for testing my $versions = $args{versions}; # for testing
my $client = $args{client}; # for testing my $client = $args{client}; # for testing
my $entry_links = $args{entry_links}; # for testing my $entry_links = $args{entry_links}; # for testing
@@ -5184,7 +5184,7 @@ Configure the agent at https://pws.percona.com/agents
interval => sub { sleep 60 }, interval => sub { sleep 60 },
); );
} }
return unless $oktorun->(); return unless $_oktorun->();
# Do a version-check every time the agent starts. If versions # Do a version-check every time the agent starts. If versions
# have changed, this can affect how services are implemented. # have changed, this can affect how services are implemented.
@@ -5198,7 +5198,7 @@ Configure the agent at https://pws.percona.com/agents
tries => 1, tries => 1,
); );
} }
return unless $oktorun->(); return unless $_oktorun->();
# Load and update the local (i.e. existing) agent, or create a new one. # Load and update the local (i.e. existing) agent, or create a new one.
my ($action, $link); my ($action, $link);
@@ -5209,6 +5209,8 @@ Configure the agent at https://pws.percona.com/agents
uuid => $agent_uuid, uuid => $agent_uuid,
versions => $versions, versions => $versions,
); );
$action = 'put'; # update
$link = $entry_links->{agents} . '/' . $agent->uuid;
} }
else { else {
# First try to load the local agent. # First try to load the local agent.
@@ -5231,6 +5233,10 @@ Configure the agent at https://pws.percona.com/agents
} }
} }
} }
else {
$action = 'put';
$link = $entry_links->{agents} . '/' . $agent->uuid;
}
$agent = init_agent( $agent = init_agent(
agent => $agent, agent => $agent,
action => $action, action => $action,
@@ -5238,12 +5244,13 @@ Configure the agent at https://pws.percona.com/agents
client => $client, client => $client,
interval => sub { sleep 60 }, interval => sub { sleep 60 },
lib_dir => $lib_dir, lib_dir => $lib_dir,
oktorun => $_oktorun,
); );
save_agent( save_agent(
agent => $agent, agent => $agent,
lib_dir => $lib_dir, lib_dir => $lib_dir,
); );
return unless $oktorun->(); return unless $_oktorun->();
_info('Running agent ' . $agent->name); _info('Running agent ' . $agent->name);
@@ -5259,7 +5266,7 @@ Configure the agent at https://pws.percona.com/agents
my $new_daemon; my $new_daemon;
my $config; my $config;
my $services; my $services;
while ( $oktorun->() ) { while ( $_oktorun->() ) {
($config, $lib_dir, $new_daemon, $success) = get_config( ($config, $lib_dir, $new_daemon, $success) = get_config(
agent => $agent, agent => $agent,
client => $client, client => $client,
@@ -5475,14 +5482,17 @@ sub write_config {
_info("Writing config to $file"); _info("Writing config to $file");
# Get the api-key line if any; we don't want to/can't clobber this. # Get the api-key line if any; we don't want to/can't clobber this.
open my $fh, "<", $file my $api_key;
or die "Error opening $file: $OS_ERROR"; if ( -f $file ) {
my $contents = do { local $/ = undef; <$fh> }; open my $fh, "<", $file
close $fh; or die "Error opening $file: $OS_ERROR";
my ($api_key) = $contents =~ m/^(api-key=\S+)$/m; my $contents = do { local $/ = undef; <$fh> };
close $fh;
($api_key) = $contents =~ m/^(api-key=\S+)$/m;
}
# Re-write the api-key, if any, then write the config. # Re-write the api-key, if any, then write the config.
open $fh, '>', $file open my $fh, '>', $file
or die "Error opening $file: $OS_ERROR"; or die "Error opening $file: $OS_ERROR";
if ( $api_key ) { if ( $api_key ) {
print { $fh } $api_key, "\n" print { $fh } $api_key, "\n"
@@ -5565,7 +5575,7 @@ sub apply_config {
# If the --lib dir has changed, init the new one and re-write # If the --lib dir has changed, init the new one and re-write
# the Agent resource in it. # the Agent resource in it.
my $new_lib_dir = $new_config->options->{lib}; my $new_lib_dir = $new_config->options->{lib};
if ( ($new_lib_dir && $new_lib_dir ne $lib_dir) || $state->{first_config} ) { if ( ($new_lib_dir ne $lib_dir) || $state->{first_config} ) {
_info($state->{first_config} ? "Applying first config" _info($state->{first_config} ? "Applying first config"
: "New --lib direcotry: $new_lib_dir"); : "New --lib direcotry: $new_lib_dir");
init_lib_dir( init_lib_dir(
@@ -5960,7 +5970,7 @@ sub run_service {
end_ts => $curr_ts, end_ts => $curr_ts,
tasks => [], tasks => [],
}; };
if ( $use_spool ) { if ( $use_spool && !$service->run_once ) {
my $prev_ts; my $prev_ts;
if ( -f $meta_file ) { if ( -f $meta_file ) {
$prev_ts = slurp($meta_file); $prev_ts = slurp($meta_file);
@@ -5982,7 +5992,8 @@ sub run_service {
# Run the tasks, spool any data. # Run the tasks, spool any data.
my @output_files; my @output_files;
my $data_file = $service->name . '.' . int(time); my $data_file = $service->name
. ($service->run_once ? '' : '.' . int(time));
my $tmp_data_file = "$tmp_dir/$data_file"; my $tmp_data_file = "$tmp_dir/$data_file";
my $have_data_file = 0; my $have_data_file = 0;
my $taskno = 0; my $taskno = 0;
@@ -6076,7 +6087,10 @@ sub run_service {
# is not the first run of the service. # is not the first run of the service.
my $file_size = -s $tmp_data_file; my $file_size = -s $tmp_data_file;
_info("$tmp_data_file size: " . ($file_size || 0) . " bytes"); _info("$tmp_data_file size: " . ($file_size || 0) . " bytes");
if ( $use_spool && $file_size && $metadata->{start_ts} ) { if ( $use_spool
&& $file_size
&& ($metadata->{start_ts} || $service->run_once) )
{
# 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
@@ -6106,7 +6120,7 @@ sub run_service {
# Always update the meta file if spooling, even if there was no data # Always update the meta file if spooling, even if there was no data
# or this is the first run of the service (in which case this is the # or this is the first run of the service (in which case this is the
# first interval boundary for the service). # first interval boundary for the service).
if ( $use_spool ) { if ( $use_spool && !$service->run_once ) {
write_to_file( write_to_file(
data => "$curr_ts\n", data => "$curr_ts\n",
file => $meta_file, file => $meta_file,

214
t/pt-agent/run_agent.t
View File

@@ -10,13 +10,28 @@ use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use English qw(-no_match_vars); use English qw(-no_match_vars);
use Test::More; use Test::More;
use JSON; use JSON;
use File::Temp qw(tempdir); use File::Temp qw(tempdir);
use Percona::Test; use Percona::Test;
use Sandbox;
use Percona::Test::Mock::UserAgent; use Percona::Test::Mock::UserAgent;
require "$trunk/bin/pt-agent"; require "$trunk/bin/pt-agent";
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $dbh = $sb->get_dbh_for('master');
my $dsn = $sb->dsn_for('master');
my $o = new OptionParser();
$o->get_specs("$trunk/bin/pt-agent");
$o->get_opts();
my $cxn = Cxn->new(
dsn_string => $dsn,
OptionParser => $o,
DSNParser => $dp,
);
Percona::Toolkit->import(qw(Dumper)); Percona::Toolkit->import(qw(Dumper));
Percona::WebAPI::Representation->import(qw(as_hashref)); Percona::WebAPI::Representation->import(qw(as_hashref));
@@ -29,6 +44,10 @@ if ( $crontab ) {
`crontab -r`; `crontab -r`;
} }
# Fake --lib and --spool dirs.
my $tmpdir = tempdir("/tmp/pt-agent.$PID.XXXXXX", CLEANUP => 1);
mkdir "$tmpdir/spool" or die "Error making $tmpdir/spool: $OS_ERROR";
# ############################################################################# # #############################################################################
# Create mock client and Agent # Create mock client and Agent
# ############################################################################# # #############################################################################
@@ -59,8 +78,9 @@ is(
) or die; ) or die;
my $agent = Percona::WebAPI::Resource::Agent->new( my $agent = Percona::WebAPI::Resource::Agent->new(
id => '123', uuid => '123',
hostname => 'host', hostname => 'host',
username => 'user',
links => { links => {
self => '/agents/123', self => '/agents/123',
config => '/agents/123/config', config => '/agents/123/config',
@@ -89,7 +109,9 @@ my $config = Percona::WebAPI::Resource::Config->new(
ts => 1363720060, ts => 1363720060,
name => 'Default', name => 'Default',
options => { options => {
'check-interval' => "60", 'lib' => $tmpdir, # required
'spool' => "$tmpdir/spool", # required
'check-interval' => "11",
}, },
links => { links => {
self => '/agents/123/config', self => '/agents/123/config',
@@ -116,12 +138,22 @@ my $svc0 = Percona::WebAPI::Resource::Service->new(
}, },
); );
$ua->{responses}->{put} = [
{ # 1
headers => { 'Location' => '/agents/123' },
},
];
$ua->{responses}->{get} = [ $ua->{responses}->{get} = [
{ { # 2
headers => { 'X-Percona-Resource-Type' => 'Agent' },
content => as_hashref($agent, with_links => 1),
},
{ # 3
headers => { 'X-Percona-Resource-Type' => 'Config' }, headers => { 'X-Percona-Resource-Type' => 'Config' },
content => as_hashref($config, with_links => 1), content => as_hashref($config, with_links => 1),
}, },
{ { # 4
headers => { 'X-Percona-Resource-Type' => 'Service' }, headers => { 'X-Percona-Resource-Type' => 'Service' },
content => [ as_hashref($svc0, with_links => 1) ], content => [ as_hashref($svc0, with_links => 1) ],
}, },
@@ -129,23 +161,25 @@ $ua->{responses}->{get} = [
# The only thing pt-agent must have is the API key in the config file, # The only thing pt-agent must have is the API key in the config file,
# everything else relies on defaults until the first Config is gotten # everything else relies on defaults until the first Config is gotten
# from Percona. -- The tool calls init_config_file() if the file doesn't # from Percona.
# exist, so we do the same. Might as well test it while we're here.
my $config_file = pt_agent::get_config_file(); my $config_file = pt_agent::get_config_file();
unlink $config_file if -f $config_file; unlink $config_file if -f $config_file;
pt_agent::init_config_file(file => $config_file, api_key => '123');
is( like(
`cat $config_file`, $config_file,
"api-key=123\n", qr/$ENV{LOGNAME}\/\.pt-agent.conf$/,
"init_config_file()" "Default config file is ~/.pt-agent.config"
); );
my $tmpdir = tempdir("/tmp/pt-agent.$PID.XXXXXX", CLEANUP => 1);
mkdir "$tmpdir/services" or die "Error making $tmpdir/services: $OS_ERROR";
my @ok_code = (); # callbacks my @ok_code = (); # callbacks
my @oktorun = (1, 0); my @oktorun = (
1, # after get_api_client()
1, # after get_versions()
1, # init_agent() loop
1, # after init_agent()
1, # 1st main loop check
0, # 2nd main loop check
);
my $oktorun = sub { my $oktorun = sub {
my $ok = shift @oktorun; my $ok = shift @oktorun;
print "oktorun=" . (defined $ok ? $ok : 'undef') . "\n"; print "oktorun=" . (defined $ok ? $ok : 'undef') . "\n";
@@ -159,13 +193,22 @@ my $oktorun = sub {
$output = output( $output = output(
sub { sub {
pt_agent::run_agent( pt_agent::run_agent(
agent => $agent, # Required args
client => $client, api_key => '123',
interval => $interval, interval => $interval,
config_file => $config_file,
lib_dir => $tmpdir, lib_dir => $tmpdir,
oktorun => $oktorun, # optional, for testing Cxn => $cxn,
json => $json, # optional, for testing # Optional args, for testing
client => $client,
agent => $agent,
oktorun => $oktorun,
json => $json,
versions => {
Perl => '5.10.1',
},
entry_links => {
agents => '/agents',
},
); );
}, },
stderr => 1, stderr => 1,
@@ -173,7 +216,7 @@ $output = output(
is( is(
`cat $config_file`, `cat $config_file`,
"api-key=123\ncheck-interval=60\n", "check-interval=11\nlib=$tmpdir\nspool=$tmpdir/spool\n",
"Write Config to config file" "Write Config to config file"
); );
@@ -185,7 +228,7 @@ is(
is( is(
$wait[0], $wait[0],
60, 11,
"... used Config->options->check-interval" "... used Config->options->check-interval"
); );
@@ -226,7 +269,17 @@ like(
# Run run_agent again, like the agent had been stopped and restarted. # Run run_agent again, like the agent had been stopped and restarted.
# ############################################################################# # #############################################################################
$ua->{responses}->{put} = [
{ # 1
headers => { 'Location' => '/agents/123' },
},
];
$ua->{responses}->{get} = [ $ua->{responses}->{get} = [
{ # 2
headers => { 'X-Percona-Resource-Type' => 'Agent' },
content => as_hashref($agent, with_links => 1),
},
# First check, fail # First check, fail
{ {
code => 500, code => 500,
@@ -254,14 +307,25 @@ $ua->{responses}->{get} = [
# interval, oktorun=0 # interval, oktorun=0
]; ];
# 0=while check, 1=after first check, 2=after 2nd check, etc. @oktorun = (
@oktorun = (1, 1, 1, 0); 1, # after get_api_client()
1, # after get_versions()
1, # init_agent() loop
1, # after init_agent()
1, # 1st main loop check
# First check, error 500
1, # 2nd main loop check
# Init with latest Config and Services
1, # 3rd main loop check
# Same Config and services
0, # 4th main loop check
);
# Between the 2nd and 3rd checks, remove the config file (~/.pt-agent.conf) # Before the 3rd check, remove the config file (~/.pt-agent.conf) and
# and query-history service file. When the tool re-GETs these, they'll be # query-history service file. When the tool re-GETs these, they'll be
# the same so it won't recreate them. A bug here will cause these files to # the same so it won't recreate them. A bug here will cause these files to
# exist again after running. # exist again after running.
$ok_code[2] = sub { $ok_code[6] = sub {
unlink "$config_file"; unlink "$config_file";
unlink "$tmpdir/services/query-history"; unlink "$tmpdir/services/query-history";
Percona::Test::wait_until(sub { ! -f "$config_file" }); Percona::Test::wait_until(sub { ! -f "$config_file" });
@@ -273,13 +337,22 @@ $ok_code[2] = sub {
$output = output( $output = output(
sub { sub {
pt_agent::run_agent( pt_agent::run_agent(
agent => $agent, # Required args
client => $client, api_key => '123',
interval => $interval, interval => $interval,
config_file => $config_file,
lib_dir => $tmpdir, lib_dir => $tmpdir,
oktorun => $oktorun, # optional, for testing Cxn => $cxn,
json => $json, # optional, for testing # Optional args, for testing
client => $client,
agent => $agent,
oktorun => $oktorun,
json => $json,
versions => {
Perl => '5.10.1',
},
entry_links => {
agents => '/agents',
},
); );
}, },
stderr => 1, stderr => 1,
@@ -287,7 +360,7 @@ $output = output(
is_deeply( is_deeply(
\@wait, \@wait,
[ undef, 60, 60 ], [ 60, 11, 11 ],
"Got Config after error" "Got Config after error"
) or diag(Dumper(\@wait)); ) or diag(Dumper(\@wait));
@@ -314,17 +387,20 @@ is(
diag(`rm -f $tmpdir/* >/dev/null 2>&1`); diag(`rm -f $tmpdir/* >/dev/null 2>&1`);
diag(`rm -rf $tmpdir/services/*`); diag(`rm -rf $tmpdir/services/*`);
mkdir "$tmpdir/spool" or die $OS_ERROR; diag(`rm -rf $tmpdir/spool/*`);
$config_file = pt_agent::get_config_file(); # When pt-agent manually runs --run-service test-run-at-start, it's going
# to need an API key because it doesn't call its own run_service(), it runs
# another instance of itself with system(). So put the fake API key in
# the default config file.
unlink $config_file if -f $config_file; unlink $config_file if -f $config_file;
pt_agent::init_config_file(file => $config_file, api_key => '123'); diag(`echo "api-key=123" > $config_file`);
$config = Percona::WebAPI::Resource::Config->new( $config = Percona::WebAPI::Resource::Config->new(
ts => 1363720060, ts => 1363720060,
name => 'Test run_once_on_start', name => 'Test run_once_on_start',
options => { options => {
'check-interval' => "60", 'check-interval' => "15",
'lib' => $tmpdir, 'lib' => $tmpdir,
'spool' => "$tmpdir/spool", 'spool' => "$tmpdir/spool",
'pid' => "$tmpdir/pid", 'pid' => "$tmpdir/pid",
@@ -344,18 +420,27 @@ $run0 = Percona::WebAPI::Resource::Task->new(
); );
$svc0 = Percona::WebAPI::Resource::Service->new( $svc0 = Percona::WebAPI::Resource::Service->new(
name => 'test-run-at-start', name => 'test-run-at-start',
run_schedule => '0 0 1 1 *', run_schedule => '0 0 1 1 *',
spool_schedule => '0 0 1 1 *', run_once => 1, # here's the magic
run_once_on_start => 1, # here's the magic tasks => [ $run0 ],
tasks => [ $run0 ], links => {
links => {
self => '/query-history', self => '/query-history',
data => '/query-history/data', data => '/query-history/data',
}, },
); );
$ua->{responses}->{put} = [
{ # 1
headers => { 'Location' => '/agents/123' },
},
];
$ua->{responses}->{get} = [ $ua->{responses}->{get} = [
{ # 2
headers => { 'X-Percona-Resource-Type' => 'Agent' },
content => as_hashref($agent, with_links => 1),
},
{ {
headers => { 'X-Percona-Resource-Type' => 'Config' }, headers => { 'X-Percona-Resource-Type' => 'Config' },
content => as_hashref($config, with_links => 1), content => as_hashref($config, with_links => 1),
@@ -374,27 +459,46 @@ $ua->{responses}->{get} = [
}, },
]; ];
@ok_code = (); # callbacks
@oktorun = (1, 1, 0);
@wait = (); @wait = ();
@ok_code = (); # callbacks
@oktorun = (
1, # after get_api_client()
1, # after get_versions()
1, # init_agent() loop
1, # after init_agent()
1, # 1st main loop check
# Run once
1, # 2nd main loop check
# Don't run it again
0, # 4th main loop check
);
$output = output( $output = output(
sub { sub {
pt_agent::run_agent( pt_agent::run_agent(
agent => $agent, # Required args
client => $client, api_key => '123',
interval => $interval, interval => $interval,
config_file => $config_file,
lib_dir => $tmpdir, lib_dir => $tmpdir,
oktorun => $oktorun, # optional, for testing Cxn => $cxn,
json => $json, # optional, for testing # Optional args, for testing
bin_dir => "$trunk/bin/", # optional, for testing bin_dir => "$trunk/bin/",
client => $client,
agent => $agent,
oktorun => $oktorun,
json => $json,
versions => {
Perl => '5.10.1',
},
entry_links => {
agents => '/agents',
},
); );
}, },
stderr => 1, stderr => 1,
); );
Percona::Test::wait_for_files("$tmpdir/spool/test-run-at-start"); Percona::Test::wait_for_files("$tmpdir/spool/test-run-at-start/test-run-at-start");
like( like(
$output, $output,
@@ -410,17 +514,17 @@ is(
"... only ran it once" "... only ran it once"
); );
chomp($output = `cat $tmpdir/spool/test-run-at-start 2>/dev/null`); chomp($output = `cat $tmpdir/spool/test-run-at-start/test-run-at-start 2>/dev/null`);
ok( ok(
$output, $output,
"... service ran at start" "... service ran at start"
) or diag($output); ) or diag($output);
chomp($output = `crontab -l`); chomp($output = `crontab -l`);
like( unlike(
$output, $output,
qr/--run-service test-run-at-start/, qr/--run-service test-run-at-start/,
"... service was scheduled" "... service was not scheduled"
); );
# ############################################################################# # #############################################################################