Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Vitess Dependency to Latest #534

Merged
merged 2 commits into from
Feb 27, 2024
Merged

Upgrade Vitess Dependency to Latest #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18d34b0
upgrade vitess dependency to latest
frouioui Feb 25, 2024
e75084c
update call to PlannedReparentShard
frouioui Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require (
sigs.k8s.io/controller-runtime v0.16.3
sigs.k8s.io/controller-tools v0.11.3
sigs.k8s.io/kustomize v2.0.3+incompatible
vitess.io/vitess v0.10.3-0.20240216180501-54c6dfc05c5c
vitess.io/vitess v0.10.3-0.20240223204815-d8f771c695b5
)

require (
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,5 +817,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ih
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
vitess.io/vitess v0.10.3-0.20240216180501-54c6dfc05c5c h1:4yYHzHcEUIfUlikSaLt+sBZBDyc92qWGgPK2HE32TP4=
vitess.io/vitess v0.10.3-0.20240216180501-54c6dfc05c5c/go.mod h1:IsIXgK8exqVYJoIoAIKG9aW688K8skqzN4wde9zXnZ4=
vitess.io/vitess v0.10.3-0.20240223204815-d8f771c695b5 h1:lAUn/qeJKiLGWhVzFuJsnh0ZzIuSdHxkw63rd/yWa0U=
vitess.io/vitess v0.10.3-0.20240223204815-d8f771c695b5/go.mod h1:IsIXgK8exqVYJoIoAIKG9aW688K8skqzN4wde9zXnZ4=
8 changes: 7 additions & 1 deletion pkg/controller/vitessshardreplication/reconcile_drain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
topodatapb "vitess.io/vitess/go/vt/proto/topodata"
"vitess.io/vitess/go/vt/topo"
"vitess.io/vitess/go/vt/topo/topoproto"
"vitess.io/vitess/go/vt/vtctl/reparentutil"
"vitess.io/vitess/go/vt/wrangler"

corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -312,7 +313,12 @@ func (r *ReconcileVitessShard) reconcileDrain(ctx context.Context, vts *planetsc
if vts.Spec.UsingExternalDatastore() {
reparentErr = r.handleExternalReparent(ctx, vts, wr, newPrimary.Alias, shard.PrimaryAlias)
} else {
reparentErr = wr.PlannedReparentShard(reparentCtx, keyspaceName, vts.Spec.Name, newPrimary.Alias, nil, plannedReparentTimeout, tolerableReplicationLag)
reparentErr = wr.PlannedReparentShard(reparentCtx, keyspaceName, vts.Spec.Name, reparentutil.PlannedReparentOptions{
NewPrimaryAlias: newPrimary.Alias,
AvoidPrimaryAlias: nil,
WaitReplicasTimeout: plannedReparentTimeout,
TolerableReplLag: tolerableReplicationLag,
})
}

if reparentErr != nil {
Expand Down
Loading