Merge pull request #1184 from enisoc/etcd

Anthony Yeh · Anthony Yeh · commit de1027596f43 · 2015-10-06T17:46:45.000-07:00
etcd: Require strong consistency (quorum reads).
diff --git a/go/vt/etcdtopo/client.go b/go/vt/etcdtopo/client.go
@@ -9,7 +9,12 @@ import (
 )
 
 func newEtcdClient(machines []string) Client {
-	return etcd.NewClient(machines)
+	c := etcd.NewClient(machines)
+	// Vitess requires strong consistency mode for etcd.
+	if err := c.SetConsistency(etcd.STRONG_CONSISTENCY); err != nil {
+		panic("failed to set consistency on etcd client: " + err.Error())
+	}
+	return c
 }
 
 // Client contains the parts of etcd.Client that are needed.

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,12 @@ import (`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func newEtcdClient(machines []string) Client {`
`12`		`- return etcd.NewClient(machines)`
	`12`	`+ c := etcd.NewClient(machines)`
	`13`	`+ // Vitess requires strong consistency mode for etcd.`
	`14`	`+ if err := c.SetConsistency(etcd.STRONG_CONSISTENCY); err != nil {`
	`15`	`+ panic("failed to set consistency on etcd client: " + err.Error())`
	`16`	`+ }`
	`17`	`+ return c`
`13`	`18`	`}`
`14`	`19`
`15`	`20`	`// Client contains the parts of etcd.Client that are needed.`