Skip to content

Commit 4628bf4

Browse files
committed
truncate os.Hostname if lengther than 60
add mutiple uuid set of mysql
1 parent 6ac3186 commit 4628bf4

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

canal/canal_test.go

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func (s *canalTestSuite) SetUpSuite(c *C) {
8282
}()
8383
}
8484

85-
func (s *canalTestSuite) TestDumperHandler(c *C) {
85+
func TestCanalHandler(t *testing.T) {
8686
oneGtidExp := regexp.MustCompile("SET @@GLOBAL.GTID_PURGED='(.+)'")
8787
mutilGtidStartExp := regexp.MustCompile("SET @@GLOBAL.GTID_PURGED='(.+),")
8888
midUuidSet := regexp.MustCompile("(^\\w{8}(-\\w{4}){3}-\\w{12}:\\d+-\\d+),")
@@ -104,16 +104,16 @@ cbd7809d-0433-11e9-b1cf-00505690543b:1-18233950,
104104
cca778e9-8cdf-11e8-94d0-005056a247b1:1-303899574,
105105
cf80679b-7695-11e8-8873-1c1b0d9a4ab9:1-12836047,
106106
d0951f24-1e21-11e9-bb2e-00505690b730:1-4758092,
107-
e7574090-b123-11e8-8bb4-005056a29643:1-12'`, "071a84e8-b253-11e8-8472-005056a27e86:1-76,2337be48-0456-11e9-bd1c-00505690543b:1-7,41d816cd-0455-11e9-be42-005056901a22:1-2,5f1eea9e-b1e5-11e8-bc77-005056a221ed:1-144609156,75848cdb-8131-11e7-b6fc-1c1b0de85e7b:1-151378598,780ad602-0456-11e9-8bcd-005056901a22:1-516653148,92809ddd-1e3c-11e9-9d04-00505690f6ab:1-11858565,c59598c7-0467-11e9-bbbe-005056901a22:1-226464969,cbd7809d-0433-11e9-b1cf-00505690543b:1-18233950,cca778e9-8cdf-11e8-94d0-005056a247b1:1-303899574,cf80679b-7695-11e8-8873-1c1b0d9a4ab9:1-12836047,d0951f24-1e21-11e9-bb2e-00505690b730:1-4758092,e7574090-b123-11e8-8bb4-005056a29643:1-11"},
107+
e7574090-b123-11e8-8bb4-005056a29643:1-12'`, "071a84e8-b253-11e8-8472-005056a27e86:1-76,2337be48-0456-11e9-bd1c-00505690543b:1-7,41d816cd-0455-11e9-be42-005056901a22:1-2,5f1eea9e-b1e5-11e8-bc77-005056a221ed:1-144609156,75848cdb-8131-11e7-b6fc-1c1b0de85e7b:1-151378598,780ad602-0456-11e9-8bcd-005056901a22:1-516653148,92809ddd-1e3c-11e9-9d04-00505690f6ab:1-11858565,c59598c7-0467-11e9-bbbe-005056901a22:1-226464969,cbd7809d-0433-11e9-b1cf-00505690543b:1-18233950,cca778e9-8cdf-11e8-94d0-005056a247b1:1-303899574,cf80679b-7695-11e8-8873-1c1b0d9a4ab9:1-12836047,d0951f24-1e21-11e9-bb2e-00505690b730:1-4758092,e7574090-b123-11e8-8bb4-005056a29643:1-12"},
108108
{`SET @@GLOBAL.GTID_PURGED='071a84e8-b253-11e8-8472-005056a27e86:1-76,
109109
2337be48-0456-11e9-bd1c-00505690543b:1-7';`, "071a84e8-b253-11e8-8472-005056a27e86:1-76,2337be48-0456-11e9-bd1c-00505690543b:1-7"},
110-
{`SET @@GLOBAL.GTID_PURGED='c0977f88-3104-11e9-81e1-00505690245b:1-274559';`, "c0977f88-3104-11e9-81e1-00505690245b:1-274559'"},
110+
{`SET @@GLOBAL.GTID_PURGED='c0977f88-3104-11e9-81e1-00505690245b:1-274559';`, "c0977f88-3104-11e9-81e1-00505690245b:1-274559"},
111111
{`CHANGE MASTER TO MASTER_LOG_FILE='mysql-bin.008995', MASTER_LOG_POS=102052485;`, ""},
112112
}
113113

114-
for _, t := range tbls {
114+
for _, tt := range tbls {
115115
h := dumpParseHandler{}
116-
reader := strings.NewReader(t.input)
116+
reader := strings.NewReader(tt.input)
117117
newReader := bufio.NewReader(reader)
118118
var binlogParsed bool
119119
var gtidDoneParsed bool
@@ -182,10 +182,22 @@ e7574090-b123-11e8-8bb4-005056a29643:1-12'`, "071a84e8-b253-11e8-8472-005056a27e
182182

183183
}
184184

185-
expectedGtidset, _ := mysql.ParseGTIDSet("mysql", t.expected)
185+
if tt.expected == "" {
186+
if h.gset != nil {
187+
log.Fatalf("expected nil, but get %v", h.gset)
188+
}
189+
continue
190+
}
191+
expectedGtidset, err := mysql.ParseGTIDSet("mysql", tt.expected)
192+
if err != nil {
193+
log.Fatalf("Gtid:%s failed parsed, err: %v", tt.expected, err)
194+
}
195+
if !expectedGtidset.Equal(h.gset) {
196+
log.Fatalf("expected:%v , but get: %v", expectedGtidset, h.gset)
197+
}
186198

187-
c.Assert(expectedGtidset.Equal(h.gset), IsTrue)
188-
c.Logf("parsed gtidset: %v", h.gset)
199+
// c.Assert(expectedGtidset.Equal(h.gset), IsTrue)
200+
// c.Logf("parsed gtidset: %v", h.gset)
189201
}
190202

191203
}

canal/config.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ func NewDefaultConfig() *Config {
116116
c.Dump.ExecutionPath = "mysqldump"
117117
c.Dump.DiscardErr = true
118118
c.Dump.SkipMasterData = false
119-
c.Dump.GtidPurged = "auto"
119+
// add default value to disable mysqldump --set-gtid-purged
120+
c.Dump.GtidPurged = "none"
120121

121122
return c
122123
}

0 commit comments

Comments
 (0)