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

Fix the zero client in live loader to avoid using TLS in 1.0.x #3936

Merged
merged 2 commits into from
Sep 10, 2019
Merged

Fix the zero client in live loader to avoid using TLS in 1.0.x #3936

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3967fa
Fixing the zero client in live loader to avoid using TLS
Sep 6, 2019
9c17972
Merge branch 'release/v1.0' into gitlw/fix_live_tls
Sep 6, 2019
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
4 changes: 3 additions & 1 deletion dgraph/cmd/live/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,9 @@ func setup(opts batchMutationOptions, dc *dgo.Dgraph) *loader {
x.Checkf(err, "Error while creating badger KV posting store")

// compression with zero server actually makes things worse
connzero, err := x.SetupConnection(opt.zero, &tlsConf, false)
connzero, err := x.SetupConnection(opt.zero, &x.TLSHelperConfig{
CertRequired: false,
}, false)
x.Checkf(err, "Unable to connect to zero, Is it running at %s?", opt.zero)

alloc := xidmap.New(
Expand Down