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

Make entry_links an arg to send_data() and run_services. Start updating/fixing tests. Add lib/Percona/Test/Mock/AgentLogger.pm.

Browse Source
This commit is contained in:
Daniel Nichter
2013-06-16 17:28:18 -07:00
parent 58736c7b0e
commit d14951ae5f
10 changed files with 490 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
bin/pt-agent
View File

@@ -6846,12 +6846,13 @@ sub run_service {
my $cxn = $args{Cxn};
# Optional args
my $bin_dir = defined $args{bin_dir} ? $args{bin_dir} : "$FindBin::Bin/";
my $agent = $args{agent}; # for testing
my $client = $args{client}; # for testing
my $json = $args{json}; # for testing
my $prefix = $args{prefix} || int(time); # for testing
my $max_data = $args{max_data} || MAX_DATA_FILE_SIZE;
my $bin_dir = defined $args{bin_dir} ? $args{bin_dir} : "$FindBin::Bin/";
my $client = $args{client}; # for testing
my $agent = $args{agent}; # for testing
my $entry_links = $args{entry_links}; # for testing
my $json = $args{json}; # for testing
my $prefix = $args{prefix} || int(time); # for testing
my $max_data = $args{max_data} || MAX_DATA_FILE_SIZE;
my $start_time = time;
@@ -6874,7 +6875,6 @@ sub run_service {
$logger->info("Running $service service");
# Connect to Percona, get entry links.
my $entry_links;
my $logger_client;
if ( !$client || !$entry_links ) {
($client, $entry_links, $logger_client) = get_api_client(
@@ -7036,6 +7036,9 @@ sub run_service {
$output_file = $1;
$append = 1;
}
elsif ( $output eq 'tmp' ) {
$output_file = $task_output_file;
}
if ( !$output_file ) {
$output_file = '/dev/null';
@@ -7427,10 +7430,11 @@ sub send_data {
# Optional args
my $interactive = $args{interactive};
my $agent = $args{agent}; # for testing
my $client = $args{client}; # for testing
my $json = $args{json}; # for testing
my $max_data = $args{max_data} || MAX_DATA_FILE_SIZE;
my $agent = $args{agent}; # for testing
my $client = $args{client}; # for testing
my $entry_links = $args{entry_links}; # for testing
my $json = $args{json}; # for testing
# Can't do anything with the lib dir. Since we haven't started
# logging yet, cron should capture this error and email the user.
@@ -7452,7 +7456,6 @@ sub send_data {
$logger->info("Sending $service data");
# Connect to Percona, get entry links.
my $entry_links;
my $logger_client;
if ( !$client || !$entry_links ) {
($client, $entry_links, $logger_client) = get_api_client(
@@ -7485,6 +7488,7 @@ sub send_data {
link => $entry_links->{agents} . '/' . $agent->uuid,
);
};
if ( $EVAL_ERROR ) {
$logger->fatal("Failed to get the agent: $EVAL_ERROR");
}
@@ -8803,7 +8807,15 @@ sub too_many_agents {
return scalar @pids > 10 ? 1 : 0;
}
sub _logger {
my $_logger = shift;
$logger = $_logger if $_logger;
return $logger;
}
sub _state {
my $_state = shift;
$state = $_state if $_state;
return $state;
}

129
lib/Percona/Test/Mock/AgentLogger.pm Normal file
View File

@@ -0,0 +1,129 @@
# This program is copyright 2013 Percona Ireland Ltd.
# Feedback and improvements are welcome.
#
# THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation, version 2; OR the Perl Artistic License. On UNIX and similar
# systems, you can issue `man perlgpl' or `man perlartistic' to read these
# licenses.
#
# You should have received a copy of the GNU General Public License along with
# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA.
# ###########################################################################
# Percona::Agent::Logger package
# ###########################################################################
package Percona::Test::Mock::AgentLogger;
use strict;
use warnings FATAL => 'all';
use English qw(-no_match_vars);
use constant PTDEBUG => $ENV{PTDEBUG} || 0;
sub new {
my ($class, %args) = @_;
my $self = {
log => $args{log},
exit_status => $args{exit_status},
pid => $args{pid},
online_logging => $args{online_logging},
service => undef,
data_ts => undef,
quiet => 0,
};
return bless $self, $class;
}
sub service {
my $self = shift;
my $_service = shift;
$self->{service} = $_service if $_service;
return $self->{service};
}
sub data_ts {
my $self = shift;
my $_data_ts = shift;
$self->{data_ts} = $_data_ts if $_data_ts;
return $self->{data_ts};
}
sub quiet {
my $self = shift;
my $_quiet = shift;
$self->{quiet} = $_quiet if $_quiet;
return $self->{quiet};
}
sub start_online_logging {
my ($self, %args) = @_;
$self->_log('-', 'Called start_online_logging()');
return;
}
sub level_number {
my $name = shift;
die "No log level name given" unless $name;
my $number = $name eq 'DEBUG' ? 1
: $name eq 'INFO' ? 2
: $name eq 'WARNING' ? 3
: $name eq 'ERROR' ? 4
: $name eq 'FATAL' ? 5
: die "Invalid log level name: $name";
}
sub level_name {
my $number = shift;
die "No log level name given" unless $number;
my $name = $number == 1 ? 'DEBUG'
: $number == 2 ? 'INFO'
: $number == 3 ? 'WARNING'
: $number == 4 ? 'ERROR'
: $number == 5 ? 'FATAL'
: die "Invalid log level number: $number";
}
sub debug {
my $self = shift;
return $self->_log('DEBUG', @_);
}
sub info {
my $self = shift;
return $self->_log('INFO', @_);
}
sub warning {
my $self = shift;
return $self->_log('WARNING', @_);
}
sub error {
my $self = shift;
return $self->_log('ERROR', @_);
}
sub fatal {
my $self = shift;
$self->_log('FATAL', @_);
return 255;
}
sub _log {
my ($self, $level, $msg) = @_;
push @{$self->{log}}, "$level $msg";
return;
}
1;
# ###########################################################################
# End Percona::Test::Mock::AgentLogger package
# ###########################################################################

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

@@ -15,6 +15,7 @@ use File::Temp qw(tempdir);
use Percona::Test;
use Percona::Test::Mock::UserAgent;
use Percona::Test::Mock::AgentLogger;
require "$trunk/bin/pt-agent";
Percona::Toolkit->import(qw(Dumper));
@@ -26,6 +27,10 @@ my $json = JSON->new->canonical([1])->pretty;
$json->allow_blessed([]);
$json->convert_blessed([]);
my @log;
my $logger = Percona::Test::Mock::AgentLogger->new(log => \@log);
pt_agent::_logger($logger);
my $ua = Percona::Test::Mock::UserAgent->new(
encode => sub { my $c = shift; return $json->encode($c || {}) },
);
@@ -98,7 +103,7 @@ $ua->{responses}->{get} = [
my $got_agent;
my $output = output(
sub {
$got_agent = pt_agent::init_agent(
($got_agent) = pt_agent::init_agent(
agent => $post_agent,
action => 'post',
link => "/agents",
@@ -191,11 +196,14 @@ is_deeply(
"POST POST GET new Agent after error"
) or diag(Dumper($ua->{requests}));
like(
$output,
qr{WARNING Failed to POST /agents},
"POST /agents failure logged after error"
);
TODO: {
local $TODO = "False-positive";
like(
$output,
qr{WARNING Failed to POST /agents},
"POST /agents failure logged after error"
) or diag(Dumper($ua->{requests}));
}
# #############################################################################
# Init an existing agent, i.e. update it.

5
t/pt-agent/replace_special_vars.t
View File

@@ -14,10 +14,15 @@ use JSON;
use File::Temp qw(tempfile);
use Percona::Test;
use Percona::Test::Mock::AgentLogger;
require "$trunk/bin/pt-agent";
Percona::Toolkit->import(qw(have_required_args Dumper));
my @log;
my $logger = Percona::Test::Mock::AgentLogger->new(log => \@log);
pt_agent::_logger($logger);
my @output_files = ();
my $store = {};

173
t/pt-agent/run_service.t
View File

@@ -18,6 +18,7 @@ $ENV{PTTEST_PRETTY_JSON} = 1;
use Percona::Test;
use Sandbox;
use Percona::Test::Mock::UserAgent;
use Percona::Test::Mock::AgentLogger;
require "$trunk/bin/pt-agent";
my $dp = new DSNParser(opts=>$dsn_opts);
@@ -31,6 +32,10 @@ $o->get_opts();
Percona::Toolkit->import(qw(Dumper have_required_args));
Percona::WebAPI::Representation->import(qw(as_hashref));
my @log;
my $logger = Percona::Test::Mock::AgentLogger->new(log => \@log);
pt_agent::_logger($logger);
my $sample = "t/pt-agent/samples";
# Create fake spool and lib dirs. Service-related subs in pt-agent
@@ -42,10 +47,6 @@ output(
);
my $spool_dir = "$tmpdir/spool";
my $json = JSON->new->canonical([1])->pretty;
$json->allow_blessed([]);
$json->convert_blessed([]);
sub write_svc_files {
my (%args) = @_;
have_required_args(\%args, qw(
@@ -65,6 +66,59 @@ sub write_svc_files {
);
}
# #############################################################################
# Create mock client and Agent
# #############################################################################
my $json = JSON->new->canonical([1])->pretty;
$json->allow_blessed([]);
$json->convert_blessed([]);
my $ua = Percona::Test::Mock::UserAgent->new(
encode => sub { my $c = shift; return $json->encode($c || {}) },
);
# Create cilent, get entry links
my $links = {
agents => '/agents',
config => '/agents/1/config',
services => '/agents/1/services',
'query-history' => '/query-history',
};
$ua->{responses}->{get} = [
{
content => $links,
},
];
my $client = eval {
Percona::WebAPI::Client->new(
api_key => '123',
ua => $ua,
);
};
is(
$EVAL_ERROR,
'',
'Create mock client'
) or die;
my $agent = Percona::WebAPI::Resource::Agent->new(
uuid => '123',
hostname => 'prod1',
links => $links,
);
is_deeply(
as_hashref($agent),
{
uuid => '123',
hostname => 'prod1',
},
'Create mock Agent'
) or die;
# #############################################################################
# Simple single task service using a program.
# #############################################################################
@@ -72,7 +126,7 @@ sub write_svc_files {
my $run0 = Percona::WebAPI::Resource::Task->new(
name => 'query-history',
number => '0',
program => "$trunk/bin/pt-query-digest --output json $trunk/t/lib/samples/slowlogs/slow008.txt",
program => "__BIN_DIR__/pt-query-digest --output json $trunk/t/lib/samples/slowlogs/slow008.txt",
output => 'spool',
);
@@ -88,16 +142,29 @@ write_svc_files(
services => [ $svc0 ],
);
$ua->{responses}->{get} = [
{
headers => { 'X-Percona-Resource-Type' => 'Agent' },
content => as_hashref($agent, with_links => 1),
},
];
my $exit_status;
my $output = output(
sub {
$exit_status = pt_agent::run_service(
service => 'query-history',
lib_dir => $tmpdir,
spool_dir => $spool_dir,
Cxn => '',
prefix => '1', # optional, for testing
json => $json, # optional, for testing
api_key => '123',
service => 'query-history',
lib_dir => $tmpdir,
spool_dir => $spool_dir,
Cxn => '',
# for testing:
client => $client,
agent => $agent,
entry_links => $links,
prefix => '1',
json => $json,
bin_dir => "$trunk/bin",
);
},
);
@@ -106,9 +173,14 @@ ok(
no_diff(
"cat $tmpdir/spool/query-history/1.query-history.data",
"$sample/query-history/data001.json",
post_pipe => 'grep -v \'"name" :\'',
),
"1 run: spool data (query-history/data001.json)"
) or diag(`ls -l $tmpdir/spool/query-history/`, `cat $tmpdir/logs/query-history.run`);
) or diag(
`ls -l $tmpdir/spool/query-history/`,
`cat $tmpdir/logs/query-history.run`,
Dumper(\@log)
);
chomp(my $n_files = `ls -1 $spool_dir/query-history/*.data | wc -l | awk '{print \$1}'`);
is(
@@ -133,6 +205,7 @@ ok(
# #############################################################################
diag(`rm -rf $tmpdir/spool/* $tmpdir/services/*`);
@log = ();
# The result is the same as the previous single-run test, but instead of
# having pqd read the slowlog directly, we have the first run cat the
@@ -149,7 +222,7 @@ $run0 = Percona::WebAPI::Resource::Task->new(
my $run1 = Percona::WebAPI::Resource::Task->new(
name => 'query-history',
number => '1',
program => "$trunk/bin/pt-query-digest --output json __RUN_0_OUTPUT__",
program => "__BIN_DIR__/pt-query-digest --output json __RUN_0_OUTPUT__",
output => 'spool',
);
@@ -165,15 +238,28 @@ write_svc_files(
services => [ $svc0 ],
);
$ua->{responses}->{get} = [
{
headers => { 'X-Percona-Resource-Type' => 'Agent' },
content => as_hashref($agent, with_links => 1),
},
];
$output = output(
sub {
$exit_status = pt_agent::run_service(
api_key => '123',
service => 'query-history',
spool_dir => $spool_dir,
lib_dir => $tmpdir,
Cxn => '',
json => $json, # optional, for testing
prefix => '2', # optional, for testing
# for testing:
client => $client,
agent => $agent,
entry_links => $links,
prefix => '2',
json => $json,
bin_dir => "$trunk/bin",
);
},
);
@@ -182,8 +268,13 @@ ok(
no_diff(
"cat $tmpdir/spool/query-history/2.query-history.data",
"$sample/query-history/data001.json",
post_pipe => 'grep -v \'"name" :\'',
),
"2 runs: spool data (query-history/data001.json)"
) or diag(
`ls -l $tmpdir/spool/query-history/`,
`cat $tmpdir/logs/query-history.run`,
Dumper(\@log)
);
chomp($n_files = `ls -1 $spool_dir/query-history/*.data | wc -l | awk '{print \$1}'`);
@@ -215,6 +306,7 @@ SKIP: {
skip 'No HOME environment variable', 5 unless $ENV{HOME};
diag(`rm -rf $tmpdir/spool/* $tmpdir/services/*`);
@log = ();
my (undef, $old_genlog) = $dbh->selectrow_array("SHOW VARIABLES LIKE 'general_log_file'");
@@ -287,6 +379,21 @@ SKIP: {
services => [ $svc0, $svc1, $svc2 ],
);
$ua->{responses}->{get} = [
{
headers => { 'X-Percona-Resource-Type' => 'Agent' },
content => as_hashref($agent, with_links => 1),
},
{
headers => { 'X-Percona-Resource-Type' => 'Agent' },
content => as_hashref($agent, with_links => 1),
},
{
headers => { 'X-Percona-Resource-Type' => 'Agent' },
content => as_hashref($agent, with_links => 1),
},
];
my $cxn = Cxn->new(
dsn_string => $dsn,
OptionParser => $o,
@@ -297,17 +404,24 @@ SKIP: {
$output = output(
sub {
$exit_status = pt_agent::run_service(
api_key => '123',
service => 'enable-gen-log',
spool_dir => $spool_dir,
lib_dir => $tmpdir,
Cxn => $cxn,
json => $json, # optional, for testing
prefix => '3', # optional, for testing
# for testing:
client => $client,
agent => $agent,
entry_links => $links,
prefix => '3',
json => $json,
bin_dir => "$trunk/bin",
);
},
);
my (undef, $genlog) = $dbh->selectrow_array("SHOW VARIABLES LIKE 'general_log_file'");
my (undef, $genlog) = $dbh->selectrow_array(
"SHOW VARIABLES LIKE 'general_log_file'");
is(
$genlog,
$new_genlog,
@@ -325,12 +439,18 @@ SKIP: {
$output = output(
sub {
$exit_status = pt_agent::run_service(
api_key => '123',
service => 'query-history',
spool_dir => $spool_dir,
lib_dir => $tmpdir,
Cxn => $cxn,
json => $json, # optional, for testing
prefix => '4', # optional, for testing
# for testing:
client => $client,
agent => $agent,
entry_links => $links,
prefix => '4',
json => $json,
bin_dir => "$trunk/bin",
);
},
);
@@ -349,17 +469,24 @@ SKIP: {
$output = output(
sub {
$exit_status = pt_agent::run_service(
api_key => '123',
service => 'disable-gen-log',
spool_dir => $spool_dir,
lib_dir => $tmpdir,
Cxn => $cxn,
json => $json, # optional, for testing
prefix => '5', # optional, for testing
# for testing:
client => $client,
agent => $agent,
entry_links => $links,
prefix => '5',
json => $json,
bin_dir => "$trunk/bin",
);
},
);
(undef, $genlog) = $dbh->selectrow_array("SHOW VARIABLES LIKE 'general_log_file'");
(undef, $genlog) = $dbh->selectrow_array(
"SHOW VARIABLES LIKE 'general_log_file'");
is(
$genlog,
$old_genlog,

176
t/pt-agent/samples/query-history/data001.json
View File

@@ -1,73 +1,139 @@
[
{
"attributes" : {
{
"classes" : [
{
"attribute" : "fingerprint",
"checksum" : "C72BF45D68E35A6E",
"distillate" : "SELECT tbl",
"example" : {
"query" : "SELECT MIN(id),MAX(id) FROM tbl",
"ts" : null
},
"fingerprint" : "select min(id),max(id) from tbl",
"metrics" : {
"Lock_time" : {
"avg" : "0.009453",
"max" : "0.009453",
"median" : "0.009453",
"min" : "0.009453",
"pct" : "0.333333",
"pct_95" : "0.009453",
"stddev" : "0.000000",
"sum" : "0.009453"
},
"Query_length" : {
"avg" : "31",
"max" : "31",
"median" : "31",
"min" : "31",
"pct" : "0",
"pct_95" : "31",
"stddev" : "0",
"sum" : "31"
},
"Query_time" : {
"avg" : "0.018799",
"max" : "0.018799",
"median" : "0.018799",
"min" : "0.018799",
"pct" : "0.333333",
"pct_95" : "0.018799",
"stddev" : "0.000000",
"sum" : "0.018799"
},
"Rows_examined" : {
"avg" : "0",
"max" : "0",
"median" : "0",
"min" : "0",
"pct" : "0",
"pct_95" : "0",
"stddev" : "0",
"sum" : "0"
},
"Rows_sent" : {
"avg" : "0",
"max" : "0",
"median" : "0",
"min" : "0",
"pct" : "0",
"pct_95" : "0",
"stddev" : "0",
"sum" : "0"
},
"db" : {
"value" : "db2"
},
"host" : {
"value" : ""
},
"user" : {
"value" : "meow"
}
},
"query_count" : 1,
"tables" : [
{
"create" : "SHOW CREATE TABLE `db2`.`tbl`\\G",
"status" : "SHOW TABLE STATUS FROM `db2` LIKE 'tbl'\\G"
}
]
}
],
"global" : {
"files" : [
{
"size" : 656
}
],
"metrics" : {
"Lock_time" : {
"avg" : "0.009453",
"cnt" : "1.000000",
"avg" : "0.003151",
"max" : "0.009453",
"median" : "0.009453",
"min" : "0.009453",
"pct" : "0.33",
"pct_95" : "0.009453",
"stddev" : 0,
"median" : "0.000000",
"min" : "0.000000",
"pct_95" : "0.009171",
"stddev" : "0.004323",
"sum" : "0.009453"
},
"Query_length" : {
"avg" : "24",
"max" : "31",
"median" : "26",
"min" : "14",
"pct_95" : "30",
"stddev" : "6",
"sum" : "72"
},
"Query_time" : {
"avg" : "0.018799",
"cnt" : "1.000000",
"avg" : "0.006567",
"max" : "0.018799",
"median" : "0.018799",
"min" : "0.018799",
"pct" : "0.33",
"pct_95" : "0.018799",
"stddev" : 0,
"sum" : "0.018799"
"median" : "0.000882",
"min" : "0.000002",
"pct_95" : "0.018157",
"stddev" : "0.008359",
"sum" : "0.019700"
},
"Rows_examined" : {
"avg" : 0,
"cnt" : "1.000000",
"avg" : "0",
"max" : "0",
"median" : 0,
"median" : "0",
"min" : "0",
"pct" : "0.33",
"pct_95" : 0,
"stddev" : 0,
"sum" : 0
"pct_95" : "0",
"stddev" : "0",
"sum" : "0"
},
"Rows_sent" : {
"avg" : 0,
"cnt" : "1.000000",
"avg" : "0",
"max" : "0",
"median" : 0,
"median" : "0",
"min" : "0",
"pct" : "0.33",
"pct_95" : 0,
"stddev" : 0,
"sum" : 0
},
"bytes" : {
"value" : 31
},
"db" : {
"value" : "db2"
},
"host" : {
"value" : ""
},
"pos_in_log" : {
"value" : 435
},
"user" : {
"value" : "meow"
"pct_95" : "0",
"stddev" : "0",
"sum" : "0"
}
},
"class" : {
"checksum" : "C72BF45D68E35A6E",
"cnt" : 1,
"fingerprint" : "select min(id),max(id) from tbl",
"sample" : "SELECT MIN(id),MAX(id) FROM tbl"
}
"query_count" : 3,
"unique_query_count" : 3
}
]
}

3
t/pt-agent/samples/write_services001
View File

@@ -14,5 +14,6 @@
"output" : "spool",
"program" : "pt-query-digest"
}
]
],
"ts" : 100
}

5
t/pt-agent/schedule_services.t
View File

@@ -14,6 +14,7 @@ use JSON;
use File::Temp qw(tempfile tempdir);
use Percona::Test;
use Percona::Test::Mock::AgentLogger;
require "$trunk/bin/pt-agent";
my $crontab = `crontab -l 2>/dev/null`;
@@ -26,6 +27,10 @@ Percona::Toolkit->import(qw(have_required_args Dumper));
my $sample = "t/pt-agent/samples";
my $tmpdir = tempdir("/tmp/pt-agent.$PID.XXXXXX", CLEANUP => 1);
my @log;
my $logger = Percona::Test::Mock::AgentLogger->new(log => \@log);
pt_agent::_logger($logger);
# #############################################################################
# Schedule a good crontab.
# #############################################################################

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

@@ -15,11 +15,16 @@ use File::Temp qw(tempdir);
use Percona::Test;
use Percona::Test::Mock::UserAgent;
use Percona::Test::Mock::AgentLogger;
require "$trunk/bin/pt-agent";
Percona::Toolkit->import(qw(Dumper have_required_args));
Percona::WebAPI::Representation->import(qw(as_hashref));
my @log;
my $logger = Percona::Test::Mock::AgentLogger->new(log => \@log);
pt_agent::_logger($logger);
my $sample = "t/pt-agent/samples";
# #############################################################################
@@ -66,6 +71,7 @@ is(
my $agent = Percona::WebAPI::Resource::Agent->new(
uuid => '123',
hostname => 'prod1',
links => $links,
);
is_deeply(
@@ -95,6 +101,13 @@ pt_agent::init_spool_dir(
`cp $trunk/$sample/query-history/data001.json $tmpdir/query-history/1.data001.data`;
`cp $trunk/$sample/service001 $tmpdir/services/query-history`;
$ua->{responses}->{get} = [
{
headers => { 'X-Percona-Resource-Type' => 'Agent' },
content => as_hashref($agent, with_links => 1),
},
];
$ua->{responses}->{post} = [
{
content => $links,
@@ -109,9 +122,11 @@ my $output = output(
lib_dir => $tmpdir,
spool_dir => $tmpdir,
# optional, for testing:
client => $client,
agent => $agent,
json => $json,
client => $client,
entry_links => $links,
agent => $agent,
log_file => "$tmpdir/log",
json => $json,
),
},
);
@@ -120,11 +135,16 @@ is(
scalar @{$client->ua->{content}->{post}},
1,
"Only sent 1 resource"
) or diag($output, Dumper($client->ua->{content}->{post}));
) or diag(
$output,
Dumper($client->ua->{content}->{post}),
`cat $tmpdir/logs/query-history.send`
);
is_deeply(
$ua->{requests},
[
'GET /agents/123',
'POST /query-history/data',
],
"POST to Service.links.data"

22
t/pt-agent/write_services.t
View File

@@ -15,6 +15,7 @@ use File::Temp qw(tempdir);
use Percona::Test;
use Percona::Test::Mock::UserAgent;
use Percona::Test::Mock::AgentLogger;
require "$trunk/bin/pt-agent";
Percona::Toolkit->import(qw(Dumper have_required_args));
@@ -26,6 +27,10 @@ my $tmpdir = tempdir("/tmp/pt-agent.$PID.XXXXXX", CLEANUP => 1);
mkdir "$tmpdir/services" or die "Error mkdir $tmpdir/services: $OS_ERROR";
my @log;
my $logger = Percona::Test::Mock::AgentLogger->new(log => \@log);
pt_agent::_logger($logger);
sub test_write_services {
my (%args) = @_;
have_required_args(\%args, qw(
@@ -41,15 +46,15 @@ sub test_write_services {
my $output = output(
sub {
pt_agent::write_services(
services => $services,
lib_dir => $tmpdir,
json => $json,
sorted_services => $services,
lib_dir => $tmpdir,
json => $json,
);
},
stderr => 1,
);
foreach my $service ( @$services ) {
foreach my $service ( @{$services->{added}} ) {
my $name = $service->name;
ok(
no_diff(
@@ -85,8 +90,15 @@ my $svc0 = Percona::WebAPI::Resource::Service->new(
# Key thing here is that the links are written because
# --send-data <service> requires them.
my $sorted_services = {
added => [ $svc0 ],
updated => [],
removed => [],
};
test_write_services(
services => [ $svc0 ],
services => $sorted_services,
file => "write_services001",
);