clientv3/ordering: adjust violation count.

clientv3/client.go

@@ -79,7 +79,7 @@ type Client struct {
 	creds         *credentials.TransportCredentials
 	balancer      balancer.Balancer
 	resolverGroup *endpoint.ResolverGroup
-	mu            *sync.Mutex
+	mu            *sync.RWMutex
 
 	ctx    context.Context
 	cancel context.CancelFunc
@@ -143,11 +143,13 @@ func (c *Client) Close() error {
 func (c *Client) Ctx() context.Context { return c.ctx }
 
 // Endpoints lists the registered endpoints for the client.
-func (c *Client) Endpoints() (eps []string) {
+func (c *Client) Endpoints() []string {
 	// copy the slice; protect original endpoints from being changed
-	eps = make([]string, len(c.cfg.Endpoints))
+	c.mu.RLock()
+	defer c.mu.RUnlock()
+	eps := make([]string, len(c.cfg.Endpoints))
 	copy(eps, c.cfg.Endpoints)
-	return
+	return eps
 }
 
 // SetEndpoints updates client's endpoints.
@@ -442,7 +444,7 @@ func newClient(cfg *Config) (*Client, error) {
 		creds:    creds,
 		ctx:      ctx,
 		cancel:   cancel,
-		mu:       new(sync.Mutex),
+		mu:       new(sync.RWMutex),
 		callOpts: defaultCallOpts,
 	}
 

clientv3/ordering/util.go

@@ -29,8 +29,13 @@ var ErrNoGreaterRev = errors.New("etcdclient: no cluster members have a revision
 func NewOrderViolationSwitchEndpointClosure(c clientv3.Client) OrderViolationFunc {
 	var mu sync.Mutex
 	violationCount := 0
+	prev := 0
 	return func(op clientv3.Op, resp clientv3.OpResponse, prevRev int64) error {
-		if violationCount > len(c.Endpoints()) {
+		if prev != len(c.Endpoints()) {
+			prev = len(c.Endpoints())
+			violationCount = 0
+		}
+		if violationCount >= len(c.Endpoints()) {
 			return ErrNoGreaterRev
 		}
 		mu.Lock()