chore: Merge release/v20.07 to release/v20.07-slash

CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project will adhere to [Calendar Versioning](https://calver.org/) starting v20.03.
 
-## [20.07.1] - Unreleased
+## [20.07.1] - 2020-09-17
 [20.07.1]: https://github.com/dgraph-io/dgraph/compare/v20.07.0...v20.07.1
 
 ### Changed
@@ -19,6 +19,9 @@ and this project will adhere to [Calendar Versioning](https://calver.org/) start
 
 - GraphQL
   - Adds auth for subscriptions. ([#6165][]) 
+- Add --cache_mb and --cache_percentage flags. ([#6286][])
+- Add flags to set table and vlog loading mode for zero. ([#6342][])
+- Add flag to set up compression in zero. ([#6355][])
 
 ### Fixed
 
@@ -33,12 +36,46 @@ and this project will adhere to [Calendar Versioning](https://calver.org/) start
   - Don't reserve certain queries/mutations/inputs when a type is remote. ([#6201][])
   - Linking of xids for deep mutations. ([#6203][])
   - Prevent empty values in fields having `id` directive. ([#6196][]) 
+  - Fixes unexpected fragment behaviour. ([#6274][]) 
+  - Incorrect generatedSchema in update GQLSchema. ([#6354][])
 - Fix out of order issues with split keys in bulk loader. ([#6124][])
 - Rollup a batch if more than 2 seconds elapsed since last batch. ([#6137][])
 - Refactor: Simplify how list splits are tracked. ([#6070][])
 - Fix: Don't allow idx flag to be set to 0 on dgraph zero. ([#6192][]) 
 - Fix error message for idx = 0 for dgraph zero. ([#6199][])
-
+- Stop forcing RAM mode for the write-ahead log. ([#6259][])
+- Fix panicwrap parent check. ([#6299][]) 
+- Sort manifests by BackupNum in file handler. ([#6279][])
+- Fixes queries which use variable at the top level. ([#6290][])
+- Return error on closed DB. ([#6320][])
+- Optimize splits by doing binary search.  Clear the pack from the main list. ([#6332][]) 
+- Proto fix needed for PR [#6331][]. ([#6346][]) 
+- Sentry nil pointer check. ([#6374][]) 
+- Don't store start_ts in postings. ([#6213][]) 
+- Use z.Closer instead of y.Closer. ([#6399][]) 
+- Make Alpha Shutdown Again. ([#6402][])
+- Force exit if CTRL-C is caught before initialization. ([#6407][])
+- Update advanced-queries.md.
+- Batch list in bulk loader to avoid panic. ([#6446][])
+- Enterprise features
+  - Make backups cancel other tasks. ([#6243][]) 
+  - Online Restore honors credentials passed in. ([#6302][]) 
+  - Add a lock to backups to process one request at a time. ([#6339][])
+  - Fix Star_All delete query when used with ACL enabled. ([#6336][])
+
+[#6407]: https://github.com/dgraph-io/dgraph/issues/6407
+[#6336]: https://github.com/dgraph-io/dgraph/issues/6336
+[#6446]: https://github.com/dgraph-io/dgraph/issues/6446
+[#6402]: https://github.com/dgraph-io/dgraph/issues/6402
+[#6399]: https://github.com/dgraph-io/dgraph/issues/6399
+[#6346]: https://github.com/dgraph-io/dgraph/issues/6346
+[#6332]: https://github.com/dgraph-io/dgraph/issues/6332
+[#6243]: https://github.com/dgraph-io/dgraph/issues/6243
+[#6302]: https://github.com/dgraph-io/dgraph/issues/6302
+[#6339]: https://github.com/dgraph-io/dgraph/issues/6339
+[#6355]: https://github.com/dgraph-io/dgraph/issues/6355
+[#6342]: https://github.com/dgraph-io/dgraph/issues/6342
+[#6286]: https://github.com/dgraph-io/dgraph/issues/6286
 [#6201]: https://github.com/dgraph-io/dgraph/issues/6201
 [#6203]: https://github.com/dgraph-io/dgraph/issues/6203
 [#6196]: https://github.com/dgraph-io/dgraph/issues/6196
@@ -61,6 +98,16 @@ and this project will adhere to [Calendar Versioning](https://calver.org/) start
 [#6098]: https://github.com/dgraph-io/dgraph/issues/6098
 [#6151]: https://github.com/dgraph-io/dgraph/issues/6151
 [#6165]: https://github.com/dgraph-io/dgraph/issues/6165
+[#6259]: https://github.com/dgraph-io/dgraph/issues/6259
+[#6299]: https://github.com/dgraph-io/dgraph/issues/6299
+[#6279]: https://github.com/dgraph-io/dgraph/issues/6279
+[#6290]: https://github.com/dgraph-io/dgraph/issues/6290
+[#6274]: https://github.com/dgraph-io/dgraph/issues/6274
+[#6320]: https://github.com/dgraph-io/dgraph/issues/6320
+[#6331]: https://github.com/dgraph-io/dgraph/issues/6331
+[#6354]: https://github.com/dgraph-io/dgraph/issues/6354
+[#6374]: https://github.com/dgraph-io/dgraph/issues/6374
+[#6213]: https://github.com/dgraph-io/dgraph/issues/6213
 
 ## [20.07.0] - 2020-07-28
 [20.07.0]: https://github.com/dgraph-io/dgraph/compare/v20.03.4...v20.07.0

conn/node.go

@@ -38,6 +38,7 @@ import (
 	"github.com/dgraph-io/dgraph/protos/pb"
 	"github.com/dgraph-io/dgraph/raftwal"
 	"github.com/dgraph-io/dgraph/x"
+	"github.com/dgraph-io/ristretto/z"
 )
 
 var (
@@ -647,7 +648,7 @@ func (n *Node) WaitLinearizableRead(ctx context.Context) error {
 }
 
 // RunReadIndexLoop runs the RAFT index in a loop.
-func (n *Node) RunReadIndexLoop(closer *y.Closer, readStateCh <-chan raft.ReadState) {
+func (n *Node) RunReadIndexLoop(closer *z.Closer, readStateCh <-chan raft.ReadState) {
 	defer closer.Done()
 	readIndex := func(activeRctx []byte) (uint64, error) {
 		// Read Request can get rejected then we would wait indefinitely on the channel

conn/pool.go

@@ -21,10 +21,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/dgraph-io/badger/v2/y"
 	"github.com/dgraph-io/dgo/v200/protos/api"
 	"github.com/dgraph-io/dgraph/protos/pb"
 	"github.com/dgraph-io/dgraph/x"
+	"github.com/dgraph-io/ristretto/z"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"go.opencensus.io/plugin/ocgrpc"
@@ -50,7 +50,7 @@ type Pool struct {
 
 	lastEcho   time.Time
 	Addr       string
-	closer     *y.Closer
+	closer     *z.Closer
 	healthInfo pb.HealthInfo
 }
 
@@ -175,7 +175,7 @@ func newPool(addr string) (*Pool, error) {
 	if err != nil {
 		return nil, err
 	}
-	pl := &Pool{conn: conn, Addr: addr, lastEcho: time.Now(), closer: y.NewCloser(1)}
+	pl := &Pool{conn: conn, Addr: addr, lastEcho: time.Now(), closer: z.NewCloser(1)}
 	go pl.MonitorHealth()
 	return pl, nil
 }

contrib/scripts/functions.sh

@@ -37,7 +37,7 @@ function restartCluster {
   fi
 
   docker ps -a --filter label="cluster=test" --format "{{.Names}}" | xargs -r docker rm -f
-  GOPATH=$docker_compose_gopath docker-compose -p dgraph -f $compose_file up --force-recreate --remove-orphans -d || exit 1
+  GOPATH=$docker_compose_gopath docker-compose -p dgraph -f $compose_file up --force-recreate --build --remove-orphans -d || exit 1
   popd >/dev/null
 
   $basedir/contrib/wait-for-it.sh -t 60 localhost:6180 || exit 1

dgraph/Makefile

@@ -16,7 +16,7 @@
 
 BIN             = dgraph
 BUILD          ?= $(shell git rev-parse --short HEAD)
-BUILD_CODENAME  = shuri
+BUILD_CODENAME  = shuri-1
 BUILD_DATE     ?= $(shell git log -1 --format=%ci)
 BUILD_BRANCH   ?= $(shell git rev-parse --abbrev-ref HEAD)
 BUILD_VERSION  ?= $(shell git describe --always --tags)