Merge branch 'slack-15.0' into v16-gprc-protobuf-slack-15.0

.github/workflows/codeql_analysis.yml

@@ -75,6 +75,7 @@ jobs:
  wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
  sudo apt-get install -y gnupg2
  sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
+ sudo percona-release enable-only pxb-24
  sudo apt-get update
  sudo apt-get install -y percona-xtrabackup-24
 

.github/workflows/upgrade_downgrade_test_backups_e2e.yml

@@ -108,6 +108,7 @@ jobs:
  wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
  sudo apt-get install -y gnupg2
  sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
+ sudo percona-release enable-only pxb-24
  sudo apt-get update
  sudo apt-get install -y percona-xtrabackup-24
 

.github/workflows/upgrade_downgrade_test_backups_e2e_next_release.yml

@@ -111,6 +111,7 @@ jobs:
  wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
  sudo apt-get install -y gnupg2
  sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
+ sudo percona-release enable-only pxb-24
  sudo apt-get update
  sudo apt-get install -y percona-xtrabackup-24
 

.github/workflows/upgrade_downgrade_test_backups_manual.yml

@@ -128,6 +128,7 @@ jobs:
  wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
  sudo apt-get install -y gnupg2
  sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
+ sudo percona-release enable-only pxb-24
  sudo apt-get update
  sudo apt-get install -y percona-xtrabackup-24
 

.github/workflows/upgrade_downgrade_test_backups_manual_next_release.yml

@@ -131,6 +131,7 @@ jobs:
  wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
  sudo apt-get install -y gnupg2
  sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
+ sudo percona-release enable-only pxb-24
  sudo apt-get update
  sudo apt-get install -y percona-xtrabackup-24
 

.github/workflows/upgrade_downgrade_test_query_serving_queries.yml

@@ -126,6 +126,7 @@ jobs:
  wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
  sudo apt-get install -y gnupg2
  sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
+ sudo percona-release enable-only pxb-24
  sudo apt-get update
  sudo apt-get install -y percona-xtrabackup-24
 

.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml

@@ -129,6 +129,7 @@ jobs:
  wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
  sudo apt-get install -y gnupg2
  sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
+ sudo percona-release enable-only pxb-24
  sudo apt-get update
  sudo apt-get install -y percona-xtrabackup-24
 

.github/workflows/upgrade_downgrade_test_query_serving_schema.yml

@@ -126,6 +126,7 @@ jobs:
  wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
  sudo apt-get install -y gnupg2
  sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
+ sudo percona-release enable-only pxb-24
  sudo apt-get update
  sudo apt-get install -y percona-xtrabackup-24
 

.github/workflows/upgrade_downgrade_test_query_serving_schema_next_release.yml

@@ -128,6 +128,7 @@ jobs:
  wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
  sudo apt-get install -y gnupg2
  sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
+ sudo percona-release enable-only pxb-24
  sudo apt-get update
  sudo apt-get install -y percona-xtrabackup-24
 

.github/workflows/upgrade_downgrade_test_reparent_new_vtctl.yml

@@ -129,6 +129,7 @@ jobs:
  wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
  sudo apt-get install -y gnupg2
  sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
+ sudo percona-release enable-only pxb-24
  sudo apt-get update
  sudo apt-get install -y percona-xtrabackup-24
 

.github/workflows/upgrade_downgrade_test_reparent_new_vttablet.yml

@@ -129,6 +129,7 @@ jobs:
  wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
  sudo apt-get install -y gnupg2
  sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
+ sudo percona-release enable-only pxb-24
  sudo apt-get update
  sudo apt-get install -y percona-xtrabackup-24
 

.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml

@@ -126,6 +126,7 @@ jobs:
  wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
  sudo apt-get install -y gnupg2
  sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
+ sudo percona-release enable-only pxb-24
  sudo apt-get update
  sudo apt-get install -y percona-xtrabackup-24
 

.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml

@@ -126,6 +126,7 @@ jobs:
  wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
  sudo apt-get install -y gnupg2
  sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
+ sudo percona-release enable-only pxb-24
  sudo apt-get update
  sudo apt-get install -y percona-xtrabackup-24
 

go/cmd/vtbench/vtbench.go

@@ -103,10 +103,7 @@ func initFlags(fs *pflag.FlagSet) {
  fs.StringVar(&sql, "sql", sql, "SQL statement to execute")
  fs.IntVar(&threads, "threads", threads, "Number of parallel threads to run")
  fs.IntVar(&count, "count", count, "Number of queries per thread")
-
  grpccommon.RegisterFlags(fs)
- log.RegisterFlags(fs)
- logutil.RegisterFlags(fs)
  acl.RegisterFlags(fs)
  servenv.RegisterMySQLServerFlags(fs)
 }

go/vt/vttablet/tabletmanager/rpc_replication.go

@@ -31,6 +31,7 @@ import (
  "vitess.io/vitess/go/vt/mysqlctl"
  "vitess.io/vitess/go/vt/servenv"
  "vitess.io/vitess/go/vt/topo/topoproto"
+ "vitess.io/vitess/go/vt/vtctl/reparentutil"
  "vitess.io/vitess/go/vt/vterrors"
 
  replicationdatapb "vitess.io/vitess/go/vt/proto/replicationdata"
@@ -706,14 +707,31 @@ func (tm *TabletManager) setReplicationSourceRepairReplication(ctx context.Conte
  return err
  }
 
+ durabilityName, err := tm.TopoServer.GetKeyspaceDurability(ctx, tm.Tablet().Keyspace)
+ if err != nil {
+ return vterrors.Wrapf(err, "cannot read keyspace durability policy %v", tm.Tablet().Keyspace)
+ }
+ log.Infof("Getting a new durability policy for %v", durabilityName)
+ durability, err := reparentutil.GetDurabilityPolicy(durabilityName)
+ if err != nil {
+ return vterrors.Wrapf(err, "cannot get durability policy %v", durabilityName)
+ }
+
+ // If using semi-sync, we need to enable it before connecting to primary.
+ // We should set the correct type, since it is used in replica semi-sync.
+ semiSyncAction, err := tm.convertBoolToSemiSyncAction(reparentutil.IsReplicaSemiSync(durability, parent.Tablet, tm.Tablet()))
+ if err != nil {
+ return err
+ }
+
  ctx, unlock, lockErr := tm.TopoServer.LockShard(ctx, parent.Tablet.GetKeyspace(), parent.Tablet.GetShard(), fmt.Sprintf("repairReplication to %v as parent)", topoproto.TabletAliasString(parentAlias)))
  if lockErr != nil {
  return lockErr
  }
 
  defer unlock(&err)
 
- return tm.setReplicationSourceLocked(ctx, parentAlias, timeCreatedNS, waitPosition, forceStartReplication, SemiSyncActionNone)
+ return tm.setReplicationSourceLocked(ctx, parentAlias, timeCreatedNS, waitPosition, forceStartReplication, semiSyncAction)
 }
 
 func (tm *TabletManager) setReplicationSourceSemiSyncNoAction(ctx context.Context, parentAlias *topodatapb.TabletAlias, timeCreatedNS int64, waitPosition string, forceStartReplication bool) error {

test/templates/cluster_endtoend_test_mysql57.tpl

@@ -114,6 +114,7 @@ jobs:
  wget "https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb"
  sudo apt-get install -y gnupg2
  sudo dpkg -i "percona-release_latest.$(lsb_release -sc)_all.deb"
+ sudo percona-release enable-only pxb-24
  sudo apt-get update
  if [[ -n $XTRABACKUP_VERSION ]]; then
  debfile="percona-xtrabackup-24_$XTRABACKUP_VERSION.$(lsb_release -sc)_amd64.deb"

test/templates/dockerfile.tpl

@@ -15,6 +15,7 @@ RUN wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_
 RUN apt-get update
 RUN apt-get install -y gnupg2
 RUN dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
+RUN percona-release enable-only pxb-24
 RUN apt-get update
 RUN apt-get install -y percona-xtrabackup-24
 {{end}}