Break code to check CI failure

Make CI fail on go compilation errors
Merge pull request #894 from percona/dependabot/go_modules/golang.org/x/crypto-0.31.0
2025-09-07 21:09:14 +00:00 · 2024-12-18 01:04:02 +02:00 · 2024-12-18 01:01:20 +02:00 · 2024-12-16 15:24:19 +03:00 · 2024-12-16 12:23:53 +00:00 · 2024-12-16 15:23:06 +03:00
22 changed files with 59 additions and 755 deletions
--- a/.github/workflows/toolkit.yml
+++ b/.github/workflows/toolkit.yml
@@ -15,14 +15,17 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v4
+    - name: Checkout
+      uses: actions/checkout@v4

    - name: Set up Go
      uses: actions/setup-go@v5
      with:
        go-version: '1.22'
+
    - name: Build
-      run: cd src/go; make linux-amd64; cd ../../
+      working-directory: src/go
+      run: make linux-amd64

    - name: Build the Docker image
      run: echo "FROM oraclelinux:9-slim" > Dockerfile; echo "RUN microdnf -y update" >> Dockerfile; echo "COPY bin/* /usr/bin/" >> Dockerfile; docker build . --file Dockerfile --tag percona-toolkit:${{ github.sha }}
--- a/bin/pt-visual-explain
+++ b/bin/pt-visual-explain
@@ -18,11 +18,6 @@ BEGIN {
      OptionParser
      DSNParser
      Daemon
-      Lmo::Utils
-      Lmo::Meta
-      Lmo::Object
-      Lmo::Types
-      Lmo
      VersionParser
   ));
 }
@@ -2532,655 +2527,6 @@ sub _d {
 # End Daemon package
 # ###########################################################################

-# ###########################################################################
-# Lmo::Utils package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Lmo/Utils.pm
-#   t/lib/Lmo/Utils.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package Lmo::Utils;
-
-use strict;
-use warnings qw( FATAL all );
-require Exporter;
-our (@ISA, @EXPORT, @EXPORT_OK);
-
-BEGIN {
-   @ISA = qw(Exporter);
-   @EXPORT = @EXPORT_OK = qw(
-      _install_coderef
-      _unimport_coderefs
-      _glob_for
-      _stash_for
-   );
-}
-
-{
-   no strict 'refs';
-   sub _glob_for {
-      return \*{shift()}
-   }
-
-   sub _stash_for {
-      return \%{ shift() . "::" };
-   }
-}
-
-sub _install_coderef {
-   my ($to, $code) = @_;
-
-   return *{ _glob_for $to } = $code;
-}
-
-sub _unimport_coderefs {
-   my ($target, @names) = @_;
-   return unless @names;
-   my $stash = _stash_for($target);
-   foreach my $name (@names) {
-      if ($stash->{$name} and defined(&{$stash->{$name}})) {
-         delete $stash->{$name};
-      }
-   }
-}
-
-1;
-}
-# ###########################################################################
-# End Lmo::Utils package
-# ###########################################################################
-
-# ###########################################################################
-# Lmo::Meta package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Lmo/Meta.pm
-#   t/lib/Lmo/Meta.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package Lmo::Meta;
-use strict;
-use warnings qw( FATAL all );
-
-my %metadata_for;
-
-sub new {
-   my $class = shift;
-   return bless { @_ }, $class
-}
-
-sub metadata_for {
-   my $self    = shift;
-   my ($class) = @_;
-
-   return $metadata_for{$class} ||= {};
-}
-
-sub class { shift->{class} }
-
-sub attributes {
-   my $self = shift;
-   return keys %{$self->metadata_for($self->class)}
-}
-
-sub attributes_for_new {
-   my $self = shift;
-   my @attributes;
-
-   my $class_metadata = $self->metadata_for($self->class);
-   while ( my ($attr, $meta) = each %$class_metadata ) {
-      if ( exists $meta->{init_arg} ) {
-         push @attributes, $meta->{init_arg}
-               if defined $meta->{init_arg};
-      }
-      else {
-         push @attributes, $attr;
-      }
-   }
-   return @attributes;
-}
-
-1;
-}
-# ###########################################################################
-# End Lmo::Meta package
-# ###########################################################################
-
-# ###########################################################################
-# Lmo::Object package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Lmo/Object.pm
-#   t/lib/Lmo/Object.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package Lmo::Object;
-
-use strict;
-use warnings qw( FATAL all );
-
-use Carp ();
-use Scalar::Util qw(blessed);
-
-use Lmo::Meta;
-use Lmo::Utils qw(_glob_for);
-
-sub new {
-   my $class = shift;
-   my $args  = $class->BUILDARGS(@_);
-
-   my $class_metadata = Lmo::Meta->metadata_for($class);
-
-   my @args_to_delete;
-   while ( my ($attr, $meta) = each %$class_metadata ) {
-      next unless exists $meta->{init_arg};
-      my $init_arg = $meta->{init_arg};
-
-      if ( defined $init_arg ) {
-         $args->{$attr} = delete $args->{$init_arg};
-      }
-      else {
-         push @args_to_delete, $attr;
-      }
-   }
-
-   delete $args->{$_} for @args_to_delete;
-
-   for my $attribute ( keys %$args ) {
-      if ( my $coerce = $class_metadata->{$attribute}{coerce} ) {
-         $args->{$attribute} = $coerce->($args->{$attribute});
-      }
-      if ( my $isa_check = $class_metadata->{$attribute}{isa} ) {
-         my ($check_name, $check_sub) = @$isa_check;
-         $check_sub->($args->{$attribute});
-      }
-   }
-
-   while ( my ($attribute, $meta) = each %$class_metadata ) {
-      next unless $meta->{required};
-      Carp::confess("Attribute ($attribute) is required for $class")
-         if ! exists $args->{$attribute}
-   }
-
-   my $self = bless $args, $class;
-
-   my @build_subs;
-   my $linearized_isa = mro::get_linear_isa($class);
-
-   for my $isa_class ( @$linearized_isa ) {
-      unshift @build_subs, *{ _glob_for "${isa_class}::BUILD" }{CODE};
-   }
-   my @args = %$args;
-   for my $sub (grep { defined($_) && exists &$_ } @build_subs) {
-      $sub->( $self, @args);
-   }
-   return $self;
-}
-
-sub BUILDARGS {
-   shift; # No need for the classname
-   if ( @_ == 1 && ref($_[0]) ) {
-      Carp::confess("Single parameters to new() must be a HASH ref, not $_[0]")
-         unless ref($_[0]) eq ref({});
-      return {%{$_[0]}} # We want a new reference, always
-   }
-   else {
-      return { @_ };
-   }
-}
-
-sub meta {
-   my $class = shift;
-   $class    = Scalar::Util::blessed($class) || $class;
-   return Lmo::Meta->new(class => $class);
-}
-
-1;
-}
-# ###########################################################################
-# End Lmo::Object package
-# ###########################################################################
-
-# ###########################################################################
-# Lmo::Types package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Lmo/Types.pm
-#   t/lib/Lmo/Types.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package Lmo::Types;
-
-use strict;
-use warnings qw( FATAL all );
-
-use Carp ();
-use Scalar::Util qw(looks_like_number blessed);
-
-
-our %TYPES = (
-   Bool   => sub { !$_[0] || (defined $_[0] && looks_like_number($_[0]) && $_[0] == 1) },
-   Num    => sub { defined $_[0] && looks_like_number($_[0]) },
-   Int    => sub { defined $_[0] && looks_like_number($_[0]) && $_[0] == int($_[0]) },
-   Str    => sub { defined $_[0] },
-   Object => sub { defined $_[0] && blessed($_[0]) },
-   FileHandle => sub { local $@; require IO::Handle; fileno($_[0]) && $_[0]->opened },
-
-   map {
-      my $type = /R/ ? $_ : uc $_;
-      $_ . "Ref" => sub { ref $_[0] eq $type }
-   } qw(Array Code Hash Regexp Glob Scalar)
-);
-
-sub check_type_constraints {
-   my ($attribute, $type_check, $check_name, $val) = @_;
-   ( ref($type_check) eq 'CODE'
-      ? $type_check->($val)
-      : (ref $val eq $type_check
-         || ($val && $val eq $type_check)
-         || (exists $TYPES{$type_check} && $TYPES{$type_check}->($val)))
-   )
-   || Carp::confess(
-        qq<Attribute ($attribute) does not pass the type constraint because: >
-      . qq<Validation failed for '$check_name' with value >
-      . (defined $val ? Lmo::Dumper($val) : 'undef') )
-}
-
-sub _nested_constraints {
-   my ($attribute, $aggregate_type, $type) = @_;
-
-   my $inner_types;
-   if ( $type =~ /\A(ArrayRef|Maybe)\[(.*)\]\z/ ) {
-      $inner_types = _nested_constraints($1, $2);
-   }
-   else {
-      $inner_types = $TYPES{$type};
-   }
-
-   if ( $aggregate_type eq 'ArrayRef' ) {
-      return sub {
-         my ($val) = @_;
-         return unless ref($val) eq ref([]);
-
-         if ($inner_types) {
-            for my $value ( @{$val} ) {
-               return unless $inner_types->($value)
-            }
-         }
-         else {
-            for my $value ( @{$val} ) {
-               return unless $value && ($value eq $type
-                        || (Scalar::Util::blessed($value) && $value->isa($type)));
-            }
-         }
-         return 1;
-      };
-   }
-   elsif ( $aggregate_type eq 'Maybe' ) {
-      return sub {
-         my ($value) = @_;
-         return 1 if ! defined($value);
-         if ($inner_types) {
-            return unless $inner_types->($value)
-         }
-         else {
-            return unless $value eq $type
-                        || (Scalar::Util::blessed($value) && $value->isa($type));
-         }
-         return 1;
-      }
-   }
-   else {
-      Carp::confess("Nested aggregate types are only implemented for ArrayRefs and Maybe");
-   }
-}
-
-1;
-}
-# ###########################################################################
-# End Lmo::Types package
-# ###########################################################################
-
-# ###########################################################################
-# Lmo package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Lmo.pm
-#   t/lib/Lmo.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-BEGIN {
-$INC{"Lmo.pm"} = __FILE__;
-package Lmo;
-our $VERSION = '0.30_Percona'; # Forked from 0.30 of Mo.
-
-
-use strict;
-use warnings qw( FATAL all );
-
-use Carp ();
-use Scalar::Util qw(looks_like_number blessed);
-
-use Lmo::Meta;
-use Lmo::Object;
-use Lmo::Types;
-
-use Lmo::Utils;
-
-my %export_for;
-sub import {
-   warnings->import(qw(FATAL all));
-   strict->import();
-
-   my $caller     = scalar caller(); # Caller's package
-   my %exports = (
-      extends  => \&extends,
-      has      => \&has,
-      with     => \&with,
-      override => \&override,
-      confess  => \&Carp::confess,
-   );
-
-   $export_for{$caller} = \%exports;
-
-   for my $keyword ( keys %exports ) {
-      _install_coderef "${caller}::$keyword" => $exports{$keyword};
-   }
-
-   if ( !@{ *{ _glob_for "${caller}::ISA" }{ARRAY} || [] } ) {
-      @_ = "Lmo::Object";
-      goto *{ _glob_for "${caller}::extends" }{CODE};
-   }
-}
-
-sub extends {
-   my $caller = scalar caller();
-   for my $class ( @_ ) {
-      _load_module($class);
-   }
-   _set_package_isa($caller, @_);
-   _set_inherited_metadata($caller);
-}
-
-sub _load_module {
-   my ($class) = @_;
-
-   (my $file = $class) =~ s{::|'}{/}g;
-   $file .= '.pm';
-   { local $@; eval { require "$file" } } # or warn $@;
-   return;
-}
-
-sub with {
-   my $package = scalar caller();
-   require Role::Tiny;
-   for my $role ( @_ ) {
-      _load_module($role);
-      _role_attribute_metadata($package, $role);
-   }
-   Role::Tiny->apply_roles_to_package($package, @_);
-}
-
-sub _role_attribute_metadata {
-   my ($package, $role) = @_;
-
-   my $package_meta = Lmo::Meta->metadata_for($package);
-   my $role_meta    = Lmo::Meta->metadata_for($role);
-
-   %$package_meta = (%$role_meta, %$package_meta);
-}
-
-sub has {
-   my $names  = shift;
-   my $caller = scalar caller();
-
-   my $class_metadata = Lmo::Meta->metadata_for($caller);
-
-   for my $attribute ( ref $names ? @$names : $names ) {
-      my %args   = @_;
-      my $method = ($args{is} || '') eq 'ro'
-         ? sub {
-            Carp::confess("Cannot assign a value to a read-only accessor at reader ${caller}::${attribute}")
-               if $#_;
-            return $_[0]{$attribute};
-         }
-         : sub {
-            return $#_
-                  ? $_[0]{$attribute} = $_[1]
-                  : $_[0]{$attribute};
-         };
-
-      $class_metadata->{$attribute} = ();
-
-      if ( my $type_check = $args{isa} ) {
-         my $check_name = $type_check;
-
-         if ( my ($aggregate_type, $inner_type) = $type_check =~ /\A(ArrayRef|Maybe)\[(.*)\]\z/ ) {
-            $type_check = Lmo::Types::_nested_constraints($attribute, $aggregate_type, $inner_type);
-         }
-
-         my $check_sub = sub {
-            my ($new_val) = @_;
-            Lmo::Types::check_type_constraints($attribute, $type_check, $check_name, $new_val);
-         };
-
-         $class_metadata->{$attribute}{isa} = [$check_name, $check_sub];
-         my $orig_method = $method;
-         $method = sub {
-            $check_sub->($_[1]) if $#_;
-            goto &$orig_method;
-         };
-      }
-
-      if ( my $builder = $args{builder} ) {
-         my $original_method = $method;
-         $method = sub {
-               $#_
-                  ? goto &$original_method
-                  : ! exists $_[0]{$attribute}
-                     ? $_[0]{$attribute} = $_[0]->$builder
-                     : goto &$original_method
-         };
-      }
-
-      if ( my $code = $args{default} ) {
-         Carp::confess("${caller}::${attribute}'s default is $code, but should be a coderef")
-               unless ref($code) eq 'CODE';
-         my $original_method = $method;
-         $method = sub {
-               $#_
-                  ? goto &$original_method
-                  : ! exists $_[0]{$attribute}
-                     ? $_[0]{$attribute} = $_[0]->$code
-                     : goto &$original_method
-         };
-      }
-
-      if ( my $role = $args{does} ) {
-         my $original_method = $method;
-         $method = sub {
-            if ( $#_ ) {
-               Carp::confess(qq<Attribute ($attribute) doesn't consume a '$role' role">)
-                  unless Scalar::Util::blessed($_[1]) && eval { $_[1]->does($role) }
-            }
-            goto &$original_method
-         };
-      }
-
-      if ( my $coercion = $args{coerce} ) {
-         $class_metadata->{$attribute}{coerce} = $coercion;
-         my $original_method = $method;
-         $method = sub {
-            if ( $#_ ) {
-               return $original_method->($_[0], $coercion->($_[1]))
-            }
-            goto &$original_method;
-         }
-      }
-
-      _install_coderef "${caller}::$attribute" => $method;
-
-      if ( $args{required} ) {
-         $class_metadata->{$attribute}{required} = 1;
-      }
-
-      if ($args{clearer}) {
-         _install_coderef "${caller}::$args{clearer}"
-            => sub { delete shift->{$attribute} }
-      }
-
-      if ($args{predicate}) {
-         _install_coderef "${caller}::$args{predicate}"
-            => sub { exists shift->{$attribute} }
-      }
-
-      if ($args{handles}) {
-         _has_handles($caller, $attribute, \%args);
-      }
-
-      if (exists $args{init_arg}) {
-         $class_metadata->{$attribute}{init_arg} = $args{init_arg};
-      }
-   }
-}
-
-sub _has_handles {
-   my ($caller, $attribute, $args) = @_;
-   my $handles = $args->{handles};
-
-   my $ref = ref $handles;
-   my $kv;
-   if ( $ref eq ref [] ) {
-         $kv = { map { $_,$_ } @{$handles} };
-   }
-   elsif ( $ref eq ref {} ) {
-         $kv = $handles;
-   }
-   elsif ( $ref eq ref qr// ) {
-         Carp::confess("Cannot delegate methods based on a Regexp without a type constraint (isa)")
-            unless $args->{isa};
-         my $target_class = $args->{isa};
-         $kv = {
-            map   { $_, $_     }
-            grep  { $_ =~ $handles }
-            grep  { !exists $Lmo::Object::{$_} && $target_class->can($_) }
-            grep  { !$export_for{$target_class}->{$_} }
-            keys %{ _stash_for $target_class }
-         };
-   }
-   else {
-         Carp::confess("handles for $ref not yet implemented");
-   }
-
-   while ( my ($method, $target) = each %{$kv} ) {
-         my $name = _glob_for "${caller}::$method";
-         Carp::confess("You cannot overwrite a locally defined method ($method) with a delegation")
-            if defined &$name;
-
-         my ($target, @curried_args) = ref($target) ? @$target : $target;
-         *$name = sub {
-            my $self        = shift;
-            my $delegate_to = $self->$attribute();
-            my $error = "Cannot delegate $method to $target because the value of $attribute";
-            Carp::confess("$error is not defined") unless $delegate_to;
-            Carp::confess("$error is not an object (got '$delegate_to')")
-               unless Scalar::Util::blessed($delegate_to) || (!ref($delegate_to) && $delegate_to->can($target));
-            return $delegate_to->$target(@curried_args, @_);
-         }
-   }
-}
-
-sub _set_package_isa {
-   my ($package, @new_isa) = @_;
-   my $package_isa  = \*{ _glob_for "${package}::ISA" };
-   @{*$package_isa} = @new_isa;
-}
-
-sub _set_inherited_metadata {
-   my $class = shift;
-   my $class_metadata = Lmo::Meta->metadata_for($class);
-   my $linearized_isa = mro::get_linear_isa($class);
-   my %new_metadata;
-
-   for my $isa_class (reverse @$linearized_isa) {
-      my $isa_metadata = Lmo::Meta->metadata_for($isa_class);
-      %new_metadata = (
-         %new_metadata,
-         %$isa_metadata,
-      );
-   }
-   %$class_metadata = %new_metadata;
-}
-
-sub unimport {
-   my $caller = scalar caller();
-   my $target = caller;
-  _unimport_coderefs($target, keys %{$export_for{$caller}});
-}
-
-sub Dumper {
-   require Data::Dumper;
-   local $Data::Dumper::Indent    = 0;
-   local $Data::Dumper::Sortkeys  = 0;
-   local $Data::Dumper::Quotekeys = 0;
-   local $Data::Dumper::Terse     = 1;
-
-   Data::Dumper::Dumper(@_)
-}
-
-BEGIN {
-   if ($] >= 5.010) {
-      { local $@; require mro; }
-   }
-   else {
-      local $@;
-      eval {
-         require MRO::Compat;
-      } or do {
-         *mro::get_linear_isa = *mro::get_linear_isa_dfs = sub {
-            no strict 'refs';
-
-            my $classname = shift;
-
-            my @lin = ($classname);
-            my %stored;
-            foreach my $parent (@{"$classname\::ISA"}) {
-               my $plin = mro::get_linear_isa_dfs($parent);
-               foreach (@$plin) {
-                     next if exists $stored{$_};
-                     push(@lin, $_);
-                     $stored{$_} = 1;
-               }
-            }
-            return \@lin;
-         };
-      }
-   }
-}
-
-sub override {
-   my ($methods, $code) = @_;
-   my $caller          = scalar caller;
-
-   for my $method ( ref($methods) ? @$methods : $methods ) {
-      my $full_method     = "${caller}::${method}";
-      *{_glob_for $full_method} = $code;
-   }
-}
-
-}
-1;
-}
-# ###########################################################################
-# End Lmo package
-# ###########################################################################
-
 # ###########################################################################
 # VersionParser package
 # This package is a copy without comments from the original.  The original
--- a/go.mod
+++ b/go.mod
@@ -1,13 +1,14 @@
 module github.com/percona/percona-toolkit

 go 1.22.4
+toolchain go1.23.4

 require (
 	github.com/AlekSi/pointer v1.2.0
 	github.com/Ladicle/tabwriter v1.0.0
 	github.com/Masterminds/semver v1.5.0
 	github.com/alecthomas/kingpin v2.2.6+incompatible
-	github.com/alecthomas/kong v1.5.0
+	github.com/alecthomas/kong v1.6.0
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 	github.com/go-ini/ini v1.67.0
 	github.com/golang/mock v1.6.0
@@ -27,12 +28,12 @@ require (
 	github.com/stretchr/testify v1.10.0
 	github.com/xlab/treeprint v1.2.0
 	go.mongodb.org/mongo-driver v1.17.1
-	golang.org/x/crypto v0.29.0
+	golang.org/x/crypto v0.31.0
 	golang.org/x/exp v0.0.0-20230321023759-10a507213a29
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.31.3
-	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
+	k8s.io/api v0.32.0
+	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
 )

 require (
@@ -46,6 +47,7 @@ require (
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.16.3 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -59,15 +61,16 @@ require (
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/net v0.26.0 // indirect
-	golang.org/x/sync v0.9.0 // indirect
-	golang.org/x/sys v0.27.0 // indirect
-	golang.org/x/term v0.26.0 // indirect
-	golang.org/x/text v0.20.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/term v0.27.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apimachinery v0.31.3 // indirect
+	k8s.io/apimachinery v0.32.0 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -8,8 +8,8 @@ github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8v
 github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
 github.com/alecthomas/kingpin v2.2.6+incompatible h1:5svnBTFgJjZvGKyYBtMB0+m5wvrbUHiqye8wRJMlnYI=
 github.com/alecthomas/kingpin v2.2.6+incompatible/go.mod h1:59OFYbFVLKQKq+mqrL6Rw5bR0c3ACQaawgXx0QYndlE=
-github.com/alecthomas/kong v1.5.0 h1:pvJ7ucmgyBrGcdHVYD3xc9rqbcnVNRQ63mYv6KNrwYs=
-github.com/alecthomas/kong v1.5.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU=
+github.com/alecthomas/kong v1.6.0 h1:mwOzbdMR7uv2vul9J0FU3GYxE7ls/iX1ieMg5WIM6gE=
+github.com/alecthomas/kong v1.6.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU=
 github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
 github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
@@ -17,6 +17,7 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -130,8 +131,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
-golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
 golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -145,15 +146,15 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
-golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
-golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -169,18 +170,18 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
-golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU=
-golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E=
+golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -199,23 +200,22 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw=
 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8=
-k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE=
-k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4=
-k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
+k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE=
+k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0=
+k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg=
+k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
-k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
-sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
+k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
+k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
+sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
--- a/lib/Sandbox.pm
+++ b/lib/Sandbox.pm
@@ -465,7 +465,6 @@ sub is_cluster_node {
 sub can_load_data {
    my ($self, $server) = @_;
    my $output = $self->use($server, q{-e "SELECT * FROM percona_test.load_data"});
-    #die(0 =~ /1/);
    return ($output || '') =~ /1/;
 }

--- a/sandbox/servers/8.0/my.sandbox.cnf
+++ b/sandbox/servers/8.0/my.sandbox.cnf
@@ -40,6 +40,3 @@ binlog_format              = STATEMENT
 #performance-schema-instrument='wait/lock/metadata/sql/mdl=ON'
 #performance-schema-instrument='transaction=ON'
 secure-file-priv           =
-
-# wait_for_replica buggy on multi-threaded replica
-slave-parallel-workers=0
--- a/sandbox/servers/8.4/my.sandbox.cnf
+++ b/sandbox/servers/8.4/my.sandbox.cnf
@@ -40,6 +40,3 @@ binlog_format              = STATEMENT
 #performance-schema-instrument='wait/lock/metadata/sql/mdl=ON'
 #performance-schema-instrument='transaction=ON'
 secure-file-priv           =
-
-# wait_for_replica buggy on multi-threaded replica
-replica-parallel-workers=0
--- a/src/go/pt-secure-collect/encrypt.go
+++ b/src/go/pt-secure-collect/encrypt.go
@@ -22,7 +22,7 @@ func encryptorCmd(opts *cliOptions) (err error) {
 			*opts.DecryptOutFile = strings.TrimSuffix(filepath.Base(*opts.DecryptInFile), ".aes")
 		}
 		log.Infof("Decrypting file %q into %q", *opts.DecryptInFile, *opts.DecryptOutFile)
-		err = decrypt(*opts.DecryptInFile, *opts.DecryptOutFile, password)
+		err = decrypt(*opts.DecryptInFile, *opts.DecryptOutFile, password
 	case "encrypt":
 		if *opts.EncryptOutFile == "" {
 			*opts.EncryptOutFile = filepath.Base(*opts.EncryptInFile) + ".aes"
--- a/t/pt-archiver/replica_lag.t
+++ b/t/pt-archiver/replica_lag.t
@@ -251,7 +251,6 @@ like(
 # Done.
 # #############################################################################
 $replica1_dbh->do("STOP ${replica_name}");
-$replica1_dbh->do("CHANGE ${source_change} TO ${source_name}_DELAY=0");
 $source_dbh->do("RESET ${source_reset}");
 $replica1_dbh->do("RESET ${replica_name}");
 $replica1_dbh->do("START ${replica_name}");
--- a/t/pt-online-schema-change/pt-1717-resume.t
+++ b/t/pt-online-schema-change/pt-1717-resume.t
@@ -398,7 +398,6 @@ $replica_dbh2 = $sb->get_dbh_for('replica2');
 diag("Setting replica delay to 0 seconds");
 $replica_dbh1->do("STOP ${replica_name}");
 $replica_dbh2->do("STOP ${replica_name}");
-$replica_dbh1->do("CHANGE ${source_change} TO ${source_name}_DELAY=0");
 $source_dbh->do("RESET ${source_reset}");
 $replica_dbh1->do("RESET ${source_reset}");
 $replica_dbh1->do("RESET ${replica_name}");
--- a/t/pt-online-schema-change/pt-2168-cancel.t
+++ b/t/pt-online-schema-change/pt-2168-cancel.t
@@ -162,7 +162,6 @@ $replica_dbh2 = $sb->get_dbh_for('replica2');
 diag("Setting replica delay to 0 seconds");
 $replica_dbh1->do("STOP ${replica_name}");
 $replica_dbh2->do("STOP ${replica_name}");
-$replica_dbh1->do("CHANGE ${source_change} TO ${source_name}_DELAY=0");
 $source_dbh->do("RESET ${source_reset}");
 $replica_dbh1->do("RESET ${replica_name}");
 $replica_dbh2->do("RESET ${replica_name}");
--- a/t/pt-online-schema-change/pt-2168.t
+++ b/t/pt-online-schema-change/pt-2168.t
@@ -328,7 +328,6 @@ $replica_dbh2 = $sb->get_dbh_for('replica2');
 diag("Setting replica delay to 0 seconds");
 $replica_dbh1->do("STOP ${replica_name}");
 $replica_dbh2->do("STOP ${replica_name}");
-$replica_dbh1->do("CHANGE ${source_change} TO ${source_name}_DELAY=0");
 $source_dbh->do("RESET ${source_reset}");
 $replica_dbh1->do("RESET ${replica_name}");
 $replica_dbh2->do("RESET ${replica_name}");
--- a/t/pt-online-schema-change/pt-2241.t
+++ b/t/pt-online-schema-change/pt-2241.t
@@ -98,8 +98,6 @@ unlike(
 diag("Setting replica delay to 0 seconds");
 $replica1_dbh->do("STOP ${replica_name}");
 $replica2_dbh->do("STOP ${replica_name}");
-$replica1_dbh->do("CHANGE ${source_change} TO ${source_name}_DELAY=0");
-$replica2_dbh->do("CHANGE ${source_change} TO ${source_name}_DELAY=0");
 $source_dbh->do("RESET ${source_reset}");
 $replica1_dbh->do("RESET ${replica_name}");
 $replica1_dbh->do("START ${replica_name}");
--- a/t/pt-online-schema-change/slave_lag.t
+++ b/t/pt-online-schema-change/slave_lag.t
@@ -354,7 +354,6 @@ $sb->do_as_root("source", q/FLUSH TABLES/);

 diag("Setting replica delay to 0 seconds");
 $replica_dbh->do("STOP ${replica_name}");
-$replica_dbh->do("CHANGE ${source_change} TO ${source_name}_DELAY=0");
 $source_dbh->do("RESET ${source_reset}");
 $replica_dbh->do("RESET ${replica_name}");
 $replica_dbh->do("START ${replica_name}");
--- a/t/pt-table-checksum/chunk_size.t
+++ b/t/pt-table-checksum/chunk_size.t
@@ -104,7 +104,7 @@ unlike(
   $output,
   qr/Cannot checksum table/,
   "Very small --chunk-time doesn't cause zero --chunk-size"
-) or diag($output);
+);
 }
 # #############################################################################
 # Bug 921700: pt-table-checksum doesn't add --where to chunk-oversize test
--- a/t/pt-table-checksum/pt-1616.t
+++ b/t/pt-table-checksum/pt-1616.t
@@ -12,7 +12,7 @@ use English qw(-no_match_vars);
 use Test::More;

 #if ( !$ENV{SLOW_TESTS} ) { 
-#   plan skip_all => "pt-table-checksum/pt-1616.t is one of the top slowest files; set SLOW_TESTS=1 to enable it.";
+#   plan skip_all => "pt-table-checksum/replication_filters.t is one of the top slowest files; set SLOW_TESTS=1 to enable it.";
 #}

 use PerconaTest;
@@ -23,8 +23,6 @@ require "$trunk/bin/pt-table-checksum";
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 my $dbh = $sb->get_dbh_for('source');
-my $replica1_dbh = $sb->get_dbh_for('replica1');
-my $replica2_dbh = $sb->get_dbh_for('replica2');

 if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox source';
@@ -106,18 +104,6 @@ unlike(
 # #############################################################################
 # Done.
 # #############################################################################
-diag("Resetting replicas, because this test sporadically fails");
-$replica1_dbh->do("STOP ${replica_name}");
-$replica2_dbh->do("STOP ${replica_name}");
-$dbh->do("RESET ${source_reset}");
-$replica1_dbh->do("RESET ${replica_name}");
-$replica1_dbh->do("START ${replica_name}");
-$replica2_dbh->do("RESET ${replica_name}");
-$replica2_dbh->do("START ${replica_name}");
-
-diag("Replicas reset, syncing");
-$sb->wait_for_replicas();
-diag("Cleaning up");
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-checksum/resume.t
+++ b/t/pt-table-checksum/resume.t
@@ -127,7 +127,7 @@ is_deeply(
      [qw( sakila city          )],
   ],
   "Checksum results for 1/4 of sakila singles"
-) or diag(Dumper($row));
+);

 $output = output(
   sub { pt_table_checksum::main(@args, qw(-d sakila --resume --chunk-size 10000)) },
--- a/t/pt-table-sync/char_chunking.t
+++ b/t/pt-table-sync/char_chunking.t
@@ -49,7 +49,7 @@ like(
   $output,
   qr/#\s+0\s+4\s+0\s+0\s+Chunk\s+/,
   "Chunks char col"
-) or diag($output);
+);
 like(
   $output,
   qr/FORCE INDEX \(`c`\)/,
--- a/t/pt-table-sync/issue_627.t
+++ b/t/pt-table-sync/issue_627.t
@@ -61,7 +61,7 @@ is(
 REPLACE INTO `issue_375`.`t`(`id`, `updated_at`, `foo`) VALUES ('100', '2009-09-06 15:01:23', 'cv');
 ",
   'Simple --replicate'
-) or diag($output);
+);

 # Note how the columns are out of order (tbl order is: id, updated_at, foo).
 # This is issue http://code.google.com/p/maatkit/issues/detail?id=371
--- a/t/pt-table-sync/pt-1194.t
+++ b/t/pt-table-sync/pt-1194.t
@@ -10,7 +10,6 @@ use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
 use Test::More;
-use POSIX ":sys_wait_h";

 use PerconaTest;
 use Sandbox;
@@ -39,36 +38,26 @@ else {
   plan tests => 3;
 }

-diag("OK\n");
-
 $sb->load_file('source', "t/pt-table-sync/samples/pt-1205.sql");
-diag("OK 2\n");
 $sb->wait_for_replicas();

-diag("OK 3\n");
-
 # Setting up tunnels
 my $pid1 = fork();

 if ( !$pid1 ) {
   setpgrp;
-   system('ncat -k -l localhost 33333 --sh-exec "ncat 127.0.0.1 12345"');
-diag("OK 4\n");
+   system('ncat -k -l localhost 3333 --sh-exec "ncat 127.0.0.1 12345"');
   exit;
 }

-diag("OK 5\n");
-
 my $pid2 = fork();

 if ( !$pid2 ) {
   setpgrp;
-   system('ncat -k -l localhost 33334 --sh-exec "ncat 127.0.0.1 12346"');
-diag("OK 6\n");
+   system('ncat -k -l localhost 3334 --sh-exec "ncat 127.0.0.1 12346"');
   exit;
 }

-diag("OK 7\n");
 my $o = new OptionParser();
 my $q = new Quoter();
 my $ms = new MasterSlave(
@@ -78,35 +67,28 @@ my $ms = new MasterSlave(
            );
 my $ss = $ms->get_replica_status($replica1_dbh);

-diag("OK 8\n");
 $replica1_dbh->do("STOP ${replica_name}");
-$replica1_dbh->do("CHANGE ${source_change} TO ${source_name}_PORT=33333, ${source_name}_LOG_POS=" . $ss->{"exec_${source_name}_log_pos"});
+$replica1_dbh->do("CHANGE ${source_change} TO ${source_name}_PORT=3333, ${source_name}_LOG_POS=" . $ss->{"exec_${source_name}_log_pos"});
 $replica1_dbh->do("START ${replica_name}");

-diag("OK 9\n");
-my $output = `$trunk/bin/pt-table-sync h=127.0.0.1,P=33334,u=msandbox,p=msandbox --database=test --table=t1 --sync-to-source --execute --verbose 2>&1`;
+my $output = `$trunk/bin/pt-table-sync h=127.0.0.1,P=3334,u=msandbox,p=msandbox --database=test --table=t1 --sync-to-source --execute --verbose 2>&1`;

-diag("OK 10\n");
 unlike(
   $output,
   qr/The replica is connected to \d+ but the source's port is/,
   'No error for redirected replica'
 ) or diag($output);

-diag("OK 11\n");
 kill -1, getpgrp($pid1);
 kill -1, getpgrp($pid2);

-diag("OK 12\n");
 $replica1_dbh->do("STOP ${replica_name}");
 $ss = $ms->get_replica_status($replica1_dbh);
 $replica1_dbh->do("CHANGE ${source_change} TO ${source_name}_PORT=12347, ${source_name}_LOG_POS=" . $ss->{"exec_${source_name}_log_pos"});
 $replica1_dbh->do("START ${replica_name} SQL_THREAD");

-diag("OK 13\n");
 $output = `$trunk/bin/pt-table-sync h=127.0.0.1,P=12346,u=msandbox,p=msandbox --database=test --table=t1 --sync-to-source --execute --verbose 2>&1`;

-diag("OK 14\n");
 like(
   $output,
   qr/The server specified as a source has no connected replicas/,
@@ -116,12 +98,9 @@ like(
 $replica1_dbh->do("STOP ${replica_name}");
 $replica1_dbh->do("CHANGE ${source_change} TO ${source_name}_PORT=12345, ${source_name}_LOG_POS=" . $ss->{"exec_${source_name}_log_pos"});
 $replica1_dbh->do("START ${replica_name}");
-diag("OK 15\n");
 # #############################################################################
 # Done.
 # #############################################################################
 $sb->wipe_clean($source_dbh);
-diag("OK 16\n");
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-diag("OK 17\n");
 exit;
--- a/t/pt-table-sync/safety_checks.t
+++ b/t/pt-table-sync/safety_checks.t
@@ -146,8 +146,9 @@ like(

 $replica1_dbh->do("STOP ${replica_name}");
 $replica1_dbh->do("CHANGE ${source_change} TO ${source_name}_port=12345, ${source_name}_user='msandbox'");
-$source_dbh->do("RESET ${source_reset}");
-$replica1_dbh->do("RESET ${replica_name}");
+$replica1_dbh->do("START ${replica_name}");
+$replica1_dbh->do("STOP ${replica_name}");
+$replica1_dbh->do("CHANGE ${source_change} TO ${source_name}_port=12345, ${source_name}_user='msandbox'");
 $replica1_dbh->do("START ${replica_name}");

 # #############################################################################
--- a/t/pt-upgrade/run_time.t
+++ b/t/pt-upgrade/run_time.t
@@ -60,7 +60,7 @@ my $t = time - $t0;

 ok(
   $t >= 3 && $t <= ($ENV{PERCONA_SLOW_BOX} ? 8 : 6),
-   "Exec queries: ran for roughly 3 seconds"
+   "Exec queries: ran for roughly --run-time seconds"
 ) or diag($output, 'Actual run time:', $t);

 # Exit status 8 = --run-time expired (an no other errors/problems)
Author	SHA1	Message	Date
Artem Gavrilov	a88b99e9c8	Break code to check CI failure	2024-12-18 01:04:02 +02:00
Artem Gavrilov	dd84dbb59e	Make CI fail on go compilation errors	2024-12-18 01:01:20 +02:00
Sveta Smirnova	754c40628d	Merge pull request #894 from percona/dependabot/go_modules/golang.org/x/crypto-0.31.0 build(deps): bump golang.org/x/crypto from 0.29.0 to 0.31.0	2024-12-16 15:24:19 +03:00
dependabot[bot]	6b367b4a7a	build(deps): bump golang.org/x/crypto from 0.29.0 to 0.31.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.29.0 to 0.31.0. - [Commits](https://github.com/golang/crypto/compare/v0.29.0...v0.31.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-16 12:23:53 +00:00
Sveta Smirnova	1a0265bc1b	Merge pull request #893 from percona/dependabot/go_modules/golang.org/x/crypto-0.30.0 build(deps): bump golang.org/x/crypto from 0.29.0 to 0.30.0	2024-12-16 15:23:06 +03:00
Sveta Smirnova	dea8e1e573	Merge branch '3.x' into dependabot/go_modules/golang.org/x/crypto-0.30.0	2024-12-16 15:22:52 +03:00
Sveta Smirnova	cac0e6b083	Merge pull request #892 from percona/dependabot/go_modules/github.com/alecthomas/kong-1.6.0 build(deps): bump github.com/alecthomas/kong from 1.5.0 to 1.6.0	2024-12-16 15:21:53 +03:00
Sveta Smirnova	5f31e57a84	Merge pull request #895 from percona/dependabot/go_modules/k8s.io/api-0.32.0 build(deps): bump k8s.io/api from 0.31.3 to 0.32.0	2024-12-16 15:21:40 +03:00
dependabot[bot]	8212b87188	build(deps): bump k8s.io/api from 0.31.3 to 0.32.0 Bumps [k8s.io/api](https://github.com/kubernetes/api) from 0.31.3 to 0.32.0. - [Commits](https://github.com/kubernetes/api/compare/v0.31.3...v0.32.0) --- updated-dependencies: - dependency-name: k8s.io/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-16 09:17:29 +00:00
dependabot[bot]	71bf9d6e19	build(deps): bump golang.org/x/crypto from 0.29.0 to 0.30.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.29.0 to 0.30.0. - [Commits](https://github.com/golang/crypto/compare/v0.29.0...v0.30.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-09 09:47:04 +00:00
dependabot[bot]	569a3e0540	build(deps): bump github.com/alecthomas/kong from 1.5.0 to 1.6.0 Bumps [github.com/alecthomas/kong](https://github.com/alecthomas/kong) from 1.5.0 to 1.6.0. - [Commits](https://github.com/alecthomas/kong/compare/v1.5.0...v1.6.0) --- updated-dependencies: - dependency-name: github.com/alecthomas/kong dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-09 09:47:00 +00:00