Skip to content

Commit 6cbab12

Browse files
committed
replication: Fix replica UUID registration
If we send `SET @replica_uuid=` after `COM_REGISTER_SLAVE` it won't be picked up in `SHOW REPLICAS`.
1 parent dd23731 commit 6cbab12

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

replication/binlogsyncer.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -348,14 +348,6 @@ func (b *BinlogSyncer) registerSlave() error {
348348
}
349349
}
350350

351-
if err = b.writeRegisterSlaveCommand(); err != nil {
352-
return errors.Trace(err)
353-
}
354-
355-
if _, err = b.c.ReadOKPacket(); err != nil {
356-
return errors.Trace(err)
357-
}
358-
359351
serverUUID, err := uuid.NewUUID()
360352
if err != nil {
361353
b.cfg.Logger.Errorf("failed to get new uuid %v", err)
@@ -366,6 +358,14 @@ func (b *BinlogSyncer) registerSlave() error {
366358
return errors.Trace(err)
367359
}
368360

361+
if err = b.writeRegisterSlaveCommand(); err != nil {
362+
return errors.Trace(err)
363+
}
364+
365+
if _, err = b.c.ReadOKPacket(); err != nil {
366+
return errors.Trace(err)
367+
}
368+
369369
return nil
370370
}
371371

0 commit comments

Comments
 (0)