fix(lease): don't do rate limiting when not limit is not specified (#…

…7787)

(cherry picked from commit e98009b)

dgraph/cmd/zero/assign.go

@@ -184,6 +184,9 @@ func (s *Server) AssignIds(ctx context.Context, num *pb.Num) (*pb.AssignedIds, e
 	defer span.End()
 
 	rateLimit := func() error {
+		if s.rateLimiter == nil {
+			return nil
+		}
 		if num.GetType() != pb.Num_UID {
 			// We only rate limit lease of UIDs.
 			return nil

dgraph/cmd/zero/run.go

@@ -21,7 +21,6 @@ import (
 	"crypto/tls"
 	"fmt"
 	"log"
-	"math"
 	"net"
 	"net/http"
 	"os"
@@ -238,10 +237,6 @@ func run() {
 		UidLeaseLimit: limit.GetUint64("uid-lease"),
 		RefillAfter:   limit.GetDuration("refill-interval"),
 	}
-	if limitConf.UidLeaseLimit == 0 {
-		// Setting it to 0 removes the limit.
-		limitConf.UidLeaseLimit = math.MaxInt64
-	}
 	opts = options{
 		telemetry:         telemetry,
 		raft:              raft,

dgraph/cmd/zero/zero.go

@@ -101,8 +101,11 @@ func (s *Server) Init() {
 	s.blockCommitsOn = new(sync.Map)
 	s.moveOngoing = make(chan struct{}, 1)
 	s.checkpointPerGroup = make(map[uint32]uint64)
-	s.rateLimiter = x.NewRateLimiter(int64(opts.limiterConfig.UidLeaseLimit),
-		opts.limiterConfig.RefillAfter, s.closer)
+	if opts.limiterConfig.UidLeaseLimit > 0 {
+		// rate limiting is not enabled when lease limit is set to zero.
+		s.rateLimiter = x.NewRateLimiter(int64(opts.limiterConfig.UidLeaseLimit),
+			opts.limiterConfig.RefillAfter, s.closer)
+	}
 
 	go s.rebalanceTablets()
 }