From 6cbab12f2c3ec740c9a5a737f440421a054a8b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Fri, 10 Jan 2025 08:46:26 +0100 Subject: [PATCH] replication: Fix replica UUID registration If we send `SET @replica_uuid=` after `COM_REGISTER_SLAVE` it won't be picked up in `SHOW REPLICAS`. --- replication/binlogsyncer.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/replication/binlogsyncer.go b/replication/binlogsyncer.go index 237e29d97..41a02e8d0 100644 --- a/replication/binlogsyncer.go +++ b/replication/binlogsyncer.go @@ -348,14 +348,6 @@ func (b *BinlogSyncer) registerSlave() error { } } - if err = b.writeRegisterSlaveCommand(); err != nil { - return errors.Trace(err) - } - - if _, err = b.c.ReadOKPacket(); err != nil { - return errors.Trace(err) - } - serverUUID, err := uuid.NewUUID() if err != nil { b.cfg.Logger.Errorf("failed to get new uuid %v", err) @@ -366,6 +358,14 @@ func (b *BinlogSyncer) registerSlave() error { return errors.Trace(err) } + if err = b.writeRegisterSlaveCommand(); err != nil { + return errors.Trace(err) + } + + if _, err = b.c.ReadOKPacket(); err != nil { + return errors.Trace(err) + } + return nil }