Fix race condition in numShutDownSig in alpha

animesh2049 · animesh2049 · commit 3bc321a832fa · 2019-05-14T12:26:30.000+05:30
diff --git a/dgraph/cmd/alpha/run.go b/dgraph/cmd/alpha/run.go
@@ -555,7 +555,6 @@ func run() {
 			}
 		}
 	}()
-	_ = numShutDownSig
 
 	// Setup external communication.
 	aclCloser := y.NewCloser(1)
diff --git a/worker/groups.go b/worker/groups.go
@@ -289,8 +289,6 @@ func (g *groupi) applyState(state *pb.MembershipState) {
 }
 
 func (g *groupi) ServesGroup(gid uint32) bool {
-	// No need to acquire the lock on g because gid is always
-	// accessed atomically via groupId() function
 	return g.groupId() == gid
 }
 

Original file line number	Diff line number	Diff line change
`@@ -555,7 +555,6 @@ func run() {`
`555`	`555`	`}`
`556`	`556`	`}`
`557`	`557`	`}()`
`558`		`- _ = numShutDownSig`
`559`	`558`
`560`	`559`	`// Setup external communication.`
`561`	`560`	`aclCloser := y.NewCloser(1)`
Original file line number	Diff line number	Diff line change
`@@ -289,8 +289,6 @@ func (g groupi) applyState(state pb.MembershipState) {`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`func (g *groupi) ServesGroup(gid uint32) bool {`
`292`		`- // No need to acquire the lock on g because gid is always`
`293`		`- // accessed atomically via groupId() function`
`294`	`292`	`return g.groupId() == gid`
`295`	`293`	`}`
`296`	`294`