adjust docker, use GTID mode default

Author: siddontang

docker/Makefile

@@ -3,18 +3,15 @@ IMAGE=siddontang/mysql:latest
 all: build
 
 build:
-	@docker run -d -p 3306:3306 --name=mysql1 -e "GTID_MODE=off" -e "SERVER_ID=1" ${IMAGE}
-	@docker run -d -p 3307:3306 --name=mysql2 -e "GTID_MODE=off" -e "SERVER_ID=2" ${IMAGE}
-	@docker run -d -p 3308:3306 --name=mysql3 -e "GTID_MODE=off" -e "SERVER_ID=3" ${IMAGE}
-	@docker run -d -p 3316:3306 --name=mysql4 -e "GTID_MODE=on" -e "SERVER_ID=4" ${IMAGE}
-	@docker run -d -p 3317:3306 --name=mysql5 -e "GTID_MODE=on" -e "SERVER_ID=5" ${IMAGE}
-	@docker run -d -p 3318:3306 --name=mysql6 -e "GTID_MODE=on" -e "SERVER_ID=6" ${IMAGE}
+	@docker run -d -p 3306:3306 --name=mysql1 -e "GTID_MODE=on" -e "SERVER_ID=1" ${IMAGE}
+	@docker run -d -p 3307:3306 --name=mysql2 -e "GTID_MODE=on" -e "SERVER_ID=2" ${IMAGE}
+	@docker run -d -p 3308:3306 --name=mysql3 -e "GTID_MODE=on" -e "SERVER_ID=3" ${IMAGE}
 
 image:
 	@docker pull ${IMAGE}
 
 stop:
-	@docker stop mysql1 mysql2 mysql3 mysql4 mysql5 mysql6
+	@docker stop mysql1 mysql2 mysql3 
 
 clean:
-	@docker rm -f mysql1 mysql2 mysql3 mysql4 mysql5 mysql6
+	@docker rm -f mysql1 mysql2 mysql3

failover/failover_test.go

@@ -8,10 +8,8 @@ import (
 )
 
 // We will use go-mysql docker to test
-// go-mysql docker will build mysql 1-6 instances
-// mysql 1-3 use binlog file + position replication, port is 3306, 3307, 3308
-// mysql 4-6 use GTID replication, port is 3316, 3317, 3318
-var addr = flag.String("addr", "10.20.151.148", "go-mysql docker container address")
+// go-mysql docker will build mysql 1-3 instances
+var host = flag.String("host", "127.0.0.1", "go-mysql docker container address")
 
 func Test(t *testing.T) {
 	TestingT(t)
@@ -24,16 +22,16 @@ type failoverTestSuite struct {
 var _ = Suite(&failoverTestSuite{})
 
 func (s *failoverTestSuite) SetUpSuite(c *C) {
-	ports := []int{3306, 3307, 3308, 3316, 3317, 3318}
+	ports := []int{3306, 3307, 3308}
 
-	s.s = make([]*Server, 6)
+	s.s = make([]*Server, len(ports))
 
-	for i := 0; i < 6; i++ {
-		s.s[i] = NewServer(fmt.Sprintf("%s:%d", *addr, ports[i]), User{"root", ""}, User{"root", ""})
+	for i := 0; i < len(ports); i++ {
+		s.s[i] = NewServer(fmt.Sprintf("%s:%d", *host, ports[i]), User{"root", ""}, User{"root", ""})
 	}
 
 	var err error
-	for i := 0; i < 6; i++ {
+	for i := 0; i < len(ports); i++ {
 		err = s.s[i].StopSlave()
 		c.Assert(err, IsNil)
 
@@ -57,10 +55,9 @@ func (s *failoverTestSuite) TearDownSuite(c *C) {
 func (s *failoverTestSuite) TestGTID(c *C) {
 	h := new(GTIDHandler)
 
-	//s3 is master, s4 and s5 are s4's slave
-	m := s.s[3]
-	s1 := s.s[4]
-	s2 := s.s[5]
+	m := s.s[0]
+	s1 := s.s[1]
+	s2 := s.s[2]
 
 	var err error
 	err = h.ChangeMasterTo(s1, m)

replication/replication_test.go

@@ -17,11 +17,6 @@ var testPort = flag.Int("port", 3306, "MySQL master port")
 var testUser = flag.String("user", "root", "MySQL master user")
 var testPassword = flag.String("pass", "", "MySQL master password")
 
-var testGTIDHost = flag.String("gtid_host", "127.0.0.1", "MySQL master (uses GTID) host")
-var testGTIDPort = flag.Int("gtid_port", 3316, "MySQL master (uses GTID) port")
-var testGTIDUser = flag.String("gtid_user", "root", "MySQL master (uses GTID) user")
-var testGITDPassword = flag.String("gtid_pass", "", "MySQL master (uses GTID) password")
-
 var testOutputLogs = flag.Bool("o", true, "output binlog event")
 
 func TestBinLogSyncer(t *testing.T) {
@@ -38,6 +33,9 @@ type testSyncerSuite struct {
 var _ = Suite(&testSyncerSuite{})
 
 func (t *testSyncerSuite) SetUpSuite(c *C) {
+	var err error
+	t.c, err = client.Connect(fmt.Sprintf("%s:%d", *testHost, *testPort), *testUser, *testPassword, "test")
+	c.Assert(err, IsNil)
 }
 
 func (t *testSyncerSuite) TearDownSuite(c *C) {
@@ -48,13 +46,12 @@ func (t *testSyncerSuite) TearDownSuite(c *C) {
 
 func (t *testSyncerSuite) SetUpTest(c *C) {
 	t.b = NewBinlogSyncer(100)
+
+	err := t.b.RegisterSlave(*testHost, uint16(*testPort), *testUser, *testPassword)
+	c.Assert(err, IsNil)
 }
 
 func (t *testSyncerSuite) TearDownTest(c *C) {
-	if t.c != nil {
-		t.c.Close()
-	}
-
 	t.b.Close()
 }
 
@@ -140,13 +137,6 @@ func (t *testSyncerSuite) testSync(c *C, s *BinlogStreamer) {
 }
 
 func (t *testSyncerSuite) TestSync(c *C) {
-	var err error
-	t.c, err = client.Connect(fmt.Sprintf("%s:%d", *testHost, *testPort), *testUser, *testPassword, "test")
-	c.Assert(err, IsNil)
-
-	err = t.b.RegisterSlave(*testHost, uint16(*testPort), *testUser, *testPassword)
-	c.Assert(err, IsNil)
-
 	//get current master binlog file and position
 	r, err := t.c.Execute("SHOW MASTER STATUS")
 	c.Assert(err, IsNil)
@@ -159,18 +149,18 @@ func (t *testSyncerSuite) TestSync(c *C) {
 }
 
 func (t *testSyncerSuite) TestSyncGTID(c *C) {
-	var err error
-	t.c, err = client.Connect(fmt.Sprintf("%s:%d", *testGTIDHost, *testGTIDPort), *testGTIDUser, *testGITDPassword, "test")
-	c.Assert(err, IsNil)
-
-	err = t.b.RegisterSlave(*testGTIDHost, uint16(*testGTIDPort), *testGTIDUser, *testGITDPassword)
+	r, err := t.c.Execute("SELECT @@gtid_mode")
 	c.Assert(err, IsNil)
+	modeOn, _ := r.GetString(0, 0)
+	if modeOn != "ON" {
+		c.Skip("GTID mode is not ON")
+	}
 
 	masterUuid, err := t.b.GetMasterUUID()
 	c.Assert(err, IsNil)
 
 	set := new(mysql.GTIDSet)
-	set.Sets = []*mysql.UUIDSet{mysql.NewUUIDSet(masterUuid, mysql.Interval{1, 2})}
+	set.Sets = map[string]*mysql.UUIDSet{masterUuid.String(): mysql.NewUUIDSet(masterUuid, mysql.Interval{1, 2})}
 
 	s, err := t.b.StartSyncGTID(set)
 	c.Assert(err, IsNil)