percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-10 21:19:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

HEAD /agents doesn't work because app has /agents link. Use GET /ping instead.

Browse Source
This commit is contained in:
Daniel Nichter
2013-09-18 20:37:09 -07:00
parent d6a46cfd33
commit 488b5de0b7
2 changed files with 22 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
bin/pt-agent
View File

@@ -965,23 +965,6 @@ sub get {
return $resource_objects;
}
sub head {
my ($self, %args) = @_;
have_required_args(\%args, qw(
link
)) or die;
my ($link) = $args{link};
eval {
$self->_request(
method => 'HEAD',
link => $link,
);
};
return $EVAL_ERROR;
}
sub post {
my $self = shift;
$self->_set(
@@ -5798,13 +5781,9 @@ sub init_agent {
if ( $EVAL_ERROR ) {
my $code = $client->response->code;
if ( $code && $code == 404 ) {
my $agents_link = $client->entry_link . '/agents';
$agents_link =~ s!/{2,}!/!g; # //agents doesn't work
my $api_ok = eval {
$client->head(
link => $agents_link,
);
};
my $api_ok = ping_api(
client => $client,
);
if ( $api_ok ) {
$logger->fatal("API reports agent not found: the agent has been "
. "deleted, or its UUID (" . ($agent->uuid || '?') . ") "
@@ -6267,13 +6246,9 @@ sub get_config {
if (blessed($e)) {
if ($e->isa('Percona::WebAPI::Exception::Request')) {
if ( $e->status == 404 ) {
my $agents_link = $client->entry_link . '/agents';
$agents_link =~ s!/{2,}!/!g; # //agents doesn't work
my $api_ok = eval {
$client->head(
link => $agents_link,
);
};
my $api_ok = ping_api(
client => $client,
);
if ( $api_ok ) {
stop_all_services(
lib_dir => $lib_dir,
@@ -9117,6 +9092,22 @@ sub too_many_agents {
return scalar @pids > 10 ? 1 : 0;
}
sub ping_api {
my (%args) = @_;
have_required_args(\%args, qw(
client
)) or die;
my $client = $args{client};
my $ping_link = $client->entry_link . '/ping';
$ping_link =~ s!/{2,}!/!g; # //agents doesn't work
eval {
$client->get(
link => $ping_link,
);
};
return $EVAL_ERROR ? 0 : 1;
}
sub _logger {
my $_logger = shift;
$logger = $_logger if $_logger;

17
lib/Percona/WebAPI/Client.pm
View File

@@ -159,23 +159,6 @@ sub get {
return $resource_objects;
}
sub head {
my ($self, %args) = @_;
have_required_args(\%args, qw(
link
)) or die;
my ($link) = $args{link};
eval {
$self->_request(
method => 'HEAD',
link => $link,
);
};
return $EVAL_ERROR;
}
# For a successful POST, the server sets the Location header with
# the URI of the newly created resource.
sub post {