[Direct PR] [release-21.0] Augment PrimaryStatus to also send Server UUID

go/mysql/replication/primary_status.go

@@ -30,13 +30,16 @@ type PrimaryStatus struct {
 	Position Position
 	// FilePosition represents the server's file based position.
 	FilePosition Position
+	// ServerUUID is the UUID of the server.
+	ServerUUID string
 }
 
 // PrimaryStatusToProto translates a PrimaryStatus to proto3.
 func PrimaryStatusToProto(s PrimaryStatus) *replicationdatapb.PrimaryStatus {
 	return &replicationdatapb.PrimaryStatus{
 		Position:     EncodePosition(s.Position),
 		FilePosition: EncodePosition(s.FilePosition),
+		ServerUuid:   s.ServerUUID,
 	}
 }
 

go/test/endtoend/utils/mysql_test.go

@@ -233,6 +233,13 @@ func TestPrimaryStatus(t *testing.T) {
 	assert.NoError(t, err)
 
 	assert.True(t, res.Position.Equal(r.Position), "primary replication status should be same as replication status here")
+
+	suuid, err := mysqld.GetServerUUID(context.Background())
+	assert.NoError(t, err)
+	assert.NotEmpty(t, suuid)
+
+	// The server UUID read from primary status and GetServerUUID should match
+	assert.Equal(t, suuid, res.ServerUUID)
 }
 
 func TestReplicationConfiguration(t *testing.T) {

go/vt/mysqlctl/replication.go

@@ -434,7 +434,15 @@ func (mysqld *Mysqld) PrimaryStatus(ctx context.Context) (replication.PrimarySta
 	}
 	defer conn.Recycle()
 
-	return conn.Conn.ShowPrimaryStatus()
+	primaryStatus, err := conn.Conn.ShowPrimaryStatus()
+	if err != nil {
+		return replication.PrimaryStatus{}, err
+	}
+	primaryStatus.ServerUUID, err = conn.Conn.GetServerUUID()
+	if err != nil {
+		return replication.PrimaryStatus{}, err
+	}
+	return primaryStatus, nil
 }
 
 func (mysqld *Mysqld) ReplicationConfiguration(ctx context.Context) (*replicationdata.Configuration, error) {

go/vt/mysqlctl/replication_test.go

@@ -287,6 +287,7 @@ func TestPrimaryStatus(t *testing.T) {
 
 	db.AddQuery("SELECT 1", &sqltypes.Result{})
 	db.AddQuery("SHOW MASTER STATUS", sqltypes.MakeTestResult(sqltypes.MakeTestFields("test_field", "varchar"), "test_status"))
+	db.AddQuery("SELECT @@global.server_uuid", sqltypes.MakeTestResult(sqltypes.MakeTestFields("test_field", "varchar"), "test_uuid"))
 
 	testMysqld := NewMysqld(dbc)
 	defer testMysqld.Close()
@@ -295,6 +296,7 @@ func TestPrimaryStatus(t *testing.T) {
 	res, err := testMysqld.PrimaryStatus(ctx)
 	assert.NoError(t, err)
 	assert.NotNil(t, res)
+	assert.EqualValues(t, "test_uuid", res.ServerUUID)
 
 	db.AddQuery("SHOW MASTER STATUS", &sqltypes.Result{})
 	_, err = testMysqld.PrimaryStatus(ctx)

proto/replicationdata.proto

@@ -77,6 +77,7 @@ enum StopReplicationMode {
 message PrimaryStatus {
   string position = 1;
   string file_position = 2;
+  string server_uuid = 3;
 }
 
 // FullStatus contains the full status of MySQL including the replication information, semi-sync information, GTID information among others