@@ -353,13 +353,14 @@ func (server *ServerMonitor) rejoinMasterIncremental(crash *Crash) error {
353
353
} else {
354
354
// don't try flashback on old style replication that are ahead jump to SST
355
355
if server .HasGTIDReplication () == false {
356
- return errors .New ("Incremental failed" )
356
+ server .ClusterGroup .LogPrintf ("INFO" , "Incremental canceled caused by old style replication" )
357
+ return errors .New ("Incremental canceled caused by old style replication" )
357
358
}
358
359
}
359
360
if crash .FailoverIOGtid != nil {
360
361
// server.ClusterGroup.master.FailoverIOGtid.GetSeqServerIdNos(uint64(server.ServerID)) == 0
361
362
// lookup in crash recorded is the current master
362
- if crash .FailoverIOGtid .GetSeqServerIdNos (uint64 (server .ClusterGroup . master . ServerID )) == 0 {
363
+ if crash .FailoverIOGtid .GetSeqServerIdNos (uint64 (server .ServerID )) == 0 {
363
364
server .ClusterGroup .LogPrintf ("INFO" , "Cascading failover, consider we cannot flashback" )
364
365
server .ClusterGroup .canFlashBack = false
365
366
} else {
@@ -654,21 +655,25 @@ func (cluster *Cluster) RejoinFixRelay(slave *ServerMonitor, relay *ServerMonito
654
655
655
656
// UseGtid check is replication use gtid
656
657
func (server * ServerMonitor ) UsedGtidAtElection (crash * Crash ) bool {
657
- ss , errss := server . GetSlaveStatus ( server . ReplicationSourceName )
658
- if errss != nil {
659
- return false
660
- }
661
-
662
- server . ClusterGroup . LogPrintf ( LvlDbg , "Rejoin Server use GTID %s" , ss . UsingGtid . String )
658
+ /*
659
+ ss, errss := server.GetSlaveStatus(server.ReplicationSourceName)
660
+ if errss != nil {
661
+ server.ClusterGroup.LogPrintf(LvlInfo, "Failed to check if server was using GTID %s", errss)
662
+ return false
663
+ }
663
664
665
+ server.ClusterGroup.LogPrintf(LvlInfo, "Rejoin server using GTID %s", ss.UsingGtid.String)
666
+ */
664
667
// An old master master do no have replication
665
668
if crash .FailoverIOGtid == nil {
666
- server .ClusterGroup .LogPrintf (LvlDbg , "Rejoin server cannot find a saved master election GTID" )
669
+ server .ClusterGroup .LogPrintf (LvlInfo , "Rejoin server cannot find a saved master election GTID" )
667
670
return false
668
671
}
669
672
if len (crash .FailoverIOGtid .GetSeqNos ()) > 0 {
673
+ server .ClusterGroup .LogPrintf (LvlInfo , "Rejoin server found a crash GTID greater than 0 " )
670
674
return true
671
- } else {
672
- return false
673
675
}
676
+ server .ClusterGroup .LogPrintf (LvlInfo , "Rejoin server can not found a GTID greater than 0 " )
677
+ return false
678
+
674
679
}
0 commit comments