Fix multiple lock acquire on membership update (cadence-workflow#5576)

* Fix multiple lock acquire on membership update

common/membership/hashring.go

@@ -28,6 +28,7 @@ import (
 
 	"github.com/dgryski/go-farm"
 	"github.com/uber/ringpop-go/hashring"
+	"github.com/uber/ringpop-go/membership"
 
 	"github.com/uber/cadence/common"
 	"github.com/uber/cadence/common/log"
@@ -239,9 +240,8 @@ func (r *ring) refresh() error {
 	}
 
 	ring := emptyHashring()
-	for _, member := range members {
-		ring.AddMembers(member)
-	}
+	ring.AddMembers(castToMembers(members)...)
+
 	r.members.keys = newMembersMap
 	r.members.refreshed = time.Now()
 	r.value.Store(ring)
@@ -292,3 +292,11 @@ func (r *ring) compareMembers(members []HostInfo) (map[string]HostInfo, bool) {
 	}
 	return newMembersMap, changed
 }
+
+func castToMembers[T membership.Member](members []T) []membership.Member {
+	result := make([]membership.Member, 0, len(members))
+	for _, h := range members {
+		result = append(result, h)
+	}
+	return result
+}

common/membership/hashring_test.go

@@ -218,15 +218,15 @@ func TestLookupAndRefreshRaceCondition(t *testing.T) {
 	wg.Add(2)
 	go func() {
 		for i := 0; i < 50; i++ {
-			hr.Lookup("a")
+			_, _ = hr.Lookup("a")
 		}
 		wg.Done()
 	}()
 	go func() {
 		for i := 0; i < 50; i++ {
 			// to bypass internal check
 			hr.members.refreshed = time.Now().AddDate(0, 0, -1)
-			hr.refresh()
+			assert.NoError(t, hr.refresh())
 		}
 		wg.Done()
 	}()