Skip to content

Commit

Permalink
Change zk client
Browse files Browse the repository at this point in the history
  • Loading branch information
@aadi-shopify
aadi-shopify committed Oct 28, 2024
1 parent ff8fdc5 commit 4904a0c
Show file tree
Hide file tree
Showing 22 changed files with 25 additions and 23 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ require (
github.com/uber/jaeger-client-go v2.30.0+incompatible
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82
github.com/z-division/go-zookeeper v1.0.0
go.etcd.io/etcd/api/v3 v3.5.12
go.etcd.io/etcd/client/pkg/v3 v3.5.12
go.etcd.io/etcd/client/v3 v3.5.12
Expand Down Expand Up @@ -96,6 +95,7 @@ require (
github.com/Shopify/toxiproxy/v2 v2.5.0
github.com/bndr/gotabulate v1.1.2
github.com/gammazero/deque v0.2.1
github.com/go-zookeeper/zk v1.0.4
github.com/google/safehtml v0.1.0
github.com/hashicorp/go-version v1.6.0
github.com/kr/pretty v0.3.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrt
github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
github.com/go-zookeeper/zk v1.0.4 h1:DPzxraQx7OrPyXq2phlGlNSIyWEsAox0RJmjTseMV6I=
github.com/go-zookeeper/zk v1.0.4/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
Expand Down Expand Up @@ -515,8 +517,6 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/z-division/go-zookeeper v1.0.0 h1:ULsCj0nP6+U1liDFWe+2oEF6o4amixoDcDlwEUghVUY=
github.com/z-division/go-zookeeper v1.0.0/go.mod h1:6X4UioQXpvyezJJl4J9NHAJKsoffCwy5wCaaTktXjOA=
go.etcd.io/etcd/api/v3 v3.5.12 h1:W4sw5ZoU2Juc9gBWuLk5U6fHfNVyY1WC5g9uiXZio/c=
go.etcd.io/etcd/api/v3 v3.5.12/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4=
go.etcd.io/etcd/client/pkg/v3 v3.5.12 h1:EYDL6pWwyOsylrQyLp2w+HkQ46ATiOvoEdMarindU2A=
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/zk/command/cat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"os"

"github.com/go-zookeeper/zk"
"github.com/spf13/cobra"
"github.com/z-division/go-zookeeper/zk"
"golang.org/x/term"

"vitess.io/vitess/go/cmd/zk/internal/zkfilepath"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/zk/command/edit.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"path"
"time"

"github.com/go-zookeeper/zk"
"github.com/spf13/cobra"
"github.com/z-division/go-zookeeper/zk"

"vitess.io/vitess/go/cmd/zk/internal/zkfilepath"
"vitess.io/vitess/go/vt/log"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/zk/command/ls.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"sort"
"sync"

"github.com/go-zookeeper/zk"
"github.com/spf13/cobra"
"github.com/z-division/go-zookeeper/zk"

"vitess.io/vitess/go/cmd/zk/internal/zkfilepath"
"vitess.io/vitess/go/vt/log"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/zk/command/rm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"strings"

"github.com/go-zookeeper/zk"
"github.com/spf13/cobra"
"github.com/z-division/go-zookeeper/zk"

"vitess.io/vitess/go/cmd/zk/internal/zkfilepath"
"vitess.io/vitess/go/vt/log"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/zk/command/stat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package command
import (
"fmt"

"github.com/go-zookeeper/zk"
"github.com/spf13/cobra"
"github.com/z-division/go-zookeeper/zk"

"vitess.io/vitess/go/cmd/zk/internal/zkfilepath"
"vitess.io/vitess/go/cmd/zk/internal/zkfs"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/zk/command/touch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package command
import (
"fmt"

"github.com/go-zookeeper/zk"
"github.com/spf13/cobra"
"github.com/z-division/go-zookeeper/zk"

"vitess.io/vitess/go/cmd/zk/internal/zkfilepath"
"vitess.io/vitess/go/vt/topo/zk2topo"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/zk/command/unzip.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"path"
"strings"

"github.com/go-zookeeper/zk"
"github.com/spf13/cobra"
"github.com/z-division/go-zookeeper/zk"

"vitess.io/vitess/go/vt/topo/zk2topo"
)
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/zk/command/wait.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package command
import (
"fmt"

"github.com/go-zookeeper/zk"
"github.com/spf13/cobra"
"github.com/z-division/go-zookeeper/zk"

"vitess.io/vitess/go/cmd/zk/internal/zkfilepath"
)
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/zk/command/watch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package command
import (
"fmt"

"github.com/go-zookeeper/zk"
"github.com/spf13/cobra"
"github.com/z-division/go-zookeeper/zk"

"vitess.io/vitess/go/cmd/zk/internal/zkfilepath"
"vitess.io/vitess/go/vt/log"
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/zk/internal/zkfilepath/zkfilepath.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"path"
"strings"

"github.com/z-division/go-zookeeper/zk"
"github.com/go-zookeeper/zk"

"vitess.io/vitess/go/vt/topo/zk2topo"
)
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/zk/internal/zkfs/zkfs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"strings"
"syscall"

"github.com/z-division/go-zookeeper/zk"
"github.com/go-zookeeper/zk"

"vitess.io/vitess/go/cmd/zk/internal/zkfilepath"
"vitess.io/vitess/go/vt/topo/zk2topo"
Expand Down
2 changes: 1 addition & 1 deletion go/vt/topo/zk2topo/election.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"path"
"sort"

"github.com/z-division/go-zookeeper/zk"
"github.com/go-zookeeper/zk"

"vitess.io/vitess/go/vt/vterrors"

Expand Down
2 changes: 1 addition & 1 deletion go/vt/topo/zk2topo/error.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package zk2topo
import (
"context"

"github.com/z-division/go-zookeeper/zk"
"github.com/go-zookeeper/zk"

"vitess.io/vitess/go/vt/topo"
)
Expand Down
2 changes: 1 addition & 1 deletion go/vt/topo/zk2topo/file.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"context"

"github.com/z-division/go-zookeeper/zk"
"github.com/go-zookeeper/zk"

"vitess.io/vitess/go/vt/topo"
)
Expand Down
2 changes: 1 addition & 1 deletion go/vt/topo/zk2topo/lock.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"path"

"github.com/z-division/go-zookeeper/zk"
"github.com/go-zookeeper/zk"

"vitess.io/vitess/go/vt/vterrors"

Expand Down
2 changes: 1 addition & 1 deletion go/vt/topo/zk2topo/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"context"

"github.com/z-division/go-zookeeper/zk"
"github.com/go-zookeeper/zk"

"vitess.io/vitess/go/vt/log"
"vitess.io/vitess/go/vt/vterrors"
Expand Down
4 changes: 2 additions & 2 deletions go/vt/topo/zk2topo/zk_conn.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"sync"
"time"

"github.com/go-zookeeper/zk"
"github.com/spf13/pflag"
"github.com/z-division/go-zookeeper/zk"
"golang.org/x/sync/semaphore"

"vitess.io/vitess/go/vt/log"
Expand Down Expand Up @@ -393,7 +393,7 @@ func dialZk(ctx context.Context, addr string) (*zk.Conn, <-chan zk.Event, error)
}
// Make sure we re-resolve the DNS name every time we reconnect to a server
// In environments where DNS changes such as Kubernetes we can't cache the IP address
hostProvider := zk.WithHostProvider(&zk.SimpleDNSHostProvider{})
hostProvider := zk.WithHostProvider(&zk.DNSHostProvider{})

// zk.Connect automatically shuffles the servers
zconn, session, err := zk.Connect(servers, baseTimeout, dialer, hostProvider)
Expand Down
2 changes: 1 addition & 1 deletion go/vt/zkctl/zkctl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"syscall"
"time"

zookeeper "github.com/z-division/go-zookeeper/zk"
zookeeper "github.com/go-zookeeper/zk"

"vitess.io/vitess/go/vt/env"
"vitess.io/vitess/go/vt/log"
Expand Down
2 changes: 2 additions & 0 deletions vitess-mixin/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ require (
)

replace k8s.io/client-go v2.0.0-alpha.0.0.20181121191925-a47917edff34+incompatible => k8s.io/client-go v2.0.0-alpha.1+incompatible

replace github.com/z-division/go-zookeeper => github.com/go-zookeeper/zk v1.0.4
2 changes: 1 addition & 1 deletion vitess-mixin/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -789,6 +789,7 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
github.com/go-zookeeper/zk v1.0.4/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
github.com/gocql/gocql v0.0.0-20220224095938-0eacd3183625/go.mod h1:3gM2c4D3AnkISwBxGnMMsS8Oy4y2lhbPRsH4xnJrHG8=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/gofiber/fiber/v2 v2.24.0/go.mod h1:MR1usVH3JHYRyQwMe2eZXRSZHRX38fkV+A7CPB+DlDQ=
Expand Down Expand Up @@ -1569,7 +1570,6 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/z-division/go-zookeeper v1.0.0/go.mod h1:6X4UioQXpvyezJJl4J9NHAJKsoffCwy5wCaaTktXjOA=
github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
github.com/zenazn/goji v1.0.1/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
Expand Down

0 comments on commit 4904a0c

Please sign in to comment.