Skip to content

Commit bb933e0

Browse files
mattlordmattlord
committed
Apply similar changes for vtorc
Signed-off-by: Matt Lord <mattalord@gmail.com>
1 parent b559159 commit bb933e0

File tree

5 files changed

+18
-17
lines changed

5 files changed

+18
-17
lines changed

‎go/test/endtoend/vtorc/readtopologyinstance/main_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func TestReadTopologyInstanceBufferable(t *testing.T) {
8686
assert.Equal(t, "ON", primaryInstance.GTIDMode)
8787
assert.Equal(t, "FULL", primaryInstance.BinlogRowImage)
8888
assert.Contains(t, primaryInstance.SelfBinlogCoordinates.LogFile, fmt.Sprintf("vt-0000000%d-bin", primary.TabletUID))
89-
assert.Greater(t, primaryInstance.SelfBinlogCoordinates.LogPos, uint32(0))
89+
assert.Greater(t, primaryInstance.SelfBinlogCoordinates.LogPos, uint64(0))
9090
assert.True(t, primaryInstance.SemiSyncPrimaryEnabled)
9191
assert.True(t, primaryInstance.SemiSyncReplicaEnabled)
9292
assert.True(t, primaryInstance.SemiSyncPrimaryStatus)
@@ -138,7 +138,7 @@ func TestReadTopologyInstanceBufferable(t *testing.T) {
138138
assert.Equal(t, utils.Hostname, replicaInstance.SourceHost)
139139
assert.Equal(t, primary.MySQLPort, replicaInstance.SourcePort)
140140
assert.Contains(t, replicaInstance.SelfBinlogCoordinates.LogFile, fmt.Sprintf("vt-0000000%d-bin", replica.TabletUID))
141-
assert.Greater(t, replicaInstance.SelfBinlogCoordinates.LogPos, uint32(0))
141+
assert.Greater(t, replicaInstance.SelfBinlogCoordinates.LogPos, uint64(0))
142142
assert.False(t, replicaInstance.SemiSyncPrimaryEnabled)
143143
assert.True(t, replicaInstance.SemiSyncReplicaEnabled)
144144
assert.False(t, replicaInstance.SemiSyncPrimaryStatus)
@@ -156,11 +156,11 @@ func TestReadTopologyInstanceBufferable(t *testing.T) {
156156
assert.True(t, replicaInstance.ReplicationIOThreadRuning)
157157
assert.True(t, replicaInstance.ReplicationSQLThreadRuning)
158158
assert.Equal(t, replicaInstance.ReadBinlogCoordinates.LogFile, primaryInstance.SelfBinlogCoordinates.LogFile)
159-
assert.Greater(t, replicaInstance.ReadBinlogCoordinates.LogPos, uint32(0))
159+
assert.Greater(t, replicaInstance.ReadBinlogCoordinates.LogPos, uint64(0))
160160
assert.Equal(t, replicaInstance.ExecBinlogCoordinates.LogFile, primaryInstance.SelfBinlogCoordinates.LogFile)
161-
assert.Greater(t, replicaInstance.ExecBinlogCoordinates.LogPos, uint32(0))
161+
assert.Greater(t, replicaInstance.ExecBinlogCoordinates.LogPos, uint64(0))
162162
assert.Contains(t, replicaInstance.RelaylogCoordinates.LogFile, fmt.Sprintf("vt-0000000%d-relay", replica.TabletUID))
163-
assert.Greater(t, replicaInstance.RelaylogCoordinates.LogPos, uint32(0))
163+
assert.Greater(t, replicaInstance.RelaylogCoordinates.LogPos, uint64(0))
164164
assert.Empty(t, replicaInstance.LastIOError)
165165
assert.Empty(t, replicaInstance.LastSQLError)
166166
assert.EqualValues(t, 0, replicaInstance.SQLDelay)

‎go/vt/vtorc/inst/analysis_dao.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ func GetReplicationAnalysis(keyspace string, shard string, hints *ReplicationAna
311311
a.AnalyzedInstancePrimaryAlias = topoproto.TabletAliasString(primaryTablet.Alias)
312312
a.AnalyzedInstanceBinlogCoordinates = BinlogCoordinates{
313313
LogFile: m.GetString("binary_log_file"),
314-
LogPos: m.GetUint32("binary_log_pos"),
314+
LogPos: m.GetUint64("binary_log_pos"),
315315
Type: BinaryLog,
316316
}
317317
isStaleBinlogCoordinates := m.GetBool("is_stale_binlog_coordinates")

‎go/vt/vtorc/inst/binlog.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const (
4040
// BinlogCoordinates described binary log coordinates in the form of log file & log position.
4141
type BinlogCoordinates struct {
4242
LogFile string
43-
LogPos uint32
43+
LogPos uint64
4444
Type BinlogType
4545
}
4646

@@ -51,11 +51,11 @@ func ParseBinlogCoordinates(logFileLogPos string) (*BinlogCoordinates, error) {
5151
return nil, fmt.Errorf("ParseBinlogCoordinates: Cannot parse BinlogCoordinates from %s. Expected format is file:pos", logFileLogPos)
5252
}
5353

54-
logPos, err := strconv.ParseUint(tokens[1], 10, 32)
54+
logPos, err := strconv.ParseUint(tokens[1], 10, 64)
5555
if err != nil {
5656
return nil, fmt.Errorf("ParseBinlogCoordinates: invalid pos: %s", tokens[1])
5757
}
58-
return &BinlogCoordinates{LogFile: tokens[0], LogPos: uint32(logPos)}, nil
58+
return &BinlogCoordinates{LogFile: tokens[0], LogPos: logPos}, nil
5959
}
6060

6161
// DisplayString returns a user-friendly string representation of these coordinates
@@ -177,6 +177,6 @@ func (binlogCoordinates *BinlogCoordinates) ExtractDetachedCoordinates() (isDeta
177177
}
178178
detachedCoordinates.LogFile = detachedCoordinatesSubmatch[1]
179179
logPos, _ := strconv.ParseUint(detachedCoordinatesSubmatch[2], 10, 32)
180-
detachedCoordinates.LogPos = uint32(logPos)
180+
detachedCoordinates.LogPos = logPos
181181
return true, detachedCoordinates
182182
}

‎go/vt/vtorc/inst/binlog_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ func TestPreviousFileCoordinates(t *testing.T) {
4141

4242
require.NoError(t, err)
4343
require.Equal(t, previous.LogFile, "mysql-bin.000009")
44-
require.Equal(t, previous.LogPos, uint32(0))
44+
require.Equal(t, previous.LogPos, uint64(0))
4545
}
4646

4747
func TestNextFileCoordinates(t *testing.T) {
4848
next, err := testCoordinates.NextFileCoordinates()
4949

5050
require.NoError(t, err)
5151
require.Equal(t, next.LogFile, "mysql-bin.000011")
52-
require.Equal(t, next.LogPos, uint32(0))
52+
require.Equal(t, next.LogPos, uint64(0))
5353
}
5454

5555
func TestBinlogCoordinates(t *testing.T) {

‎go/vt/vtorc/inst/instance_dao.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,8 @@ func ReadTopologyInstanceBufferable(tabletAlias string, latency *stopwatch.Named
281281
errorChan <- err
282282
instance.IsDetached, _ = instance.ExecBinlogCoordinates.ExtractDetachedCoordinates()
283283

284-
binlogPos, err = getBinlogCoordinatesFromPositionString(fs.ReplicationStatus.RelayLogFilePosition)
284+
tbp, err := ParseBinlogCoordinates(fs.ReplicationStatus.RelayLogFilePosition)
285+
binlogPos = *tbp
285286
instance.RelaylogCoordinates = binlogPos
286287
instance.RelaylogCoordinates.Type = RelayLog
287288
errorChan <- err
@@ -548,14 +549,14 @@ func readInstanceRow(m sqlutils.RowMap) *Instance {
548549
instance.GtidPurged = m.GetString("gtid_purged")
549550
instance.GtidErrant = m.GetString("gtid_errant")
550551
instance.SelfBinlogCoordinates.LogFile = m.GetString("binary_log_file")
551-
instance.SelfBinlogCoordinates.LogPos = m.GetUint32("binary_log_pos")
552+
instance.SelfBinlogCoordinates.LogPos = m.GetUint64("binary_log_pos")
552553
instance.ReadBinlogCoordinates.LogFile = m.GetString("source_log_file")
553-
instance.ReadBinlogCoordinates.LogPos = m.GetUint32("read_source_log_pos")
554+
instance.ReadBinlogCoordinates.LogPos = m.GetUint64("read_source_log_pos")
554555
instance.ExecBinlogCoordinates.LogFile = m.GetString("relay_source_log_file")
555-
instance.ExecBinlogCoordinates.LogPos = m.GetUint32("exec_source_log_pos")
556+
instance.ExecBinlogCoordinates.LogPos = m.GetUint64("exec_source_log_pos")
556557
instance.IsDetached, _ = instance.ExecBinlogCoordinates.ExtractDetachedCoordinates()
557558
instance.RelaylogCoordinates.LogFile = m.GetString("relay_log_file")
558-
instance.RelaylogCoordinates.LogPos = m.GetUint32("relay_log_pos")
559+
instance.RelaylogCoordinates.LogPos = m.GetUint64("relay_log_pos")
559560
instance.RelaylogCoordinates.Type = RelayLog
560561
instance.LastSQLError = m.GetString("last_sql_error")
561562
instance.LastIOError = m.GetString("last_io_error")

0 commit comments

Comments
 (0)