Skip to content

Commit

Permalink
Modify the replicationdata proto w/o breaking backwards compat
Browse files Browse the repository at this point in the history
Update vtadmin web protobufs

Signed-off-by: Matt Lord <mattalord@gmail.com>
  • Loading branch information
mattlord committed Mar 9, 2022
1 parent c61d94d commit 65226ad
Show file tree
Hide file tree
Showing 11 changed files with 1,689 additions and 295 deletions.
32 changes: 8 additions & 24 deletions go/mysql/replication_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func (s *ReplicationStatus) SQLHealthy() bool {

// ReplicationStatusToProto translates a Status to proto3.
func ReplicationStatusToProto(s ReplicationStatus) *replicationdatapb.Status {
replstatus := replicationdatapb.Status{
return &replicationdatapb.Status{
Position: EncodePosition(s.Position),
RelayLogPosition: EncodePosition(s.RelayLogPosition),
FilePosition: EncodePosition(s.FilePosition),
Expand All @@ -86,18 +86,11 @@ func ReplicationStatusToProto(s ReplicationStatus) *replicationdatapb.Status {
SourcePort: int32(s.SourcePort),
ConnectRetry: int32(s.ConnectRetry),
SourceUuid: s.SourceUUID.String(),
IoState: int32(s.IOState),
LastIoError: s.LastIOError,
SqlState: int32(s.SQLState),
LastSqlError: s.LastSQLError,
}
if s.IOState == ReplicationStateRunning {
replstatus.IoThreadRunning = true
} else if s.IOState == ReplicationStateConnecting {
replstatus.IoThreadConnecting = true
}
if s.SQLState == ReplicationStateRunning {
replstatus.SqlThreadRunning = true
}
return &replstatus
}

// ProtoToReplicationStatus translates a proto Status, or panics.
Expand Down Expand Up @@ -125,7 +118,7 @@ func ProtoToReplicationStatus(s *replicationdatapb.Status) ReplicationStatus {
panic(vterrors.Wrapf(err, "cannot decode SourceUUID"))
}
}
replstatus := ReplicationStatus{
return ReplicationStatus{
Position: pos,
RelayLogPosition: relayPos,
FilePosition: filePos,
Expand All @@ -136,20 +129,11 @@ func ProtoToReplicationStatus(s *replicationdatapb.Status) ReplicationStatus {
SourcePort: int(s.SourcePort),
ConnectRetry: int(s.ConnectRetry),
SourceUUID: sid,
IOState: ReplicationState(s.IoState),
LastIOError: s.LastIoError,
SQLState: ReplicationState(s.SqlState),
LastSQLError: s.LastSqlError,
}
if s.IoThreadRunning {
replstatus.IOState = ReplicationStateRunning
} else if s.IoThreadConnecting {
replstatus.IOState = ReplicationStateConnecting
} else {
replstatus.IOState = ReplicationStateStopped
}
if s.SqlThreadRunning {
replstatus.SQLState = ReplicationStateRunning
} else {
replstatus.SQLState = ReplicationStateStopped
}
return replstatus
}

// FindErrantGTIDs can be used to find errant GTIDs in the receiver's relay log, by comparing it against all known replicas,
Expand Down
148 changes: 69 additions & 79 deletions go/vt/proto/replicationdata/replicationdata.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 65226ad

Please sign in to comment.