Remove separate goroutine and just wait on the main WaitGroup

Author: gnpaone

sentinel.go

@@ -570,44 +570,32 @@ func (c *sentinelFailover) MasterAddr(ctx context.Context) (string, error) {
 		masterAddr string
 		wg         sync.WaitGroup
 		once       sync.Once
-		done       = make(chan struct{})
 	)
 
 	for i, sentinelAddr := range c.sentinelAddrs {
 		wg.Add(1)
 		go func(i int, addr string) {
 			defer wg.Done()
-			select {
-			case <-done:
+			sentinelCli := NewSentinelClient(c.opt.sentinelOptions(addr))
+			addrVal, err := sentinelCli.GetMasterAddrByName(ctx, c.opt.MasterName).Result()
+			if err != nil {
+				internal.Logger.Printf(ctx, "sentinel: GetMasterAddrByName addr=%s, master=%q failed: %s",
+					addr, c.opt.MasterName, err)
+				_ = sentinelCli.Close()
 				return
-			default:
-				sentinelCli := NewSentinelClient(c.opt.sentinelOptions(addr))
-				addrVal, err := sentinelCli.GetMasterAddrByName(ctx, c.opt.MasterName).Result()
-				if err != nil {
-					internal.Logger.Printf(ctx, "sentinel: GetMasterAddrByName addr=%s, master=%q failed: %s",
-						addr, c.opt.MasterName, err)
-					_ = sentinelCli.Close()
-					return
-				}
-
-				once.Do(func() {
-					masterAddr = net.JoinHostPort(addrVal[0], addrVal[1])
-					// Push working sentinel to the top
-					c.sentinelAddrs[0], c.sentinelAddrs[i] = c.sentinelAddrs[i], c.sentinelAddrs[0]
-					c.setSentinel(ctx, sentinelCli)
-					internal.Logger.Printf(ctx, "sentinel: selected addr=%s masterAddr=%s", addr, masterAddr)
-					close(done)
-				})
 			}
+
+			once.Do(func() {
+				masterAddr = net.JoinHostPort(addrVal[0], addrVal[1])
+				// Push working sentinel to the top
+				c.sentinelAddrs[0], c.sentinelAddrs[i] = c.sentinelAddrs[i], c.sentinelAddrs[0]
+				c.setSentinel(ctx, sentinelCli)
+				internal.Logger.Printf(ctx, "sentinel: selected addr=%s masterAddr=%s", addr, masterAddr)
+			})
 		}(i, sentinelAddr)
 	}
 
-	go func() {
-		wg.Wait()
-		once.Do(func() { close(done) })
-	}()
-
-	<-done
+	wg.Wait()
 
 	if masterAddr != "" {
 		return masterAddr, nil