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

Fix get_perl_module_version(). Add 'hours until next check' to debug output.

Browse Source
This commit is contained in:
Daniel Nichter
2013-02-14 08:28:18 -07:00
parent 6c79f4a5c1
commit 4545926556
21 changed files with 177 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bin/pt-archiver
View File

@@ -4815,7 +4815,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -5044,7 +5047,6 @@ sub get_versions {
}
sub get_os_version {
if ( $OSNAME eq 'MSWin32' ) {
require Win32;
@@ -5135,16 +5137,10 @@ sub get_perl_module_version {
my $item = $args{item};
return unless $item;
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {

20
bin/pt-config-diff
View File

@@ -4489,7 +4489,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -4718,7 +4721,6 @@ sub get_versions {
}
sub get_os_version {
if ( $OSNAME eq 'MSWin32' ) {
require Win32;
@@ -4809,16 +4811,10 @@ sub get_perl_module_version {
my $item = $args{item};
return unless $item;
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {

20
bin/pt-deadlock-logger
View File

@@ -3405,7 +3405,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -3634,7 +3637,6 @@ sub get_versions {
}
sub get_os_version {
if ( $OSNAME eq 'MSWin32' ) {
require Win32;
@@ -3725,16 +3727,10 @@ sub get_perl_module_version {
my $item = $args{item};
return unless $item;
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {

20
bin/pt-diskstats
View File

@@ -4300,7 +4300,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -4529,7 +4532,6 @@ sub get_versions {
}
sub get_os_version {
if ( $OSNAME eq 'MSWin32' ) {
require Win32;
@@ -4620,16 +4622,10 @@ sub get_perl_module_version {
my $item = $args{item};
return unless $item;
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {

20
bin/pt-duplicate-key-checker
View File

@@ -4161,7 +4161,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -4390,7 +4393,6 @@ sub get_versions {
}
sub get_os_version {
if ( $OSNAME eq 'MSWin32' ) {
require Win32;
@@ -4481,16 +4483,10 @@ sub get_perl_module_version {
my $item = $args{item};
return unless $item;
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {

20
bin/pt-find
View File

@@ -2973,7 +2973,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -3202,7 +3205,6 @@ sub get_versions {
}
sub get_os_version {
if ( $OSNAME eq 'MSWin32' ) {
require Win32;
@@ -3293,16 +3295,10 @@ sub get_perl_module_version {
my $item = $args{item};
return unless $item;
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {

20
bin/pt-fk-error-logger
View File

@@ -2915,7 +2915,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -3144,7 +3147,6 @@ sub get_versions {
}
sub get_os_version {
if ( $OSNAME eq 'MSWin32' ) {
require Win32;
@@ -3235,16 +3237,10 @@ sub get_perl_module_version {
my $item = $args{item};
return unless $item;
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {

20
bin/pt-heartbeat
View File

@@ -4141,7 +4141,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -4370,7 +4373,6 @@ sub get_versions {
}
sub get_os_version {
if ( $OSNAME eq 'MSWin32' ) {
require Win32;
@@ -4461,16 +4463,10 @@ sub get_perl_module_version {
my $item = $args{item};
return unless $item;
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {

20
bin/pt-index-usage
View File

@@ -5616,7 +5616,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -5845,7 +5848,6 @@ sub get_versions {
}
sub get_os_version {
if ( $OSNAME eq 'MSWin32' ) {
require Win32;
@@ -5936,16 +5938,10 @@ sub get_perl_module_version {
my $item = $args{item};
return unless $item;
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {

20
bin/pt-kill
View File

@@ -5838,7 +5838,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -6067,7 +6070,6 @@ sub get_versions {
}
sub get_os_version {
if ( $OSNAME eq 'MSWin32' ) {
require Win32;
@@ -6158,16 +6160,10 @@ sub get_perl_module_version {
my $item = $args{item};
return unless $item;
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {

20
bin/pt-online-schema-change
View File

@@ -7288,7 +7288,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -7517,7 +7520,6 @@ sub get_versions {
}
sub get_os_version {
if ( $OSNAME eq 'MSWin32' ) {
require Win32;
@@ -7608,16 +7610,10 @@ sub get_perl_module_version {
my $item = $args{item};
return unless $item;
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {

20
bin/pt-query-advisor
View File

@@ -7571,7 +7571,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -7800,7 +7803,6 @@ sub get_versions {
}
sub get_os_version {
if ( $OSNAME eq 'MSWin32' ) {
require Win32;
@@ -7891,16 +7893,10 @@ sub get_perl_module_version {
my $item = $args{item};
return unless $item;
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {

20
bin/pt-query-digest
View File

@@ -13200,7 +13200,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -13429,7 +13432,6 @@ sub get_versions {
}
sub get_os_version {
if ( $OSNAME eq 'MSWin32' ) {
require Win32;
@@ -13520,16 +13522,10 @@ sub get_perl_module_version {
my $item = $args{item};
return unless $item;
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {

20
bin/pt-slave-delay
View File

@@ -3516,7 +3516,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -3745,7 +3748,6 @@ sub get_versions {
}
sub get_os_version {
if ( $OSNAME eq 'MSWin32' ) {
require Win32;
@@ -3836,16 +3838,10 @@ sub get_perl_module_version {
my $item = $args{item};
return unless $item;
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {

20
bin/pt-slave-restart
View File

@@ -4140,7 +4140,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -4369,7 +4372,6 @@ sub get_versions {
}
sub get_os_version {
if ( $OSNAME eq 'MSWin32' ) {
require Win32;
@@ -4460,16 +4462,10 @@ sub get_perl_module_version {
my $item = $args{item};
return unless $item;
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {

20
bin/pt-table-checksum
View File

@@ -854,7 +854,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -1083,7 +1086,6 @@ sub get_versions {
}
sub get_os_version {
if ( $OSNAME eq 'MSWin32' ) {
require Win32;
@@ -1174,16 +1176,10 @@ sub get_perl_module_version {
my $item = $args{item};
return unless $item;
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {

20
bin/pt-table-sync
View File

@@ -8978,7 +8978,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -9207,7 +9210,6 @@ sub get_versions {
}
sub get_os_version {
if ( $OSNAME eq 'MSWin32' ) {
require Win32;
@@ -9298,16 +9300,10 @@ sub get_perl_module_version {
my $item = $args{item};
return unless $item;
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {

20
bin/pt-upgrade
View File

@@ -11797,7 +11797,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -12026,7 +12029,6 @@ sub get_versions {
}
sub get_os_version {
if ( $OSNAME eq 'MSWin32' ) {
require Win32;
@@ -12117,16 +12119,10 @@ sub get_perl_module_version {
my $item = $args{item};
return unless $item;
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {

20
bin/pt-variable-advisor
View File

@@ -4423,7 +4423,10 @@ sub get_instances_to_check {
foreach my $instance ( @$instances ) {
my $last_check_time = $last_check_time_for{ $instance->{id} };
PTDEBUG && _d('Intsance', $instance->{id}, 'last checked',
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0));
$last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
'hours until next check',
sprintf '%.2f',
($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
if ( !defined $last_check_time
|| ($now - $last_check_time) >= $check_time_limit ) {
PTDEBUG && _d('Time to check', Dumper($instance));
@@ -4652,7 +4655,6 @@ sub get_versions {
}
sub get_os_version {
if ( $OSNAME eq 'MSWin32' ) {
require Win32;
@@ -4743,16 +4745,10 @@ sub get_perl_module_version {
my $item = $args{item};
return unless $item;
my $var = $item->{item} . '::VERSION';
my $version = get_scalar($var);
PTDEBUG && _d('Perl version for', $var, '=', "$version");
return $version ? "$version" : $version;
}
sub get_scalar {
no strict;
return ${*{shift()}};
my $var = '$' . $item->{item} . '::VERSION';
my $version = eval "use $item->{item}; $var;";
PTDEBUG && _d('Perl version for', $var, '=', $version);
return $version;
}
sub get_mysql_variable {